[kernel-team] 27/47: debian-kernel-patches-to-git: Fix two bugs in file removal

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository kernel-team.

commit 4f401a24eb9a0b1959071fc6bddccd66d19fc653
Author: Ben Hutchings <benh at debian.org>
Date:   Thu Feb 28 22:20:08 2013 +0000

    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.
    
    svn path=/people/benh/; revision=19870
---
 scripts/benh/debian-kernel-patches-to-git | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/benh/debian-kernel-patches-to-git b/scripts/benh/debian-kernel-patches-to-git
index d39ddad..2ffd080 100755
--- a/scripts/benh/debian-kernel-patches-to-git
+++ b/scripts/benh/debian-kernel-patches-to-git
@@ -54,7 +54,9 @@ execute() {
 	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 @@ latest_orig_ver="${latest_version%-*}"
 upstream_ver="${latest_orig_ver%.dfsg.*}"
 
 cd "$gitdir"
-git clean -d -f
+git clean -d -f -x
 
 prev_dfsg_rev=
 apply_base=y

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/kernel-team.git