[kernel] r19870 - people/benh

[Ben Hutchings]

Author: benh
Date: Thu Feb 28 22:20:08 2013
New Revision: 19870

Log:
debian-kernel-patches-to-git: Fix two bugs in file removal

An 'rm' command could remove too many files in git due to differences in
wildcard matching.

'git add' can add ignored files in some cases, so avoid this by cleaning
more thoroughly at the start of conversion.

Modified:
   people/benh/debian-kernel-patches-to-git

Modified: people/benh/debian-kernel-patches-to-git
==============================================================================
--- people/benh/debian-kernel-patches-to-git	Wed Feb 27 05:58:28 2013	(r19869)
+++ people/benh/debian-kernel-patches-to-git	Thu Feb 28 22:20:08 2013	(r19870)
@@ -54,7 +54,9 @@
 	fi
 	case "$command" in
 	    rm)
-		git rm $GIT_RM_OPTS -- "$file"
+		# We must let the shell process wildcards in $file, as git
+		# wildcard matching behaves differently
+		git rm $GIT_RM_OPTS -- $file
 		;;
 	    unifdef)
 		mv "$file" "$file~"
@@ -133,7 +135,7 @@
 upstream_ver="${latest_orig_ver%.dfsg.*}"
 
 cd "$gitdir"
-git clean -d -f
+git clean -d -f -x
 
 prev_dfsg_rev=
 apply_base=y