Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: avoid unnecessary curly braces
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Mon, 2 Jan 2017 15:26:08 +0000
(16:26 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 9 Jan 2017 22:57:29 +0000
(14:57 -0800)
This was noticed while addressing Junio Hamano's concern that some
"else" operators were on separate lines than the preceding closing
brace.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
e05806d
)
diff --git
a/sequencer.c
b/sequencer.c
index 9adb7bbf1d4815d9e4f67b66e90c9ec327b2fb72..23793db08b674d966b69b68e1f4c431cdcda4c2d 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-632,9
+632,8
@@
static int do_pick_commit(enum todo_command command, struct commit *commit,
}
discard_cache();
- if (!commit->parents)
{
+ if (!commit->parents)
parent = NULL;
- }
else if (commit->parents->next) {
/* Reverting or cherry-picking a merge commit */
int cnt;