[PATCH] Add path-limiting to git-add--interactive
From: Wincent Colaiuta <hidden>
Date: 2016-06-15 22:43:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] Add path-limiting to git-add--interactive · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Add path-limiting to git-add--interactive · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Add path-limiting to git-add--interactive · Wincent Colaiuta <hidden>
- 2016-06-15 · Re: [PATCH] Add path-limiting to git-add--interactive · Wincent Colaiuta <hidden>
Implement Junio's suggestion that git-add--interactive should reproduce the path-limiting semantics of non-interactive git-add. In otherwords, if "git add -i" (unrestricted) shows paths from a set A, "git add -i paths..." should show paths from a subset of the set A and that subset should be defined with the existing ls-files pathspec semantics. Signed-off-by: Wincent Colaiuta <redacted> --- git-add--interactive.perl | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 2bba07d..a5a07bc 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl@@ -37,7 +37,7 @@ sub list_untracked { chomp $_; $_; } - run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @_); + run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @ARGV); } my $status_fmt = '%12s %12s %s';
@@ -56,9 +56,14 @@ sub list_modified { my ($only) = @_; my (%data, @return); my ($add, $del, $adddel, $file); + my @tracked = grep { + defined run_cmd_pipe(qw(git ls-files + --exclude-standard --), $_) + } @ARGV; + return if $#tracked == -1 && $#ARGV != -1; for (run_cmd_pipe(qw(git diff-index --cached - --numstat --summary HEAD))) { + --numstat --summary HEAD --), @tracked)) { if (($add, $del, $file) = /^([-\d]+) ([-\d]+) (.*)/) { my ($change, $bin);
@@ -81,7 +86,7 @@ sub list_modified { } } - for (run_cmd_pipe(qw(git diff-files --numstat --summary))) { + for (run_cmd_pipe(qw(git diff-files --numstat --summary --), @tracked)) { if (($add, $del, $file) = /^([-\d]+) ([-\d]+) (.*)/) { if (!exists $data{$file}) {
--
1.5.3.6.870.g8799-dirty