From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 18:10:12 +0000 (-0700)
Subject: Merge branch 'ph/stash-rerere' into maint-1.7.11
X-Git-Tag: v1.7.11.6~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ef92392b6c8596b61eab6f2045a54c086f340cf7?ds=inline;hp=-c

Merge branch 'ph/stash-rerere' into maint-1.7.11

* ph/stash-rerere:
stash: invoke rerere in case of conflict
test: git-stash conflict sets up rerere
---

ef92392b6c8596b61eab6f2045a54c086f340cf7
diff --combined git-stash.sh
index 4e2c7f8331,63d2f59fe5..bbefdf6424
--- a/git-stash.sh
+++ b/git-stash.sh
@@@ -199,8 -199,8 +199,8 @@@ save_stash () 
  			#    $ git stash save --blah-blah 2>&1 | head -n 2
  			#    error: unknown option for 'stash save': --blah-blah
  			#           To provide a message, use git stash save -- '--blah-blah'
 -			eval_gettextln "$("error: unknown option for 'stash save': \$option
 -       To provide a message, use git stash save -- '\$option'")"
 +			eval_gettextln "error: unknown option for 'stash save': \$option
 +       To provide a message, use git stash save -- '\$option'"
  			usage
  			;;
  		*)
@@@ -469,6 -469,7 +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