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

Merge branch 'cb/maint-stash-orphaned-file'

2010-05-21T11:02:23Z

* cb/maint-stash-orphaned-file: stash tests: stash can lose data in a file removed from the index stash: Don't overwrite files that have gone from the index

Merge branch 'sd/log-decorate'

2010-05-09T05:36:14Z

* sd/log-decorate: log.decorate: only ignore it under "log --pretty=raw" script with rev-list instead of log log --pretty/--oneline: ignore log.decorate log.decorate: usability fixes Add `log.decorate' configuration variable. git_config_maybe_bool() Conflicts: builtin/log.c

stash: Don't overwrite files that have gone from the index

2010-04-18T22:00:03Z

The use of git add -u in create_stash isn't always complete. In particular, if a file has been removed from the index but changed in the work tree it will not be added to the stash's saved work tree tree object. When stash then resets the work tree to match HEAD, any changes will be lost. To be complete, any work tree file which differs from HEAD needs to be saved, regardless of whether it still appears in the index or not. This is achieved with a combination of a diff against HEAD and a call to update-index with an explicit list of paths that have changed. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

script with rev-list instead of log

2010-04-09T06:13:48Z

Because log.decorate now shows decorations for --pretty=oneline, we must explicitly turn it off when scripting. Otherwise, users with log.decorate set will get cruft like: $ git stash Saved working directory and index state WIP on master: 2c1f7f5 (HEAD, master) commit subject Instead of adding --no-decorate to the log command line, let's just use the rev-list plumbing interface instead, which does the right thing. git-submodule has a similar call. Since it just counts the commit lines, nothing is broken, but let's switch it, too, for the sake of consistency and cleanliness. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Improve error messages from 'git stash show'

2010-03-17T02:23:24Z

The previous error message "fatal: Needed a single revision" is not very informative. Signed-off-by: Gustaf Hendeby Signed-off-by: Junio C Hamano

stash: suggest the correct command line for unknown options.

2010-03-07T04:00:42Z

Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'maint-1.6.5' into maint-1.6.6

2010-02-16T23:04:55Z

* maint-1.6.5: dwim_ref: fix dangling symref warning stash pop: remove 'apply' options during 'drop' invocation diff: make sure --output=/bad/path is caught

stash pop: remove 'apply' options during 'drop' invocation

2010-02-16T05:46:27Z

The 'git stash pop' option parsing used to remove the first argument in --index mode. At the time this was implemented, this first argument was always --index. However, since the invention of the -q option in fcdd0e9 (stash: teach quiet option, 2009-06-17) you can cause an internal invocation of git stash drop --index by running git stash pop -q --index which then of course fails because drop doesn't know --index. To handle this, instead let 'git stash apply' decide what the future argument to 'drop' should be. Warning: this means that 'git stash apply' must parse all options that 'drop' can take, and deal with them in the same way. This is currently true for its only option -q. Signed-off-by: Thomas Rast Acked-by: Stephen Boyd Signed-off-by: Junio C Hamano

stash: mention --patch in usage string.

2010-01-02T18:40:55Z

Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

stash list: drop the default limit of 10 stashes

2009-10-20T05:28:26Z

'git stash list' had an undocumented limit of 10 stashes, unless other git-log arguments were specified. This surprised at least one user, but possibly served to cut the output below a screenful without using a pager. Since the last commit, 'git stash list' will fire up a pager according to the same rules as the 'git log' it calls, so we can drop the limit. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano