From 743bf6d8b07f0c5717bf5c37b8b50ae9de619c83 Mon Sep 17 00:00:00 2001
From: Phil Hord <hordp@cisco.com>
Date: Tue, 10 Jul 2012 18:52:28 -0400
Subject: stash: invoke rerere in case of conflict

"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 <hordp@cisco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-stash.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'git-stash.sh')

diff --git a/git-stash.sh b/git-stash.sh
index fe4ab28b2e..63d2f59fe5 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -469,6 +469,7 @@ apply_stash () {
 	else
 		# Merge conflict; keep the exit status from merge-recursive
 		status=$?
+		git rerere
 		if test -n "$INDEX_OPTION"
 		then
 			gettextln "Index was not unstashed." >&2
-- 
cgit v1.2.3