chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
dgit: add dgit.default.build-products-dir git configuration key
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 7b2e4f311dfbdf64813d14cb2bac92184837a6ff..f00222520e9cf2f6d230b6ebd955d5b2c7aac80b 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1658,7
+1658,7
@@
sub cmd_convert_from_gbp () {
print STDERR "cannot stitch in dgit view: $@\n";
}
- snags_maybe_bail();
+ snags_maybe_bail
_early
();
my $work;
@@
-1696,6
+1696,8
@@
sub cmd_convert_from_gbp () {
}
};
+ ffq_check $work;
+ snags_maybe_bail();
update_head_checkout $old_head, $work, 'convert-from-gbp';
}