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 acb456373190fcd29e555eaf3353befbfc70c4ef..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
@@
-5942,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