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: check head is clean before starting
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 5913aa3307afa57c0490a44e4765509af6a70024..70808da019922f01d4fb0f77bb5748d1d7647197 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-795,7
+795,10
@@
sub walk ($;$$) {
return @r
}
return @r
}
-sub get_head () { return git_rev_parse qw(HEAD); }
+sub get_head () {
+ git_check_unmodified();
+ return git_rev_parse qw(HEAD);
+}
sub update_head ($$$) {
my ($old, $new, $mrest) = @_;
sub update_head ($$$) {
my ($old, $new, $mrest) = @_;
@@
-929,7
+932,6
@@
sub record_ffq_prev () {
}
sub cmd_new_upstream_v0 () {
}
sub cmd_new_upstream_v0 () {
- # tree should be clean and this is not checked
# automatically and unconditionally launders before rebasing
# if rebase --abort is used, laundering has still been done
# automatically and unconditionally launders before rebasing
# if rebase --abort is used, laundering has still been done