summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-09-09 16:37:44 +0200
committerJunio C Hamano <gitster@pobox.com>2016-09-09 11:24:52 -0700
commitf6e82b0d91251ac207da94952ee129642bd2d2b9 (patch)
tree339f5b94f6cc8d16b4cbfec1bd81ea06b5348a06
parent0d00da7bb3780c29e3d42ee255e0a09de8c43587 (diff)
downloadgit-f6e82b0d91251ac207da94952ee129642bd2d2b9.tar.gz
sequencer: lib'ify create_seq_dir()
Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of create_seq_dir(), sequencer_pick_revisions() can already return errors, so its caller must be already prepared to handle error returns, and with this step, we make it notice an error return from this function. So this is a safe conversion to make create_seq_dir() 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>
-rw-r--r--sequencer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c
index 1614efb8db..eb9c473328 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -847,8 +847,8 @@ static int create_seq_dir(void)
return -1;
}
else if (mkdir(git_path_seq_dir(), 0777) < 0)
- die_errno(_("Could not create sequencer directory %s"),
- git_path_seq_dir());
+ return error_errno(_("Could not create sequencer directory %s"),
+ git_path_seq_dir());
return 0;
}