Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-13 16:37:25 +0300
committerJunio C Hamano <gitster@pobox.com>2018-11-13 16:37:25 +0300
commit409b3f287b63a4c911a6b3db6d31145a0fe981a1 (patch)
treefdd0058b43fca0694cd3da7d7a2cfb5435ccf633 /sequencer.c
parent2281aa872154af4cc10a05b09c79a1d41169111d (diff)
parent29d51e214c6b9078abaac7597c21306ac0f4deb4 (diff)
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
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c2
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;