Re: [PATCH] diff: resurrect the traditional empty "diff --git" behaviour
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:32
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] diff: resurrect the traditional empty "diff --git" behaviour · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] diff: resurrect the traditional empty "diff --git" behaviour · Jeff King <hidden>
- 2016-06-15 · Re: [PATCH] diff: resurrect the traditional empty "diff --git" behaviour · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [PATCH] diff: resurrect the traditional empty "diff --git" behaviour · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] diff: resurrect the traditional empty "diff --git" behaviour · David Kastrup <hidden>
Steven Grimm [off-list ref] writes:
Junio C Hamano wrote:quoted
This commit reinstates the traditional behaviour as the default, but with a twist. If you set diff.autorefreshindex configuration variable, it squelches the empty "diff --git" output, and at the end of the command, it automatically runs "update-index --refresh" without even bothering the user. In other words, with the configuration variable set, people who do not care about the cache-dirtyness do not even have to see the warning.As the person who submitted the patch you're reversing with this, I agree 100% this is the better approach. Having the system self-heal is far preferable to requiring user action. I would vote for reversing the sense of that config variable,
(grudgingly...) Ok. Old timers like myself have been warned on the list that diff output will get quieter, so why not. This is on top of the previous one in this thread.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 903610f..cf7617a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt@@ -396,6 +396,16 @@ color.status.<slot>:: commit.template:: Specify a file to use as the template for new commit messages. +diff.autorefreshindex:: + When using `git diff` to compare with work tree + files, do not consider stat-only change as changed. + Instead, silently run `git update-index --refresh` to + update the cached stat information for paths whose + contents in the work tree match the contents in the + index. This option defaults to true. Note that this + affects only `git diff` Porcelain, and not lower level + `diff` commands, such as `git diff-files`. + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the git diff option '-l'.
diff --git a/diff.c b/diff.c
index 75d95da..0d30d05 100644
--- a/diff.c
+++ b/diff.c@@ -19,7 +19,7 @@ static int diff_detect_rename_default; static int diff_rename_limit_default = -1; static int diff_use_color_default; -int diff_auto_refresh_index; +int diff_auto_refresh_index = 1; static char diff_colors[][COLOR_MAXLEN] = { "\033[m", /* reset */