admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pw/stash-p-pathspec-fixes'

Browse Source 
"git stash -p <pathspec>" improvements.

* pw/stash-p-pathspec-fixes:
  stash: allow "git stash [<options>] --patch <pathspec>" to assume push
  stash: allow "git stash -p <pathspec>" to assume push again
This commit is contained in:
Junio C Hamano
2025-06-24 09:48:47 -07:00
parent afe1a7aee7 468817bab2
commit d2fb103447
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/stash.c
View File

@@ -1789,11 +1789,15 @@ static int push_stash(int argc, const char **argv, const char *prefix,
int ret;
if (argc) {
force_assume = !strcmp(argv[0], "-p");
int flags = PARSE_OPT_KEEP_DASHDASH;
if (push_assumed)
flags |= PARSE_OPT_STOP_AT_NON_OPTION;
argc = parse_options(argc, argv, prefix, options,
push_assumed ? git_stash_usage :
git_stash_push_usage,
PARSE_OPT_KEEP_DASHDASH);
git_stash_push_usage, flags);
force_assume |= patch_mode;
}
if (argc) {

22
t/t3903-stash.sh
View File

@@ -1177,6 +1177,28 @@ test_expect_success 'stash -- <pathspec> stashes and restores the file' '
test_path_is_file bar
'
test_expect_success 'stash --patch <pathspec> stash and restores the file' '
test_write_lines b c >file &&
git commit -m "add a few lines" file &&
test_write_lines a b c d >file &&
test_write_lines b c d >expect-file &&
echo changed-other-file >other-file &&
test_write_lines s y n | git stash -m "stash bar" --patch file &&
test_cmp expect-file file &&
echo changed-other-file >expect &&
test_cmp expect other-file &&
git checkout HEAD -- file &&
git stash pop &&
test_cmp expect other-file &&
test_write_lines a b c >expect &&
test_cmp expect file
'
test_expect_success 'stash <pathspec> -p is rejected' '
test_must_fail git stash file -p 2>err &&
test_grep "subcommand wasn${SQ}t specified; ${SQ}push${SQ} can${SQ}t be assumed due to unexpected token ${SQ}file${SQ}" err
'
test_expect_success 'stash -- <pathspec> stashes in subdirectory' '
mkdir sub &&
>foo &&