From: Brandon Casey <casey@nrlssc.navy.mil>
Date: Wed, 6 May 2009 22:56:17 +0000 (-0500)
Subject: t4200: remove two unnecessary lines
X-Git-Tag: v1.6.3~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9eda0e980a43e6bf5167e1b35f457f970bec7b74;p=git.git

t4200: remove two unnecessary lines

These two lines appear to be unnecessary.  They set variables which are not
used afterwards.  The primary motivation to remove them is that the sed
invocation exits non-zero for seds which require newline termination of
input files.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index b68ab11f2..504802c98 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -190,8 +190,6 @@ test_expect_success 'file2 added differently in two branches' '
 	git add file2 &&
 	git commit -m version2 &&
 	test_must_fail git merge fourth &&
-	sha1=$(sed -e "s/	.*//" .git/MERGE_RR) &&
-	rr=.git/rr-cache/$sha1 &&
 	echo Cello > file2 &&
 	git add file2 &&
 	git commit -m resolution