undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-add: allow path limiting with -u

Browse Source 
Rather than updating all working tree paths, we limit
ourselves to paths listed on the command line.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jeff King 2007-05-12 02:42:00 -04:00 committed by Junio C Hamano
parent 16a4c6176a
commit 93c44d493b
2 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin-add.c
View File

@ -16,7 +16,7 @@
static const char builtin_add_usage[] = static const char builtin_add_usage[] =
"git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--] <filepattern>..."; "git-add [-n] [-v] [-f] [--interactive | -i] [-u] [--] <filepattern>...";
static int take_all_worktree_changes; static int take_worktree_changes;
static const char *excludes_file; static const char *excludes_file;
static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix) static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
@ -122,11 +122,12 @@ static void update_callback(struct diff_queue_struct *q,
} }
} }
static void update_all(int verbose) static void update(int verbose, const char **files)
{ {
struct rev_info rev; struct rev_info rev;
init_revisions(&rev, ""); init_revisions(&rev, "");
setup_revisions(0, NULL, &rev, NULL); setup_revisions(0, NULL, &rev, NULL);
rev.prune_data = get_pathspec(rev.prefix, files);
rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = update_callback; rev.diffopt.format_callback = update_callback;
rev.diffopt.format_callback_data = &verbose; rev.diffopt.format_callback_data = &verbose;
@ -200,16 +201,14 @@ int cmd_add(int argc, const char **argv, const char *prefix)
continue; continue;
} }
if (!strcmp(arg, "-u")) { if (!strcmp(arg, "-u")) {
take_all_worktree_changes = 1; take_worktree_changes = 1;
continue; continue;
} }
usage(builtin_add_usage); usage(builtin_add_usage);
} }
if (take_all_worktree_changes) { if (take_worktree_changes) {
if (i < argc) update(verbose, argv + i);
die("-u and explicit paths are incompatible");
update_all(verbose);
goto finish; goto finish;
} }

38
t/t2200-add-update.sh Executable file
View File

@ -0,0 +1,38 @@
#!/bin/sh
test_description='git-add -u with path limiting
This test creates a working tree state with three files:
top (previously committed, modified)
dir/sub (previously committed, modified)
dir/other (untracked)
and issues a git-add -u with path limiting on "dir" to add
only the updates to dir/sub.'
. ./test-lib.sh
test_expect_success 'setup' '
echo initial >top &&
mkdir dir &&
echo initial >dir/sub &&
git-add dir/sub top &&
git-commit -m initial &&
echo changed >top &&
echo changed >dir/sub &&
echo other >dir/other
'
test_expect_success 'update' 'git-add -u dir'
test_expect_success 'update touched correct path' \
'test "`git-diff-files --name-status dir/sub`" = ""'
test_expect_success 'update did not touch other tracked files' \
'test "`git-diff-files --name-status top`" = "M top"'
test_expect_success 'update did not touch untracked files' \
'test "`git-diff-files --name-status dir/other`" = ""'
test_done