From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Aug 2015 14:30:07 +0000 (+0100)
Subject: When running git-add in commit-quilty-patch, properly escape filenames (which git... 
X-Git-Tag: debian/1.4~23
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=19d5fe05b5568ba5e8119f302f0bb9cbc043e732

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

diff --git a/debian/changelog b/debian/changelog
index 886ab3bd..9177e0ea 100644
--- 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).
+  * 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 8f0052bf..baf30964 100755
--- a/dgit
+++ b/dgit
@@ -1783,7 +1783,8 @@ sub commit_quilty_patch () {
 	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";
 }