mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
9375dcf3b9
The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
26 lines
562 B
Bash
Executable File
26 lines
562 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Sam Vilain
|
|
#
|
|
|
|
test_description='git-svn svk merge tickets'
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'load svk depot' "
|
|
svnadmin load -q '$rawsvnrepo' \
|
|
< '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
|
|
git svn init --minimize-url -R svkmerge \
|
|
--rewrite-root=http://svn.example.org \
|
|
-T trunk -b branches '$svnrepo' &&
|
|
git svn fetch --all
|
|
"
|
|
|
|
uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
|
|
|
|
test_expect_success 'svk merges were represented coming in' "
|
|
[ $(git cat-file commit HEAD | grep parent | wc -l) -eq 2 ]
|
|
"
|
|
|
|
test_done
|