chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-badcommit-fixup: Implement dgit-rewrite-map
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 1502ddff922109ec771f25eecf09f3648b0bb57d..9d3584fb7e0abd96b420e70a3f24def0b78ee20e 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2367,6
+2367,8
@@
END
my $path = $ENV{PATH} or die;
foreach my $use_absurd (qw(0 1)) {
my $path = $ENV{PATH} or die;
foreach my $use_absurd (qw(0 1)) {
+ runcmd @git, qw(checkout -q unpa);
+ runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
local $ENV{PATH} = $path;
if ($use_absurd) {
chomp $@;
local $ENV{PATH} = $path;
if ($use_absurd) {
chomp $@;
@@
-3536,7
+3538,7
@@
tree $tree
parent $dgitview
parent $archive_hash
author $authline
parent $dgitview
parent $archive_hash
author $authline
-commiter $authline
+commit
t
er $authline
$msg_msg
$msg_msg
@@
-4460,7
+4462,7
@@
END
local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
local $ENV{'VISUAL'} = $ENV{'EDITOR'};
local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
local $ENV{'VISUAL'} = $ENV{'EDITOR'};
local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
- runcmd @dpkgsource, qw(--commit .), $patchname;
+ runcmd @dpkgsource, qw(--commit
--include-removal
.), $patchname;
}
}
}
}
@@
-4495,17
+4497,21
@@
sub quiltify_trees_differ ($$;$$$) {
if ($unrepres) {
eval {
if ($unrepres) {
eval {
- die "deleted\n" unless $newmode =~ m/[^0]/;
- die "not a plain file\n" unless $newmode =~ m/^10\d{4}$/;
- if ($oldmode =~ m/[^0]/) {
+ die "not a plain file\n"
+ unless $newmode =~ m/^10\d{4}$/ ||
+ $oldmode =~ m/^10\d{4}$/;
+ if ($oldmode =~ m/[^0]/ &&
+ $newmode =~ m/[^0]/) {
die "mode changed\n" if $oldmode ne $newmode;
} else {
die "mode changed\n" if $oldmode ne $newmode;
} else {
- die "non-default mode\n" unless $newmode =~ m/^100644$/;
+ die "non-default mode\n"
+ unless $newmode =~ m/^100644$/ ||
+ $oldmode =~ m/^100644$/;
}
};
if ($@) {
local $/="\n"; chomp $@;
}
};
if ($@) {
local $/="\n"; chomp $@;
- push @$unrepres, [ $f,
$@
];
+ push @$unrepres, [ $f,
"$@ ($oldmode->$newmode)"
];
}
}
}
}
@@
-5938,10
+5944,14
@@
END
progress "Import, merging.";
my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
my $version = getfield $dsc, 'Version';
progress "Import, merging.";
my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
my $version = getfield $dsc, 'Version';
+ my $clogp = commit_getclogp $newhash;
+ my $authline = clogp_authline $clogp;
$newhash = make_commit_text <<END;
tree $tree
parent $newhash
parent $oldhash
$newhash = make_commit_text <<END;
tree $tree
parent $newhash
parent $oldhash
+author $authline
+committer $authline
Merge $package ($version) import into $dstbranch
END
Merge $package ($version) import into $dstbranch
END