| commit | 650360210afbd585f33ed622d3e700b1941b1ddb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Oct 2016 21:58:50 +0000 (27 14:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Oct 2016 21:58:50 +0000 (27 14:58 -0700) | ||
| tree | 52a6857344b7e569f5fa3557cf4cd7827166f7c9 | treesnapshot (tar.gz zip) |
| parent | cca3be6ea15b07f22dcb1198a8c23193481ae2e7 | commitdiff |
| parent | 2c49f7ffb3063fdccccf2a038ab2eee66e7395e4 | commitdiff |
Merge branch 'nd/ita-empty-commit'
When new paths were added by "git add -N" to the index, it was
enough to circumvent the check by "git commit" to refrain from
making an empty commit without "--allow-empty". The same logic
prevented "git status" to show such a path as "new file" in the
"Changes not staged for commit" section.
* nd/ita-empty-commit:
commit: don't be fooled by ita entries when creating initial commit
commit: fix empty commit creation when there's no changes but ita entries
diff: add --ita-[in]visible-in-index
diff-lib: allow ita entries treated as "not yet exist in index"
When new paths were added by "git add -N" to the index, it was
enough to circumvent the check by "git commit" to refrain from
making an empty commit without "--allow-empty". The same logic
prevented "git status" to show such a path as "new file" in the
"Changes not staged for commit" section.
* nd/ita-empty-commit:
commit: don't be fooled by ita entries when creating initial commit
commit: fix empty commit creation when there's no changes but ita entries
diff: add --ita-[in]visible-in-index
diff-lib: allow ita entries treated as "not yet exist in index"