stash: support pathspec argument
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v8 Latest6 patches 3 repliesIn review
- v76 patches 6 repliesSuperseded
- v66 patches 6 repliesSuperseded
Earlier versions · 5
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v5 | 6 patches | 8 replies | Superseded | |
| v4 | 7 patches | 2 replies | Superseded | |
| v3 | 5 patches | 21 replies | Superseded | |
| v2 | 4 patches | 8 replies | Superseded | |
| v1 | 3 patches | 13 replies | Superseded |
Patches in v8 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | stash: introduce push verbDocumentation/ git-stash.sh t/ | +55 | 0 replies | |
| 2/6 | stash: add test for the create command line argumentst/ | +18 | 0 replies | |
| 3/6 | stash: refactor stash_creategit-stash.sh | +18 | 0 replies | |
| 4/6 | stash: teach 'push' (and 'create_stash') to honor pathspecDocumentation/ git-stash.sh t/ +1 more | +154 | 3 replies | |
| 5/6 | stash: use stash_push for no verb formDocumentation/ git-stash.sh t/ | +13 | 0 replies | |
| 6/6 | stash: allow pathspecs in the no verb formDocumentation/ git-stash.sh t/ | +25 | 0 replies |
Reviews trailers per patch
None of the 6 patches has a Reviewed-by or Acked-by.
| Patch | Junio C Hamano |
|---|---|
| 1/6 | Helped-by |
| 2/6 | |
| 3/6 | |
| 4/6 | Helped-by |
| 5/6 | |
| 6/6 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v8 0/6] stash: support pathspec argument
Thanks Junio for the review and the squashable diff with the fix for my errors.
I changed it a tiny bit, to use git stash push instead of git stash, so the complete diff could go into 4/6, where I think I think the test fits best.
Interdiff below:
git-stash.sh +2 -0
@@ -300,6 +300,8 @@ push_stash () { if test $# != 0 then git reset ${GIT_QUIET:+-q} -- "$@" + git ls-files -z --modified -- "$@" | + git checkout-index -z --force --stdin git checkout ${GIT_QUIET:+-q} HEAD -- $(git ls-files -z --modified "$@") git clean --force ${GIT_QUIET:+-q} -d -- "$@" else
t/t3903-stash.sh +16 -0
@@ -842,6 +842,22 @@ test_expect_success 'stash with file including $IFS character' ' test_path_is_file bar ' +test_expect_success 'stash with pathspec matching multiple paths' ' + echo original >file && + echo original >other-file && + git commit -m "two" file other-file && + echo modified >file && + echo modified >other-file && + git stash push -- "*file" && + echo original >expect && + test_cmp expect file && + test_cmp expect other-file && + git stash pop && + echo modified >expect && + test_cmp expect file && + test_cmp expect other-file +' + test_expect_success 'stash push -p with pathspec shows no changes only once' ' >foo && git add foo &&
Thomas Gummerer (6):
stash: introduce push verb
stash: add test for the create command line arguments
stash: refactor stash_create
stash: teach 'push' (and 'create_stash') to honor pathspec
stash: use stash_push for no verb form
stash: allow pathspecs in the no verb form
Documentation/git-stash.txt | 25 +++++-- git-stash.sh | 116 +++++++++++++++++++++++++------ t/t3903-stash.sh | 138 ++++++++++++++++++++++++++++++++++++- t/t3905-stash-include-untracked.sh | 26 +++++++ 4 files changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.12.0.428.g67fe103aa