chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: wip new-upstream
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 27dcf1c91e4a9288bb1693e5dc03488f08e5fcbc..49350ee70782bd08eb10d4a005d315c3f4e58252 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-95,7
+95,7
@@
our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
our $suite_re = '[-+.0-9a-z]+';
our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
our $suite_re = '[-+.0-9a-z]+';
our $cleanmode_re = 'dpkg-source(?:-d)?|git|git-ff|check|none';
-our $orig_f_comp_re =
'orig(?:-[-0-9a-z]+)?'
;
+our $orig_f_comp_re =
qr{orig(?:-$extra_orig_namepart_re)?}
;
our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
our $orig_f_sig_re = '\\.(?:asc|gpg|pgp)';
our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?";
@@
-153,6
+153,7
@@
sub parseopts_late_defaults();
sub setup_gitattrs(;$);
sub check_gitattrs($$);
sub setup_gitattrs(;$);
sub check_gitattrs($$);
+our $playground;
our $keyid;
autoflush STDOUT 1;
our $keyid;
autoflush STDOUT 1;
@@
-1683,7
+1684,7
@@
our ($dsc_distro, $dsc_hint_tag, $dsc_hint_url);
sub prep_ud () {
dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
sub prep_ud () {
dgit_privdir(); # ensures that $dgit_privdir_made is based on $maindir
- fresh_playground 'dgit/unpack';
+
$playground =
fresh_playground 'dgit/unpack';
}
sub mktree_in_ud_here () {
}
sub mktree_in_ud_here () {
@@
-3691,15
+3692,7
@@
sub check_not_dirty () {
return if $ignoredirty;
return if $ignoredirty;
- my @cmd = (@git, qw(diff --quiet HEAD));
- debugcmd "+",@cmd;
- $!=0; $?=-1; system @cmd;
- return if !$?;
- if ($?==256) {
- fail "working tree is dirty (does not match HEAD)";
- } else {
- failedcmd @cmd;
- }
+ git_check_unmodified();
}
sub commit_admin ($) {
}
sub commit_admin ($) {
@@
-4510,13
+4503,8
@@
sub cmd_clone {
}
sub branchsuite () {
}
sub branchsuite () {
- my @cmd = (@git, qw(symbolic-ref -q HEAD));
- my $branch = cmdoutput_errok @cmd;
- if (!defined $branch) {
- $?==256 or failedcmd @cmd;
- return undef;
- }
- if ($branch =~ m#$lbranch_re#o) {
+ my $branch = git_get_symref();
+ if (defined $branch && $branch =~ m#$lbranch_re#o) {
return $1;
} else {
return undef;
return $1;
} else {
return undef;
@@
-5713,6
+5701,7
@@
sub quilt_fixup_multipatch ($$$) {
rmtree '.pc';
rmtree '.pc';
+ rmtree 'debian'; # git checkout commitish paths does not delete!
runcmd @git, qw(checkout -f), $headref, qw(-- debian);
my $unapplied=git_add_write_tree();
printdebug "fake orig tree object $unapplied\n";
runcmd @git, qw(checkout -f), $headref, qw(-- debian);
my $unapplied=git_add_write_tree();
printdebug "fake orig tree object $unapplied\n";