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

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

2016-09-29T23:49:47Z

"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

add: modify already added files when --chmod is given

2016-09-15T19:13:54Z

When the chmod option was added to git add, it was hooked up to the diff machinery, meaning that it only works when the version in the index differs from the version on disk. As the option was supposed to mirror the chmod option in update-index, which always changes the mode in the index, regardless of the status of the file, make sure the option behaves the same way in git add. Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

Merge branch 'os/no-verify-skips-commit-msg-too' into maint

2016-08-10T18:55:25Z

"git commit --help" said "--no-verify" is only about skipping the pre-commit hook, and failed to say that it also skipped the commit-msg hook. * os/no-verify-skips-commit-msg-too: commit: describe that --no-verify skips the commit-msg hook in the help text

Merge branch 'pb/commit-editmsg-path' into maint

2016-08-08T21:21:38Z

Code clean-up. * pb/commit-editmsg-path: builtin/commit.c: memoize git-path for COMMIT_EDITMSG

Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maint

2016-07-28T18:25:50Z

A helper function that takes the contents of a commit object and finds its subject line did not ignore leading blank lines, as is commonly done by other codepaths. Make it ignore leading blank lines to match. * js/find-commit-subject-ignore-leading-blanks: reset --hard: skip blank lines when reporting the commit subject sequencer: use skip_blank_lines() to find the commit subject commit -C: skip blank lines at the beginning of the message commit.c: make find_commit_subject() more robust pretty: make the skip_blank_lines() function public

commit: describe that --no-verify skips the commit-msg hook in the help text

2016-07-26T20:44:55Z

This brings the short help in line with the documentation. Signed-off-by: Orgad Shaneh Signed-off-by: Junio C Hamano

commit -C: skip blank lines at the beginning of the message

2016-06-29T21:56:37Z

Consistent with the pretty-printing machinery, we skip leading blank lines (if any) of existing commit messages. While Git itself only produces commit objects with a single empty line between commit header and commit message, it is legal to have more than one blank line (i.e. lines containing only white space, or no characters) at the beginning of the commit message, and the pretty-printing code already handles that. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

builtin/commit.c: memoize git-path for COMMIT_EDITMSG

2016-06-09T17:03:10Z

This is a follow up commit for f932729c (memoize common git-path "constant" files, 10-Aug-2015). The many function calls to git_path() are replaced by git_path_commit_editmsg() and which thus eliminates the need to repeatedly compute the location of "COMMIT_EDITMSG". Mentored-by: Lars Schneider Mentored-by: Christian Couder Signed-off-by: Pranit Bauva Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

add: add --chmod=+x / --chmod=-x options

2016-06-08T00:43:39Z

The executable bit will not be detected (and therefore will not be set) for paths in a repository with `core.filemode` set to false, though the users may still wish to add files as executable for compatibility with other users who _do_ have `core.filemode` functionality. For example, Windows users adding shell scripts may wish to add them as executable for compatibility with users on non-Windows. Although this can be done with a plumbing command (`git update-index --add --chmod=+x foo`), teaching the `git-add` command allows users to set a file executable with a command that they're already familiar with. Signed-off-by: Edward Thomson Helped-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'pb/commit-verbose-config'

2016-05-23T21:54:32Z

"git commit" learned to pay attention to "commit.verbose" configuration variable and act as if "--verbose" option was given from the command line. * pb/commit-verbose-config: commit: add a commit.verbose config variable t7507-commit-verbose: improve test coverage by testing number of diffs parse-options.c: make OPTION_COUNTUP respect "unspecified" values t/t7507: improve test coverage t0040-parse-options: improve test coverage test-parse-options: print quiet as integer t0040-test-parse-options.sh: fix style issues