Skip to content

deprecate git stash save

Thomas Gummerer git 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest3 patches 6 repliesIn review
  2. v22 patches 4 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3replace git stash save with git stash push in the documentationDocumentation/git-stash.txt Documentation/gitworkflows.txt Documentation/user-manual.txt +1 more+13 -130 replies
2/3mark git stash push deprecated in the man pageDocumentation/git-stash.txt+6 -30 replies
3/3stash: remove now superfluos help for "stash push"git-stash.sh+1 -120 replies

Reviews trailers per patch

None of the 3 patches has a Reviewed-by or Acked-by.

PatchRobert P. J. DayJeff King
1/3
2/3Helped-by Helped-by
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/3] deprecate git stash save

Thanks Peff for the review of the previous rounds.

In addition to addressing the review comments, this round adds another patch getting rid of the extra help with an unknown option to git stash push.

Interdiff below:

Documentation/git-stash.txt +3 -1
index 89b6a0e672..8be661007d 100644
@@ -86,7 +86,9 @@ The `--patch` option implies `--keep-index`.  You can use
 
 save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
 
-	This option is deprecated in favour of 'git stash push'.
+	This option is deprecated in favour of 'git stash push'.  It
+	differs from "stash push" in that it cannot take pathspecs,
+	and any non-option arguments form the message.
 
 list [<options>]::
 
git-stash.sh +1 -12
index 16919277ba..4b74951440 100755
@@ -260,18 +260,7 @@ push_stash () {
 			;;
 		-*)
 			option="$1"
-			# TRANSLATORS: $option is an invalid option, like
-			# `--blah-blah'. The 7 spaces at the beginning of the
-			# second line correspond to "error: ". So you should line
-			# up the second line with however many characters the
-			# translation of "error: " takes in your language. E.g. in
-			# English this is:
-			#
-			#    $ git stash push --blah-blah 2>&1 | head -n 2
-			#    error: unknown option for 'stash push': --blah-blah
-			#           To provide a message, use git stash push -- '--blah-blah'
-			eval_gettextln "error: unknown option for 'stash push': \$option
-       To provide a message, use git stash push -m '\$option'"
+			eval_gettextln "error: unknown option for 'stash push': \$option"
 			usage
 			;;
 		*)

Thomas Gummerer (3):
replace git stash save with git stash push in the documentation mark git stash push deprecated in the man page
stash: remove now superfluos help for "stash push"

 Documentation/git-stash.txt    | 21 ++++++++++++---------
 Documentation/gitworkflows.txt |  2 +-
 Documentation/user-manual.txt  |  2 +-
 git-stash.sh                   | 13 +------------
 4 files changed, 15 insertions(+), 23 deletions(-)
Signature · 1 line
2.15.0.rc0.2.g8fac3e73c8.dirty