git/git-stash.sh, branch v2.3.3

Merge branch 'da/rev-parse-verify-quiet'

2014-09-29T19:36:10Z

"rev-parse --verify --quiet $name" is meant to quietly exit with a non-zero status when $name is not a valid object name, but still gave error messages in some cases. * da/rev-parse-verify-quiet: stash: prefer --quiet over shell redirection of the standard error stream refs: make rev-parse --quiet actually quiet t1503: use test_must_be_empty Documentation: a note about stdout for git rev-parse --verify --quiet

Merge branch 'ah/grammofix'

2014-09-19T18:38:35Z

* ah/grammofix: grammofix in user-facing messages

stash: prefer --quiet over shell redirection of the standard error stream

2014-09-19T17:51:59Z

Use `git rev-parse --verify --quiet` instead of redirecting stderr to /dev/null. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'jk/stash-list-p'

2014-09-09T19:54:00Z

Teach "git stash list -p" to show the difference between the base commit version and the working tree version, which is in line with what "git show" gives. * jk/stash-list-p: stash: default listing to working-tree diff

grammofix in user-facing messages

2014-09-02T19:00:30Z

Signed-off-by: Alex Henrie Acked-by: Johan Herland Signed-off-by: Junio C Hamano

stash: default listing to working-tree diff

2014-08-07T21:37:28Z

When you list stashes, you can provide arbitrary git-log options to change the display. However, adding just "-p" does nothing, because each stash is actually a merge commit. This implementation detail is easy to forget, leading to confused users who think "-p" is not working. We can make this easier by defaulting to "--first-parent -m", which will show the diff against the working tree. This omits the index portion of the stash entirely, but it's simple and it matches what "git stash show" provides. People who are more clueful about stash's true form can use "--cc" to override the "-m", and the "--first-parent" will then do nothing. For diffs, it only affects non-combined diffs, so "--cc" overrides it. And for the traversal, we are walking the linear reflog anyway, so we do not even care about the parents. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ep/shell-assign-and-export-vars'

2014-06-06T18:38:51Z

* ep/shell-assign-and-export-vars: scripts: more "export VAR=VALUE" fixes scripts: "export VAR=VALUE" construct is not portable

scripts: "export VAR=VALUE" construct is not portable

2014-05-23T22:32:33Z

Found by check-non-portable-shell.pl Signed-off-by: Elia Pinto Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

git-stash.sh: use the $( ... ) construct for command substitution

2014-04-23T22:17:02Z

The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`$.*$`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'jc/stash-pop-not-popped' into maint

2014-04-03T20:39:03Z

* jc/stash-pop-not-popped: stash pop: mention we did not drop the stash upon failing to apply