diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-10-24 10:42:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-24 17:48:23 (GMT) |
| commit | 018ec3c8203ad1aee683840a580cfba7914419b6 (patch) | |
| tree | f25dff29fb2c25a2c7ee70f410a94c4eef941393 /builtin | |
| parent | b42b45191950a4ac39f6f5ae042c15ad114da79b (diff) | |
| download | git-018ec3c8203ad1aee683840a580cfba7914419b6.zip git-018ec3c8203ad1aee683840a580cfba7914419b6.tar.gz git-018ec3c8203ad1aee683840a580cfba7914419b6.tar.bz2 | |
commit: fix empty commit creation when there's no changes but ita entries
If i-t-a entries are present and there is no change between the index
and HEAD i-t-a entries, index_differs_from() still returns "dirty, new
entries" (aka, the resulting commit is not empty), but cache-tree will
skip i-t-a entries and produce the exact same tree of current
commit.
index_differs_from() is supposed to catch this so we can abort
git-commit (unless --no-empty is specified). Update it to optionally
ignore i-t-a entries when doing a diff between the index and HEAD so
that it would return "no change" in this case and abort commit.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 1cba3b7..400d2a5 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -910,7 +910,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (ignore_submodule_arg && !strcmp(ignore_submodule_arg, "all")) diff_flags |= DIFF_OPT_IGNORE_SUBMODULES; - commitable = index_differs_from(parent, diff_flags); + commitable = index_differs_from(parent, diff_flags, 1); } } strbuf_release(&committer_ident); |