diff options
| author | Srinidhi Kaushik <shrinidhi.kaushik@gmail.com> | 2020-06-20 16:38:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-22 17:46:45 (GMT) |
| commit | feea6946a5b746ff4ebf8ccdf959e303203a6011 (patch) | |
| tree | 4919b2be7d2609141a4c31073fa6ffb8f0ded2b7 /builtin | |
| parent | 101b3204f37606972b40fc17dec84560c22f69f6 (diff) | |
| download | git-feea6946a5b746ff4ebf8ccdf959e303203a6011.zip git-feea6946a5b746ff4ebf8ccdf959e303203a6011.tar.gz git-feea6946a5b746ff4ebf8ccdf959e303203a6011.tar.bz2 | |
diff-files: treat "i-t-a" files as "not-in-index"
The `diff-files' command and related commands which call the function
`cmd_diff_files()', consider the "intent-to-add" files as a part of the
index when comparing the work-tree against it. This was previously
addressed in commits [1] and [2] by turning the option
`--ita-invisible-in-index' (introduced in [3]) on by default.
For `diff-files' (and `add -p' as a consequence) to show the i-t-a
files as as new, `ita_invisible_in_index' will be enabled by default
here as well.
[1] 0231ae71d3 (diff: turn --ita-invisible-in-index on by default,
2018-05-26)
[2] 425a28e0a4 (diff-lib: allow ita entries treated as "not yet exist
in index", 2016-10-24)
[3] b42b451919 (diff: add --ita-[in]visible-in-index, 2016-10-24)
Signed-off-by: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff-files.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin/diff-files.c b/builtin/diff-files.c index 86ae474..1e352dd 100644 --- a/builtin/diff-files.c +++ b/builtin/diff-files.c @@ -28,6 +28,13 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ repo_init_revisions(the_repository, &rev, prefix); rev.abbrev = 0; + + /* + * Consider "intent-to-add" files as new by default, unless + * explicitly specified in the command line or anywhere else. + */ + rev.diffopt.ita_invisible_in_index = 1; + precompose_argv(argc, argv); argc = setup_revisions(argc, argv, &rev, NULL); |