From: Brandon Casey Date: Wed, 06 May 2009 22:56:17 GMT Subject: [PATCH 1/2] t4200: remove two unnecessary lines Message-ID: In-Reply-To: <7vpreluckk.fsf@alter.siamese.dyndns.org> 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 --- t/t4200-rerere.sh | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index b68ab11..504802c 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 -- 1.6.2.4.24.gde59d2