path: root/
diff options
authorJeff King <>2011-04-05 21:23:15 (GMT)
committerJunio C Hamano <>2011-04-06 16:41:22 (GMT)
commite0e2a9cbfa938d0f1e9857d5ca5b196360663440 (patch)
tree64fb74636a1e64564e5b6628a567c1f6316dc591 /
parentfa38cfc2c6ce197960f85798aac18ee78aa83f1f (diff)
stash: drop dirty worktree check on apply
Before we apply a stash, we make sure there are no changes in the worktree that are not in the index. This check dates back to the original, and is presumably intended to prevent changes in the working tree from being accidentally lost during the merge. However, this check has two problems: 1. It is overly restrictive. If my stash changes only file "foo", but "bar" is dirty in the working tree, it will prevent us from applying the stash. 2. It is redundant. We don't touch the working tree at all until we actually call merge-recursive. But it has its own (much more accurate) checks to avoid losing working tree data, and will abort the merge with a nicer message telling us which paths were problems. So we can simply drop the check entirely. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 1 insertions, 3 deletions
diff --git a/ b/
index a305fb1..fbd4bc1 100755
--- a/
+++ b/
@@ -344,9 +344,7 @@ apply_stash () {
assert_stash_like "$@"
- git update-index -q --refresh &&
- git diff-files --quiet --ignore-submodules ||
- die 'Cannot apply to a dirty working tree, please stage your changes'
+ git update-index -q --refresh || die 'unable to refresh index'
# current index state
c_tree=$(git write-tree) ||