chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: test suite: gdr-subcommands: use xopts for N*
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 3cab3ad8837b4a28a4bc51be3bcad29d123ebd20..111bb1f7b8dd0c1ae768d5eb0bfc8c9e56914191 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1516,9
+1516,11
@@
sub cmd_make_patches () {
snags_maybe_bail();
update_head_checkout $old_head, $new, 'make-patches';
} else {
snags_maybe_bail();
update_head_checkout $old_head, $new, 'make-patches';
} else {
- fail "Patch export produced patch amendments".
+ print STDERR failmsg
+ "Patch export produced patch amendments".
" (abandoned output commit $new).".
" Try laundering first.";
" (abandoned output commit $new).".
" Try laundering first.";
+ finish 7;
}
}
}
}