mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer: lib'ify checkout_fast_forward()

Browse Source 
Instead of dying there, let the caller high up in the callchain
notice the error and handle it (by dying, still).

The only callers of checkout_fast_forward(), cmd_merge(),
pull_into_void(), cmd_pull() and sequencer's fast_forward_to(),
already check the return value and handle it appropriately. With this
step, we make it notice an error return from this function.

So this is a safe conversion to make checkout_fast_forward()
callable from new callers that want it not to die, without changing
the external behaviour of anything existing.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2016-09-09 16:38:00 +02:00 committed by Junio C Hamano
parent 0e408fc347
commit 55f5704da6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
merge.c
View File

@ -57,7 +57,8 @@ int checkout_fast_forward(const unsigned char *head,
refresh_cache(REFRESH_QUIET); refresh_cache(REFRESH_QUIET);
hold_locked_index(lock_file, 1); if (hold_locked_index(lock_file, 0) < 0)
return -1;
memset(&trees, 0, sizeof(trees)); memset(&trees, 0, sizeof(trees));
memset(&opts, 0, sizeof(opts)); memset(&opts, 0, sizeof(opts));
@ -90,7 +91,9 @@ int checkout_fast_forward(const unsigned char *head,
} }
if (unpack_trees(nr_trees, t, &opts)) if (unpack_trees(nr_trees, t, &opts))
return -1; return -1;
if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) {
die(_("unable to write new index file")); rollback_lock_file(lock_file);
return error(_("unable to write new index file"));
}
return 0; return 0;
} }