undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lf/echo-n-is-not-portable'

Browse Source 
* lf/echo-n-is-not-portable:
  Avoid using `echo -n` anywhere
This commit is contained in:
Junio C Hamano 2013-08-01 11:52:43 -07:00
commit a5203a3f04
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/subtree/git-subtree.sh
View File

@ -311,7 +311,7 @@ copy_commit()
GIT_COMMITTER_NAME \ GIT_COMMITTER_NAME \
GIT_COMMITTER_EMAIL \ GIT_COMMITTER_EMAIL \
GIT_COMMITTER_DATE GIT_COMMITTER_DATE
(echo -n "$annotate"; cat ) | (printf "%s" "$annotate"; cat ) |
git commit-tree "$2" $3 # reads the rest of stdin git commit-tree "$2" $3 # reads the rest of stdin
) || die "Can't copy commit $1" ) || die "Can't copy commit $1"
} }

8
contrib/subtree/t/t7900-subtree.sh
View File

@ -182,9 +182,9 @@ test_expect_success 'merge new subproj history into subdir' '
test_expect_success 'Check that prefix argument is required for split' ' test_expect_success 'Check that prefix argument is required for split' '
echo "You must provide the --prefix option." > expected && echo "You must provide the --prefix option." > expected &&
test_must_fail git subtree split > actual 2>&1 && test_must_fail git subtree split > actual 2>&1 &&
test_debug "echo -n expected: " && test_debug "printf '"'"'expected: '"'"'" &&
test_debug "cat expected" && test_debug "cat expected" &&
test_debug "echo -n actual: " && test_debug "printf '"'"'actual: '"'"'" &&
test_debug "cat actual" && test_debug "cat actual" &&
test_cmp expected actual && test_cmp expected actual &&
rm -f expected actual rm -f expected actual
@ -193,9 +193,9 @@ test_expect_success 'Check that prefix argument is required for split' '
test_expect_success 'Check that the <prefix> exists for a split' ' test_expect_success 'Check that the <prefix> exists for a split' '
echo "'"'"'non-existent-directory'"'"'" does not exist\; use "'"'"'git subtree add'"'"'" > expected && echo "'"'"'non-existent-directory'"'"'" does not exist\; use "'"'"'git subtree add'"'"'" > expected &&
test_must_fail git subtree split --prefix=non-existent-directory > actual 2>&1 && test_must_fail git subtree split --prefix=non-existent-directory > actual 2>&1 &&
test_debug "echo -n expected: " && test_debug "printf '"'"'expected: '"'"'" &&
test_debug "cat expected" && test_debug "cat expected" &&
test_debug "echo -n actual: " && test_debug "printf '"'"'actual: '"'"'" &&
test_debug "cat actual" && test_debug "cat actual" &&
test_cmp expected actual test_cmp expected actual
# rm -f expected actual # rm -f expected actual

4
t/perf/perf-lib.sh
View File

@ -161,7 +161,7 @@ test_perf () {
echo "$test_count" >>"$perf_results_dir"/$base.subtests echo "$test_count" >>"$perf_results_dir"/$base.subtests
echo "$1" >"$perf_results_dir"/$base.$test_count.descr echo "$1" >"$perf_results_dir"/$base.$test_count.descr
if test -z "$verbose"; then if test -z "$verbose"; then
echo -n "perf $test_count - $1:" printf "%s" "perf $test_count - $1:"
else else
echo "perf $test_count - $1:" echo "perf $test_count - $1:"
fi fi
@ -170,7 +170,7 @@ test_perf () {
if test_run_perf_ "$2" if test_run_perf_ "$2"
then then
if test -z "$verbose"; then if test -z "$verbose"; then
echo -n " $i" printf " %s" "$i"
else else
echo "* timing run $i/$GIT_PERF_REPEAT_COUNT:" echo "* timing run $i/$GIT_PERF_REPEAT_COUNT:"
fi fi