diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-01-13 19:10:38 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-01-16 12:32:45 -0800 |
commit | 12434efc1d4a83d768e8b60bfdb711780677a308 (patch) | |
tree | 7cb2212005c775450426360fb691e313ddfe0cab /git-add--interactive.perl | |
parent | 6366dd9000a3f67e47a30d94375a88dabc18ec6f (diff) | |
download | git-12434efc1d4a83d768e8b60bfdb711780677a308.tar.gz |
add--interactive: ignore submodule changes except HEADnd/add-i-ignore-submodules
For 'add -i' and 'add -p', the only action we can take on a dirty
submodule entry is update the index with a new value from its HEAD. The
content changes inside (from its own index, untracked files...) do not
matter, at least until 'git add -i' learns about launching a new
interactive add session inside a submodule.
Ignore all other submodules changes except HEAD. This reduces the number
of entries the user has to check through in 'git add -i', and the number
of 'no' they have to answer to 'git add -p' when dirty submodules are
present.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-x | git-add--interactive.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 28b325d754..964c3a7542 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -262,7 +262,7 @@ sub list_modified { } } - for (run_cmd_pipe(qw(git diff-files --numstat --summary --raw --), @ARGV)) { + for (run_cmd_pipe(qw(git diff-files --ignore-submodules=dirty --numstat --summary --raw --), @ARGV)) { if (($add, $del, $file) = /^([-\d]+) ([-\d]+) (.*)/) { $file = unquote_path($file); |