Skip to content

Commit ff998f2

Browse files
committed
TODO...
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 1fa857d commit ff998f2

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

sequencer.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -926,6 +926,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
926926
else
927927
parent = commit->parents->item;
928928

929+
/* TODO: why does 36 fail when we replace !is_fixup... with command == PICK? */
929930
if (opts->allow_ff && !is_fixup(command) && command != TODO_REWORD &&
930931
((parent && !hashcmp(parent->object.oid.hash, head)) ||
931932
(!parent && unborn)))

0 commit comments

Comments
 (0)