chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor coping with maybe-existing files in fake dsc
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 8f0052bf87182d87c1db497c57e8dabcddd8e49b..2434f6a2fb5c2e23d67aa3cd6e02633449a11f9a 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-1761,6
+1761,10
@@
sub check_not_dirty () {
} else {
failedcmd @cmd;
}
} else {
failedcmd @cmd;
}
+
+ if (stat_exists "debian/source/local-options") {
+ fail "git tree contains debian/source/local-options";
+ }
}
sub commit_admin ($) {
}
sub commit_admin ($) {
@@
-1783,7
+1787,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 -f), @adds;
commit_admin "Commit Debian 3.0 (quilt) metadata";
}
commit_admin "Commit Debian 3.0 (quilt) metadata";
}
@@
-2525,7
+2530,7
@@
sub quiltify ($$) {
remove_stray_gits();
mktree_in_ud_here();
rmtree '.pc';
remove_stray_gits();
mktree_in_ud_here();
rmtree '.pc';
- runcmd @git,
'add', '.'
;
+ runcmd @git,
qw(add -Af .)
;
my $oldtiptree=git_write_tree();
changedir '../work';
my $oldtiptree=git_write_tree();
changedir '../work';
@@
-2626,7
+2631,7
@@
sub quiltify ($$) {
my $abbrev = sub {
my $x = $_[0]{Commit};
$x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
my $abbrev = sub {
my $x = $_[0]{Commit};
$x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
- return $;
+ return $
x
;
};
my $reportnot = sub {
my ($notp) = @_;
};
my $reportnot = sub {
my ($notp) = @_;
@@
-2803,8
+2808,9
@@
END
}
my @files=qw(debian/source/format debian/rules);
}
my @files=qw(debian/source/format debian/rules);
- if (stat_exists '../../../debian/patches') {
- push @files, 'debian/patches';
+ foreach my $maybe (qw(debian/patches)) {
+ next unless stat_exists "../../../$maybe";
+ push @files, $maybe;
}
my $debtar= srcfn $fakeversion,'.debian.tar.gz';
}
my $debtar= srcfn $fakeversion,'.debian.tar.gz';