Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/patch-id-use-skip-prefix'
[gitweb.git]
/
t
/
t3030-merge-recursive.sh
diff --git
a/t/t3030-merge-recursive.sh
b/t/t3030-merge-recursive.sh
index 6224187632b105edf1940023eba4a49523d92fe2..f7b0e599f1124c332a106a3b8df6f304382c2fa4 100755
(executable)
--- a/
t/t3030-merge-recursive.sh
+++ b/
t/t3030-merge-recursive.sh
@@
-263,7
+263,7
@@
test_expect_success 'setup 8' '
test_ln_s_add e a &&
test_tick &&
git commit -m "rename a->e, symlink a->e" &&
- oln=
`printf e | git hash-object --stdin`
+ oln=
$(printf e | git hash-object --stdin)
'
test_expect_success 'setup 9' '