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

commit: use SEQ_DIR instead of hardcoding "sequencer"

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2014-11-30 15:24:35 +07:00
committed by Junio C Hamano
parent aaa26805ad
commit af07b20d51
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/commit.c
View File

@ -170,7 +170,7 @@ static void determine_whence(struct wt_status *s)
whence = FROM_MERGE; whence = FROM_MERGE;
else if (file_exists(git_path("CHERRY_PICK_HEAD"))) { else if (file_exists(git_path("CHERRY_PICK_HEAD"))) {
whence = FROM_CHERRY_PICK; whence = FROM_CHERRY_PICK;
if (file_exists(git_path("sequencer"))) if (file_exists(git_path(SEQ_DIR)))
sequencer_in_use = 1; sequencer_in_use = 1;
} }
else else