Skip to content

Commit

Permalink
built-in stash: handle :(glob) pathspecs again
Browse files Browse the repository at this point in the history
When passing a list of pathspecs to, say, `git add`, we need to be
careful to use the original form, not the parsed form of the pathspecs.

This makes a difference e.g. when calling

	git stash -- ':(glob)**/*.txt'

where the original form includes the `:(glob)` prefix while the parsed
form does not.

However, in the built-in `git stash`, we passed the parsed (i.e.
incorrect) form, and `git add` would fail with the error message:

	fatal: pathspec '**/*.txt' did not match any files

at the stage where `git stash` drops the changes from the worktree, even
if `refs/stash` has been actually updated successfully.

This fixes #2037

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Mar 11, 2019
1 parent 18ec268 commit 877c51e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
5 changes: 3 additions & 2 deletions builtin/stash.c
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ static void add_pathspecs(struct argv_array *args,
int i;

for (i = 0; i < ps.nr; i++)
argv_array_push(args, ps.items[i].match);
argv_array_push(args, ps.items[i].original);
}

/*
Expand Down Expand Up @@ -1468,7 +1468,8 @@ static int push_stash(int argc, const char **argv, const char *prefix)
git_stash_push_usage,
0);

parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL, prefix, argv);
parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
prefix, argv);
return do_push_stash(ps, stash_msg, quiet, keep_index, patch_mode,
include_untracked);
}
Expand Down
6 changes: 6 additions & 0 deletions t/t3905-stash-include-untracked.sh
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,10 @@ test_expect_success 'stash -u -- <non-existant> shows no changes when there are
test_i18ncmp expect actual
'

test_expect_success 'stash -u with globs' '
>untracked.txt &&
git stash -u -- ":(glob)**/*.txt" &&
test_path_is_missing untracked.txt
'

test_done

0 comments on commit 877c51e

Please sign in to comment.