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
(from parent 1:
8c4cbc9
)
git-debrebase: merge: Do not crash on branches with no delta queue
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 15:59:18 +0000
(16:59 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 16:05:56 +0000
(17:05 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 7c69c4c0b2b970eeeee8eb09edae9488dbc3a6bc..d101742114246a8bd61f63c102bad234252b1eac 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-423,7
+423,7
@@
sub merge_series ($$$;@) {
" $q->{SeriesTip}]"
];
printdebug "merge_series pec $pec ";
- runcmd @git, qw(rm -q --cached), $seriesfile;
+ runcmd @git, qw(rm -q --
ignore-unmatch --
cached), $seriesfile;
$pec = make_commit [ $pec ], [
"Drop series file from $s to avoid merge trouble",
"[git-debrebase merge-innards patch-queue prep:".