Skip to content

stash push -u -- <pathspec> fixes

Thomas Gummerer git 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest3 patches 4 repliesIn review
  2. v32 patches 3 repliesSuperseded
  3. v22 patches 4 repliesSuperseded

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3stash: fix nonsense pipelinegit-stash.sh+3 -30 replies
2/3stash push: avoid printing errorsgit-stash.sh t/t3905-stash-include-untracked.sh+50 -25 replies
3/3stash push -u: don't create empty stashgit-stash.sh t/t3905-stash-include-untracked.sh+7 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v5 yet.

Read the v5 thread

Cover letter [PATCH v5 0/3] stash push -u -- <pathspec> fixes

Thanks again Marc for all the testing and Junio for fixing up my brown paper bag copy-pasto.

This iteration addresses the breakage Marc noticed with the latest version of the patches, adds some more tests, and moves all the new tests to t3905 instead of t3903, which I just noticed exists and is a much better match for the new tests.

Patch 1 and 3 are the same as in the previous round, Patch 2 is mostly rewritten. Instead of trying to avoid part of the pipeline we're using to get rid of changes, we now are getting rid of the 'git clean' call in the pathspec case, and use the existing pipeline to get rid of changes in untracked files as well. I'm not adding an interdiff, because Patch 2 is mostly rewritten and the other two are unchanged, so it is probably easiest to just review patch 2.

Junio C Hamano (1):
stash: fix nonsense pipeline

Thomas Gummerer (2):
stash push: avoid printing errors
stash push -u: don't create empty stash

 git-stash.sh                       | 12 +++++----
 t/t3905-stash-include-untracked.sh | 52 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 5 deletions(-)
Signature · 1 line
2.15.1.33.g3165b24a68