diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:25 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 22:37:25 +0900 |
| commit | 409b3f287b63a4c911a6b3db6d31145a0fe981a1 (patch) | |
| tree | fdd0058b43fca0694cd3da7d7a2cfb5435ccf633 | |
| parent | Merge branch 'al/send-email-auto-cte-fixup' (diff) | |
| parent | sequencer.c: remove a stray semicolon (diff) | |
| download | tgif-409b3f287b63a4c911a6b3db6d31145a0fe981a1.tar.xz | |
Merge branch 'ag/rebase-i-in-c'
Code clean-up for a topic already in 'master'.
* ag/rebase-i-in-c:
sequencer.c: remove a stray semicolon
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 1869435a72..63a2094cac 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4899,7 +4899,7 @@ int complete_action(struct replay_opts *opts, unsigned flags, if (checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_head)) return -1; -; + if (require_clean_work_tree("rebase", "", 1, 1)) return -1; |