git/git-stash.sh, branch v1.6.3

Revert "git-stash: use git rev-parse -q"

2008-12-08T01:30:35Z

This reverts commit 757c7f60a78004fc3d0ea62f44320d54ef430c10 as an unnecessary error message to pop up when the last stash entry is dropped. It simply is not worth the aggravation.

git-stash: use git rev-parse -q

2008-12-03T00:54:01Z

Don't redirect stderr to /dev/null, use -q to suppress the output on stderr. Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano

git-stash.sh: fix flawed fix of invalid ref handling (commit da65e7c1)

2008-10-09T16:09:50Z

The referenced commit tried to fix a flaw in stash's handling of a user supplied invalid ref. i.e. 'git stash apply fake_ref@{0}' should fail instead of applying stash@{0}. But, it did so in a naive way by avoiding the use of the --default option of rev-parse, and instead manually supplied the default revision if the user supplied an empty command line. This prevented a common usage scenario of supplying flags on the stash command line (i.e. non-empty command line) which would be parsed by lower level git commands, without supplying a specific revision. This should fall back to the default revision, but now it causes an error. e.g. 'git stash show -p' The correct fix is to use the --verify option of rev-parse, which fails properly if an invalid ref is supplied, and still allows falling back to a default ref when one is not supplied. Convert stash-drop to use --verify while we're at it, since specifying multiple revisions for any of these commands is also an error and --verify makes it so. Signed-off-by: Brandon Casey Signed-off-by: Shawn O. Pearce

Clarify how the user can satisfy stash's 'dirty state' check.

2008-09-29T15:13:10Z

Signed-off-by: Stephen Haberman Signed-off-by: Shawn O. Pearce

git-stash.sh: don't default to refs/stash if invalid ref supplied

2008-09-24T16:24:20Z

apply_stash() and show_stash() each call rev-parse with '--default refs/stash' as an argument. This option causes rev-parse to operate on refs/stash if it is not able to successfully operate on any element of the command line. This includes failure to supply a "valid" revision. This has the effect of causing 'stash apply' and 'stash show' to operate as if stash@{0} had been supplied when an invalid revision is supplied. e.g. 'git stash apply stash@{1}' would fall back to 'git stash apply stash@{0}' This patch modifies these two functions so that they avoid using the --default option of rev-parse. Signed-off-by: Brandon Casey Signed-off-by: Shawn O. Pearce

stash: refresh the index before deciding if the work tree is dirty

2008-09-06T23:16:42Z

Unlike the case where the user does have a real change in the work tree, refusing to work because of unclean stat information is not very helpful. Signed-off-by: Junio C Hamano Acked-by: Nanako Shiraishi

git-stash: improve synopsis in help and manual page

2008-08-16T09:58:18Z

"git stash -h" showed some incomplete and ugly usage information. For example, the useful "--keep-index" option for "save" or the "--index" option for "apply" were not shown. Also in the documentation synopsis they were not shown, so that there is no incentive to scroll down and even see that such options exist. This patch improves the git-stash synopsis in the documentation by mentioning that further options to the stash commands and then copies this synopsis to the usage information string of git-stash.sh. For the latter, the dashless git command string has to be inserted on the second and the following usage lines. The code of this is taken from git-sh-setup so that all lines will show the command string. Note that the "create" command is not advertised at all now, because it was not mentioned in git-stash.txt. Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano

bash completion: More completions for 'git stash'

2008-08-06T04:21:19Z

Add branch subcommand to completions and USAGE for git-stash.sh. Complete stash names for show, apply, drop, pop, and branch. Add "--index" long option for apply. Signed-off-by: Lee Marlow Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

stash save: fix parameter handling

2008-07-23T23:57:03Z

A command line "git stash save --keep-index I was doing this" was misparsed and keep-index codepath did not trigger. Signed-off-by: Junio C Hamano

Merge branch 'am/stash-branch'

2008-07-13T22:16:09Z

* am/stash-branch: Add a test for "git stash branch" Implement "git stash branch "