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:
2dbc429
)
git-debrebase: stitch: make noop actually be a no-op
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 25 Mar 2018 11:56:54 +0000
(12:56 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:07:00 +0000
(16:07 +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 01eb0eb0e95c349fc0f96553286be7e3f9f031d6..55fbbd5defe135eafd83115bdc08284649184957 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1210,6
+1210,7
@@
sub cmd_stitch () {
my $prev = $ffq_prev && git_get_ref $ffq_prev;
if (!$prev) {
fail "No ffq-prev to stitch." unless $opt_noop_ok;
my $prev = $ffq_prev && git_get_ref $ffq_prev;
if (!$prev) {
fail "No ffq-prev to stitch." unless $opt_noop_ok;
+ return;
}
my $old_head = get_head();
}
my $old_head = get_head();