diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:04:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:04:40 -0800 |
| commit | 58f37f3c07ef4869f88c79b61f11829bebf7bf40 (patch) | |
| tree | 7cca538f4e2eb9087c764405fb9f93fdd30d5fa9 /builtin-commit.c | |
| parent | 5c38ea31f345d08f37685cf4f50c599a7af56bcf (diff) | |
| parent | 9d3043cf333ee500e476a558acb234b42e43cc62 (diff) | |
| download | git-58f37f3c07ef4869f88c79b61f11829bebf7bf40.tar.gz git-58f37f3c07ef4869f88c79b61f11829bebf7bf40.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.6.1.1
builtin-fsck: fix off by one head count
t5540: clarify that http-push does not handle packed-refs on the remote
http-push: when making directories, have a trailing slash in the path name
http-push: fix off-by-path_len
Documentation: let asciidoc align related options
githooks.txt: add missing word
builtin-commit.c: do not remove COMMIT_EDITMSG
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index e88b78f81..977ea09c5 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -624,7 +624,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix) if (!commitable && !in_merge && !allow_empty && !(amend && is_a_merge(head_sha1))) { run_status(stdout, index_file, prefix, 0); - unlink(commit_editmsg); return 0; } |