When GIT_EXTERNAL_DIFF is defined and git diff is called with any of the
'ignore whitespace' type command line arguments such as -w, -b or
--ignore-space-at-eol, git diff ignores these flags and invokes
GIT_EXTERNAL_DIFF for each changed file in the diff queue. If the diff
queue contains file(s) with only whitespace changes, the external diff
tool displays diffs for changes that the user specifically did not ask
for.
For external diff tools, therefore, it could be useful if git diff set a
GIT_DIFF_FOUND_CHANGES environment variable for each file in the diff
queue. This variable could be examined by the external diff tool to
decide whether to show a diff or skip the file.
To implement it:
(a) Modify diff.c to indicate to external diff tools which file
contains changes the tool should care about:
Only when GIT_EXTERNAL_DIFF is defined and either
--ignore-space-change, --ignore-all-space or
--ignore-space-at-eol option is set, run diffstat on the current
file in the diff queue to find out the number of deleted and
inserted changes. Based on this set the environment variable
GIT_DIFF_FOUND_CHANGES to "1" or "0". If GIT_EXTERNAL_DIFF is
defined but none of the 'ignore whitespace' command line
arguments is set, set GIT_DIFF_FOUND_CHANGES to "1".
(b) Modify git-difftool--helper.sh to make use of the GIT_DIFF_FOUND_CHANGES
variable: do not invok the external diff tool on files for which
GIT_DIFF_FOUND_CHANGES is set to false.
(c) Update documentation and create unit tests.
Signed-off-by: Zoltan Klinger <zoltan.klinger@xxxxxxxxx>
---
Documentation/git.txt | 11 +++++++++--
diff.c | 12 ++++++++++++
git-difftool--helper.sh | 39 ++++++++++++++++++++++++---------------
t/t4020-diff-external.sh | 33 +++++++++++++++++++++++++++++++++
4 files changed, 78 insertions(+), 17 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index c6175d4..46030d0 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -846,8 +846,9 @@ temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
parameter, <path>.
+
-For each path 'GIT_EXTERNAL_DIFF' is called, two environment variables,
-'GIT_DIFF_PATH_COUNTER' and 'GIT_DIFF_PATH_TOTAL' are set.
+For each path 'GIT_EXTERNAL_DIFF' is called, three environment
+variables, 'GIT_DIFF_PATH_COUNTER', 'GIT_DIFF_PATH_TOTAL' and
+'GIT_DIFF_FOUND_CHANGES' are set.
'GIT_DIFF_PATH_COUNTER'::
A 1-based counter incremented by one for every path.
@@ -855,6 +856,12 @@ For each path 'GIT_EXTERNAL_DIFF' is called, two environment variables,
'GIT_DIFF_PATH_TOTAL'::
The total number of paths.
+'GIT_DIFF_FOUND_CHANGES'::
+ This variable is set to "0" if 'GIT_EXTERNAL_DIFF' is called with
+ either --ignore-space-change, --ignore-all-space or
+ --ignore-space-at-eol argument and the path has only whitespace
+ changes. Otherwise it is set to "1".
+
other
~~~~~
'GIT_MERGE_VERBOSITY'::
diff --git a/diff.c b/diff.c
index d7a5c81..a5045d5 100644
--- a/diff.c
+++ b/diff.c
@@ -2953,6 +2953,7 @@ static void run_external_diff(const char *pgm,
argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
+ argv_array_pushf(&env, "GIT_DIFF_FOUND_CHANGES=%d", o->found_changes);
if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
die(_("external diff died, stopping at %s"), name);
@@ -3034,6 +3035,9 @@ static void fill_metainfo(struct strbuf *msg,
}
}
+static void diff_flush_stat(struct diff_filepair *p, struct diff_options *o,
+ struct diffstat_t *diffstat);
+
static void run_diff_cmd(const char *pgm,
const char *name,
const char *other,
@@ -3067,6 +3071,14 @@ static void run_diff_cmd(const char *pgm,
}
if (pgm) {
+ o->found_changes = 1;
+ if (DIFF_OPT_TST(o, DIFF_FROM_CONTENTS)) {
+ struct diffstat_t diffstat;
+ memset(&diffstat, 0, sizeof(struct diffstat_t));
+ diff_flush_stat(p, o, &diffstat);
+ o->found_changes = (diffstat.files[0]->added || diffstat.files[0]->deleted);
+ }
+
run_external_diff(pgm, name, other, one, two, xfrm_msg,
complete_rewrite, o);
return;
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 7ef36b9..1d3918c 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -40,27 +40,36 @@ launch_merge_tool () {
# the user with the real $MERGED name before launching $merge_tool.
if should_prompt
then
- printf "\nViewing (%s/%s): '%s'\n" "$GIT_DIFF_PATH_COUNTER" \
- "$GIT_DIFF_PATH_TOTAL" "$MERGED"
- if use_ext_cmd
+ if test $GIT_DIFF_FOUND_CHANGES -eq 1
then
- printf "Launch '%s' [Y/n]: " \
- "$GIT_DIFFTOOL_EXTCMD"
+ printf "\nViewing (%s/%s): '%s'\n" "$GIT_DIFF_PATH_COUNTER" \
+ "$GIT_DIFF_PATH_TOTAL" "$MERGED"
+ if use_ext_cmd
+ then
+ printf "Launch '%s' [Y/n]: " \
+ "$GIT_DIFFTOOL_EXTCMD"
+ else
+ printf "Launch '%s' [Y/n]: " "$merge_tool"
+ fi
+ if read ans && test "$ans" = n
+ then
+ return
+ fi
else
- printf "Launch '%s' [Y/n]: " "$merge_tool"
- fi
- if read ans && test "$ans" = n
- then
- return
+ printf "\nSkipping (%s/%s): '%s'\n" "$GIT_DIFF_PATH_COUNTER" \
+ "$GIT_DIFF_PATH_TOTAL" "$MERGED"
fi
fi
- if use_ext_cmd
+ if test $GIT_DIFF_FOUND_CHANGES -eq 1
then
- export BASE
- eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
- else
- run_merge_tool "$merge_tool"
+ if use_ext_cmd
+ then
+ export BASE
+ eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
+ else
+ run_merge_tool "$merge_tool"
+ fi
fi
}
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index 0446201..09452f2 100755
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -206,6 +206,39 @@ test_expect_success 'GIT_EXTERNAL_DIFF path counter/total' '
test_cmp expect counter.txt
'
+test_expect_success 'GIT_EXTERNAL_DIFF found changes' '
+ echo the quick brown fox >whitespace.txt &&
+ git add whitespace.txt &&
+ echo " the quick brown fox " >whitespace.txt &&
+ write_script found_changes.sh <<-\EOF &&
+ echo $GIT_DIFF_FOUND_CHANGES >>changes.txt
+ EOF
+ >changes.txt &&
+ cat >expect <<-\EOF &&
+ 1
+ 1
+ 1
+ EOF
+ GIT_EXTERNAL_DIFF=./found_changes.sh git diff &&
+ test_cmp expect changes.txt
+'
+
+test_expect_success 'GIT_EXTERNAL_DIFF ignore whitespace changes' '
+ cat >expect <<-\EOF &&
+ 1
+ 1
+ 0
+ EOF
+ rm changes.txt &&
+ GIT_EXTERNAL_DIFF=./found_changes.sh git diff --ignore-all-space &&
+ test_cmp expect changes.txt
+'
+
+test_expect_success 'clean up whitespace leftovers' '
+ git update-index --force-remove whitespace.txt &&
+ rm whitespace.txt
+'
+
test_expect_success 'GIT_EXTERNAL_DIFF generates pretty paths' '
touch file.ext &&
git add file.ext &&
--
2.1.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html