зеркало из https://github.com/microsoft/git.git
posix compatibility for t4200
Fix t4200 so that it also works on OS X by not relying on gnu extensions to sed. Signed-off-by: Bryan Larsen <bryan@larsen.st> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
e4e92b3f4b
Коммит
c256acb8fb
|
@ -44,7 +44,7 @@ mkdir .git/rr-cache
|
|||
|
||||
test_expect_failure 'conflicting merge' 'git pull . first'
|
||||
|
||||
sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)
|
||||
sha1=$(sed -e 's/ .*//' .git/rr-cache/MERGE_RR)
|
||||
rr=.git/rr-cache/$sha1
|
||||
test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче