git/diff.c, branch v1.7.2

diff.c: fix a graph output bug

2010-07-09T01:09:14Z

When --graph is in effect, the line-prefix typically has colored graph line segments and ends with reset. The color sequence "set" given to this function is for showing the metainfo part of the patch text and (1) it should not be applied to the graph lines, and (2) it will be reset at the end of line_prefix so it won't be in effect anyway. Signed-off-by: Bo Yang 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 'jl/maint-diff-ignore-submodules'

2010-06-30T18:55:37Z

* jl/maint-diff-ignore-submodules: t4027,4041: Use test -s to test for an empty file Add optional parameters to the diff option "--ignore-submodules" git diff: rename test that had a conflicting name

Merge branch 'ab/blame-textconv'

2010-06-27T19:07:44Z

* ab/blame-textconv: t/t8006: test textconv support for blame textconv: support for blame textconv: make the API public Conflicts: diff.h

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 'maint'

2010-06-22T16:35:36Z

* maint: Update draft release notes to 1.7.1.1 tests: remove unnecessary '^' from 'expr' regular expression Conflicts: diff.c

Merge branch 'cc/maint-diff-CC-binary' into maint

2010-06-22T16:27:07Z

* cc/maint-diff-CC-binary: diff: fix "git show -C -C" output when renaming a binary file Conflicts: diff.c

Merge branch 'bw/diff-metainfo-color' into maint

2010-06-21T12:40:10Z

* bw/diff-metainfo-color: diff: fix coloring of extended diff headers

Merge branch 'rs/diff-no-minimal' into maint

2010-06-21T12:38:50Z

* rs/diff-no-minimal: git diff too slow for a file

Merge branch 'cc/maint-diff-CC-binary'

2010-06-18T18:16:57Z

* cc/maint-diff-CC-binary: diff: fix "git show -C -C" output when renaming a binary file Conflicts: diff.c