From: Nguyễn Thái Ngọc Duy Date: Sun, 30 Nov 2014 08:24:35 +0000 (+0700) Subject: commit: use SEQ_DIR instead of hardcoding "sequencer" X-Git-Tag: v2.5.0-rc0~143^2~31 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af07b20d515dce034d16062d9f6baa2e4b4bf7ae commit: use SEQ_DIR instead of hardcoding "sequencer" Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/builtin/commit.c b/builtin/commit.c index e108c53015..3f02686800 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -170,7 +170,7 @@ static void determine_whence(struct wt_status *s) whence = FROM_MERGE; else if (file_exists(git_path("CHERRY_PICK_HEAD"))) { whence = FROM_CHERRY_PICK; - if (file_exists(git_path("sequencer"))) + if (file_exists(git_path(SEQ_DIR))) sequencer_in_use = 1; } else