Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/ita-empty-commit'
[gitweb.git]
/
builtin
/
commit.c
diff --git
a/builtin/commit.c
b/builtin/commit.c
index 1e74bc19f674dcfc64e76d7766874e2bcad71c90..a2baa6ebd5b2dc1090b1bcc87c1e9cf95abd6398 100644
(file)
--- a/
builtin/commit.c
+++ b/
builtin/commit.c
@@
-183,7
+183,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
(SEQ_DIR
)))
+ if (file_exists(git_path
_seq_dir(
)))
sequencer_in_use = 1;
}
else