OSDN Git Service

t4200: remove two unnecessary lines
authorBrandon Casey <casey@nrlssc.navy.mil>
Wed, 6 May 2009 22:56:17 +0000 (17:56 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2009 23:43:28 +0000 (16:43 -0700)
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>
t/t4200-rerere.sh

index b68ab11..504802c 100755 (executable)
@@ -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