chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3265f60
)
git-debrebase: merge: Introduce $merged_pq
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:20:49 +0000
(20:20 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:20:49 +0000
(20:20 +0100)
We are going to want this in a moment.
NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 0e365cd600c9b0224330d9a586b0605c8a39ae94..d9b95a26850e18d0306df87f814b2a0e23cda0c4 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-453,6
+453,7
@@
sub merge_series ($$$;@) {
# $prereq{<patch filename>} exists or not (even later)
my $result;
+ my $merged_pq;
my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
@@
-592,7
+593,8
@@
sub merge_series ($$$;@) {
runcmd @git, qw(add), $seriesfile;
runcmd @git, qw(commit --quiet -m), 'Merged patch queue form';
- $mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD');
+ $merged_pq = git_rev_parse 'HEAD';
+ $mwrecknote->('merged-patchqueue', $merged_pq);
printdebug "merge_series series gbp pq import\n";