From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jan 2017 23:12:16 +0000 (-0800)
Subject: Merge branch 'rh/mergetool-regression-fix'
X-Git-Tag: v2.12.0-rc0~60
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7cef7fadab5de8ae39ece585005b19334aee6a4d;p=git-core%2Fgit.git

Merge branch 'rh/mergetool-regression-fix'

"git mergetool" without any pathspec on the command line that is
run from a subdirectory became no-op in Git v2.11 by mistake, which
has been fixed.

* rh/mergetool-regression-fix:
  mergetool: fix running in subdir when rerere enabled
  mergetool: take the "-O" out of $orderfile
  t7610: add test case for rerere+mergetool+subdir bug
  t7610: spell 'git reset --hard' consistently
  t7610: don't assume the checked-out commit
  t7610: always work on a test-specific branch
  t7610: delete some now-unnecessary 'git reset --hard' lines
  t7610: run 'git reset --hard' after each test to clean up
  t7610: don't rely on state from previous test
  t7610: use test_when_finished for cleanup tasks
  t7610: move setup code to the 'setup' test case
  t7610: update branch names to match test number
  rev-parse doc: pass "--" to rev-parse in the --prefix example
  .mailmap: record canonical email for Richard Hansen
---

7cef7fadab5de8ae39ece585005b19334aee6a4d
diff --cc t/t7610-mergetool.sh
index 0fe7e58cf,180dd7057..381b7df45
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@@ -602,9 -660,8 +660,8 @@@ test_expect_success MKTEMP 'temporary f
  	test_config mergetool.myecho.trustExitCode true &&
  	test_must_fail git merge master &&
  	git mergetool --no-prompt --tool myecho -- both >actual &&
 -	test_must_fail grep ^\./both_LOCAL_ actual >/dev/null &&
 +	! grep ^\./both_LOCAL_ actual >/dev/null &&
- 	grep /both_LOCAL_ actual >/dev/null &&
- 	git reset --hard master >/dev/null 2>&1
+ 	grep /both_LOCAL_ actual >/dev/null
  '
  
  test_expect_success 'diff.orderFile configuration is honored' '