projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e4e92b3
)
posix compatibility for t4200
author
Bryan Larsen
<bryan@larsen.st>
Wed, 2 May 2007 21:53:23 +0000
(17:53 -0400)
committer
Junio C Hamano
<junkio@cox.net>
Fri, 4 May 2007 05:58:01 +0000
(22:58 -0700)
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>
t/t4200-rerere.sh
patch
|
blob
|
history
diff --git
a/t/t4200-rerere.sh
b/t/t4200-rerere.sh
index 6ba63d7173ba5d333d80c017c4ef5a8c77b90a11..c64ebbb2e9e9eaf3fbb792a4f119cd9a1c2b4352 100755
(executable)
--- a/
t/t4200-rerere.sh
+++ b/
t/t4200-rerere.sh
@@
-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"