Skip to content

Commit 9eda0e9

Browse files
drafnelgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d8b69ec commit 9eda0e9

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

t/t4200-rerere.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,6 @@ test_expect_success 'file2 added differently in two branches' '
190190
git add file2 &&
191191
git commit -m version2 &&
192192
test_must_fail git merge fourth &&
193-
sha1=$(sed -e "s/ .*//" .git/MERGE_RR) &&
194-
rr=.git/rr-cache/$sha1 &&
195193
echo Cello > file2 &&
196194
git add file2 &&
197195
git commit -m resolution

0 commit comments

Comments
 (0)