When running git-add in commit-quilty-patch, properly escape filenames (which git...

diff --git a/debian/changelog b/debian/changelog
index 886ab3bdea0bd5501a193370b7c386ea2ec2c011..9177e0ead2779ba89211311d0777ce73bb6e2d2c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (1.4~~) UNRELEASED; urgency=low
 
   * Unbreak --dry-run (`exiting subroutine via next', broken in
     ac221d67, bug released in 0.22).
 
   * Unbreak --dry-run (`exiting subroutine via next', broken in
     ac221d67, bug released in 0.22).

+  * When running git-add in commit-quilty-patch, properly escape
+    filenames (which git-add treats as glob patterns).

 
  --
 
 
  --
 

diff --git a/dgit b/dgit
index 8f0052bf87182d87c1db497c57e8dabcddd8e49b..baf3096463d5be4deafb4c7f4746e5cd055de07f 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1783,7 +1783,8 @@ sub commit_quilty_patch () {
        progress "nothing quilty to commit, ok.";
        return;
     }
        progress "nothing quilty to commit, ok.";
        return;
     }

-    runcmd_ordryrun_local @git, qw(add), sort keys %adds;
+    my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
+    runcmd_ordryrun_local @git, qw(add), @adds;

     commit_admin "Commit Debian 3.0 (quilt) metadata";
 }
 
     commit_admin "Commit Debian 3.0 (quilt) metadata";
 }