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: stitch: check the branch is laundered
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index f79aef5ff2241478bb98e452fe134d30492208a1..01eb0eb0e95c349fc0f96553286be7e3f9f031d6 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1211,9
+1211,12
@@
sub cmd_stitch () {
if (!$prev) {
fail "No ffq-prev to stitch." unless $opt_noop_ok;
}
if (!$prev) {
fail "No ffq-prev to stitch." unless $opt_noop_ok;
}
+ my $old_head = get_head();
+
+ breakwater_of $old_head, 'unclean-stitch';
+
push @deferred_updates, "delete $ffq_prev $prev";
push @deferred_updates, "delete $ffq_prev $prev";
- my $old_head = get_head();
if (is_fast_fwd $old_head, $prev) {
my $differs = get_differs $old_head, $prev;
unless ($differs & ~D_PAT_ADD) {
if (is_fast_fwd $old_head, $prev) {
my $differs = get_differs $old_head, $prev;
unless ($differs & ~D_PAT_ADD) {