Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: lib'ify do_pick_commit()
[gitweb.git]
/
sequencer.c
diff --git
a/sequencer.c
b/sequencer.c
index eb700913a19b36feda9b0ccfd348e7765b465a1f..96b9ae19789a638f738eef3636a3a7baeb9f632b 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-464,7
+464,7
@@
static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
* to work on.
*/
if (write_cache_as_tree(head, 0, NULL))
-
die
(_("Your index file is unmerged."));
+
return error
(_("Your index file is unmerged."));
} else {
unborn = get_sha1("HEAD", head);
if (unborn)