chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When running git-add in commit-quilty-patch, properly escape filenames (which git...
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 60b39e4ae66d7be7f9f4a07eb736daf36ce2336a..baf3096463d5be4deafb4c7f4746e5cd055de07f 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1386,7
+1386,8
@@
sub generate_commit_from_dsc () {
or $!==&ENOENT
or die "$f $!";
or $!==&ENOENT
or die "$f $!";
- complete_file_from_dsc('.', $fi);
+ complete_file_from_dsc('.', $fi)
+ or next;
if (is_orig_file($f)) {
link $f, "../../../../$f"
if (is_orig_file($f)) {
link $f, "../../../../$f"
@@
-1484,7
+1485,7
@@
sub complete_file_from_dsc ($$) {
die "$f ?" unless $f =~ m/^\Q${package}\E_/;
die "$f ?" if $f =~ m#/#;
runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
die "$f ?" unless $f =~ m/^\Q${package}\E_/;
die "$f ?" if $f =~ m#/#;
runcmd_ordryrun_local @curl,qw(-o),$tf,'--',"$furl";
-
next
if !act_local();
+
return 0
if !act_local();
$downloaded = 1;
}
$downloaded = 1;
}
@@
-1498,13
+1499,16
@@
sub complete_file_from_dsc ($$) {
" demands hash $fi->{Hash} ".
($downloaded ? "(got wrong file from archive!)"
: "(perhaps you should delete this file?)");
" demands hash $fi->{Hash} ".
($downloaded ? "(got wrong file from archive!)"
: "(perhaps you should delete this file?)");
+
+ return 1;
}
sub ensure_we_have_orig () {
foreach my $fi (dsc_files_info()) {
my $f = $fi->{Filename};
next unless is_orig_file($f);
}
sub ensure_we_have_orig () {
foreach my $fi (dsc_files_info()) {
my $f = $fi->{Filename};
next unless is_orig_file($f);
- complete_file_from_dsc('..', $fi);
+ complete_file_from_dsc('..', $fi)
+ or next;
}
}
}
}
@@
-1779,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";
}