Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line'
[gitweb.git]
/
builtin
/
commit.c
diff --git
a/builtin/commit.c
b/builtin/commit.c
index da79ac4bc7a7247017e2f952b35642a1976c8101..310674cfd0f25c52b9952678eeb3ee164fd97fea 100644
(file)
--- 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