git/builtin/commit.c, branch v2.11.2

Merge branch 'ak/commit-only-allow-empty' into maint

2017-01-17T23:11:03Z

"git commit --allow-empty --only" (no pathspec) with dirty index ought to be an acceptable way to create a new commit that does not change any paths, but it was forbidden, perhaps because nobody needed it so far. * ak/commit-only-allow-empty: commit: remove 'Clever' message for --only --amend commit: make --only --allow-empty work without paths

commit: remove 'Clever' message for --only --amend

2016-12-09T18:52:46Z

The behavior is now documented; more importantly, rewarding the user with a "Wow, you are clever" praise afterwards is not an effective way to advertise the feature--at that point the user already knows. Signed-off-by: Andreas Krey Signed-off-by: Junio C Hamano

commit: make --only --allow-empty work without paths

2016-12-05T20:41:06Z

--only is implied when paths are present, and required them unless --amend. But with --allow-empty it should be allowed as well - it is the only way to create an empty commit in the presence of staged changes. Signed-off-by: Andreas Krey Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'rs/commit-pptr-simplify'

2016-10-31T20:15:25Z

Code simplification. * rs/commit-pptr-simplify: commit: simplify building parents list

commit: simplify building parents list

2016-10-30T23:03:25Z

Push pptr down into the FROM_MERGE branch of the if/else statement, where it's actually used, and call commit_list_append() for appending elements instead of playing tricks with commit_list_insert(). Call copy_commit_list() in the amend branch instead of open-coding it. Don't bother setting pptr in the final branch as it's not used thereafter. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'nd/ita-empty-commit'

2016-10-27T21:58:50Z

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"

commit: don't be fooled by ita entries when creating initial commit

2016-10-24T17:54:11Z

ita entries are dropped at tree generation phase. If the entire index consists of just ita entries, the result would be a a commit with no entries, which should be caught unless --allow-empty is specified. The test "!!active_nr" is not sufficient to catch this. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

commit: fix empty commit creation when there's no changes but ita entries

2016-10-24T17:48:23Z

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 Signed-off-by: Junio C Hamano

sequencer: use memoized sequencer directory path

2016-10-17T18:52:23Z

Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'tg/add-chmod+x-fix'

2016-09-26T23:09:20Z

"git add --chmod=+x " added recently only toggled the executable bit for paths that are either new or modified. This has been corrected to flip the executable bit for all paths that match the given pathspec. * tg/add-chmod+x-fix: t3700-add: do not check working tree file mode without POSIXPERM t3700-add: create subdirectory gently add: modify already added files when --chmod is given read-cache: introduce chmod_index_entry update-index: add test for chmod flags