summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2017-01-02 15:26:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-01-09 22:57:29 (GMT)
commita70d8f8067640070d89d0764d0dee491f8e0bd13 (patch)
tree60ed319a26d29a5ecc658b3e76dab7f0d4924758 /sequencer.c
parent637666c82258a2a11424791ad83b3a43cae101a4 (diff)
downloadgit-a70d8f8067640070d89d0764d0dee491f8e0bd13.zip
git-a70d8f8067640070d89d0764d0dee491f8e0bd13.tar.gz
git-a70d8f8067640070d89d0764d0dee491f8e0bd13.tar.bz2
sequencer: move "else" keyword onto the same line as preceding brace
It is the current coding style of the Git project to write if (...) { ... } else { ... } instead of putting the closing brace and the "else" keyword on separate lines. Pointed out by Junio Hamano. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c
index 23793db..3eededc 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1070,8 +1070,7 @@ static int create_seq_dir(void)
error(_("a cherry-pick or revert is already in progress"));
advise(_("try \"git cherry-pick (--continue | --quit | --abort)\""));
return -1;
- }
- else if (mkdir(git_path_seq_dir(), 0777) < 0)
+ } else if (mkdir(git_path_seq_dir(), 0777) < 0)
return error_errno(_("could not create sequencer directory '%s'"),
git_path_seq_dir());
return 0;