user/sven/git.git/git-stash.sh, branch v1.8.0.2

Merge branch 'ph/stash-rerere'

2012-09-03T22:54:12Z

"git stash" internally used "git merge-recursive" backend, which did not trigger "rerere" upon conflicts unlike other mergy operations. * ph/stash-rerere: stash: invoke rerere in case of conflict test: git-stash conflict sets up rerere

stash: invoke rerere in case of conflict

2012-08-17T17:59:17Z

"stash apply" directly calls a backend merge function which does not automatically invoke rerere. This confuses mergetool when leftover rerere state is left behind from previous merges. Invoke rerere explicitly when we encounter a conflict during stash apply. This turns the test introduced by the previous commit to succeed. Signed-off-by: Phil Hord Signed-off-by: Junio C Hamano

stash: use eval_gettextln correctly

2012-04-14T23:31:02Z

Otherwise, passing an invalid option, git stash -v, gave: git-stash: line 204: $'error: unknown option for \'stash save\': $option\n To provide a message, use git stash save -- \'$option\'': command not found Signed-off-by: Ross Lagerwall Signed-off-by: Junio C Hamano

stash: Don't fail if work dir contains file named 'HEAD'

2012-01-01T09:11:56Z

When performing a plain "git stash" (without --patch), git-diff would fail with "fatal: ambiguous argument 'HEAD': both revision and filename". The output was piped into git-update-index, masking the failed exit status. The output is now sent to a temporary file (which is cleaned up by existing code), and the exit status is checked. The "HEAD" arg to the git-diff invocation has been disambiguated too, of course. In patch mode, "git stash -p" would fail harmlessly, leaving the working dir untouched. Interactive adding is fine, but the resulting tree was diffed with an ambiguous 'HEAD' argument. Use >foo (no space) when redirecting output. In t3904, checks and operations on each file are in the order they'll appear when interactively staging. In t3905, fix a bug in "stash save --include-untracked -q is quiet": The redirected stdout file was considered untracked, and so was removed from the working directory. Use test path helper functions where appropriate. Signed-off-by: Jonathon Mah Acked-by: Thomas Rast Signed-off-by: Junio C Hamano

Merge branch 'bc/unstash-clean-crufts'

2011-10-05T19:36:17Z

* bc/unstash-clean-crufts: git-stash: remove untracked/ignored directories when stashed t/t3905: add missing '&&' linkage git-stash.sh: fix typo in error message t/t3905: use the name 'actual' for test output, swap arguments to test_cmp

git-stash: remove untracked/ignored directories when stashed

2011-08-27T18:12:18Z

The two new stash options --include-untracked and --all do not remove the untracked and/or ignored files that are stashed if those files reside in a subdirectory. e.g. the following sequence fails: mkdir untracked && echo hello >untracked/file.txt && git stash --include-untracked && test ! -f untracked/file.txt Within the git-stash script, git-clean is used to remove the untracked/ignored files, but since the -d option was not supplied, it does not remove directories. So, add -d to the git-clean arguments, and update the tests to test this functionality. Reported-by: Hilco Wijbenga Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

git-stash.sh: fix typo in error message

2011-08-27T18:12:13Z

Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

stash: take advantage of eval_gettextln

2011-08-08T19:05:22Z

Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano

Merge branch 'dc/stash-con-untracked'

2011-07-22T21:46:28Z

* dc/stash-con-untracked: stash: Add --include-untracked option to stash and remove all untracked files Conflicts: git-stash.sh

stash: Add --include-untracked option to stash and remove all untracked files

2011-06-26T19:50:46Z

The --include-untracked option acts like the normal "git stash save" but also adds all untracked files in the working directory to the stash and then calls "git clean --force --quiet" to restore the working directory to a pristine state. This is useful for projects that need to run release scripts. With this option, the release scripts can be from the main working directory so one does not have to maintain a "clean" directory in parallel just for releasing. Basically the work-flow becomes: $ git tag release-1.0 $ git stash --include-untracked $ make release $ git clean -f $ git stash pop "git stash" alone is not enough in this case--it leaves untracked files lying around that might mess up a release process that expects everything to be very clean or might let a release succeed that should actually fail (due to a new source file being created that hasn't been committed yet). Signed-off-by: David Caldwell Signed-off-by: Junio C Hamano