git/builtin/commit.c, branch v1.7.2

Merge branch 'jk/maint-status-keep-index-timestamp'

2010-07-15T19:06:55Z

* jk/maint-status-keep-index-timestamp: do not write out index when status does not have to

do not write out index when status does not have to

2010-07-07T04:53:11Z

Some codepaths, such as "git status" and "git commit --dry-run", tried to opportunisticly refresh the index and write the result out. But they did so without checking if there was actually any change that needs to be written out. Noticed by Jeff King and Daniel at Rutgers.edu Signed-off-by: Junio C Hamano

Merge branch 'jl/status-ignore-submodules'

2010-06-30T18:55:39Z

* jl/status-ignore-submodules: Add the option "--ignore-submodules" to "git status" git submodule: ignore dirty submodules for summary and status Conflicts: builtin/commit.c t/t7508-status.sh wt-status.c wt-status.h

Merge branch 'jp/string-list-api-cleanup'

2010-06-30T18:55:38Z

* jp/string-list-api-cleanup: string_list: Fix argument order for string_list_append string_list: Fix argument order for string_list_lookup string_list: Fix argument order for string_list_insert_at_index string_list: Fix argument order for string_list_insert string_list: Fix argument order for for_each_string_list string_list: Fix argument order for print_string_list

string_list: Fix argument order for string_list_insert

2010-06-27T17:06:51Z

Update the definition and callers of string_list_insert to use the string_list as the first argument. This helps make the string_list API easier to use by being more consistent. Signed-off-by: Julian Phillips Signed-off-by: Junio C Hamano

Add the option "--ignore-submodules" to "git status"

2010-06-25T18:30:25Z

In some use cases it is not desirable that "git status" considers submodules that only contain untracked content as dirty. This may happen e.g. when the submodule is not under the developers control and not all build generated files have been added to .gitignore by the upstream developers. Using the "untracked" parameter for the "--ignore-submodules" option disables checking for untracked content and lets git diff report them as changed only when they have new commits or modified content. Sometimes it is not wanted to have submodules show up as changed when they just contain changes to their work tree (this was the behavior before 1.7.0). An example for that are scripts which just want to check for submodule commits while ignoring any changes to the work tree. Also users having large submodules known not to change might want to use this option, as the - sometimes substantial - time it takes to scan the submodule work tree(s) is saved when using the "dirty" parameter. And if you want to ignore any changes to submodules, you can now do that by using this option without parameters or with "all" (when the config option status.submodulesummary is set, using "all" will also suppress the output of the submodule summary). A new function handle_ignore_submodules_arg() is introduced to parse this option new to "git status" in a single location, as "git diff" already knew it. Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano

Merge branch 'cc/maint-commit-reflog-msg' into maint

2010-06-22T16:31:48Z

* cc/maint-commit-reflog-msg: commit: use value of GIT_REFLOG_ACTION env variable as reflog message

Merge branch 'jk/maint-advice-empty-amend' into maint

2010-06-22T16:31:48Z

* jk/maint-advice-empty-amend: commit: give advice on empty amend

Merge branch 'tc/commit-abbrev-fix' into maint

2010-06-22T16:31:47Z

* tc/commit-abbrev-fix: commit::print_summary(): don't use format_commit_message() t7502-commit: add summary output tests for empty and merge commits t7502-commit: add tests for summary output

Merge branch 'jn/maint-amend-missing-name' into maint

2010-06-22T15:30:44Z

* jn/maint-amend-missing-name: commit --amend: cope with missing display name