summaryrefslogtreecommitdiff
path: root/transport-helper.c
diff options
context:
space:
mode:
authorLibravatar Jay Soffian <jaysoffian@gmail.com>2011-10-06 14:25:55 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-06 13:24:59 -0700
commitd30db5605b03a45b2848fa9131c3485dc93f7dad (patch)
treeea1d54aaab59c2617037033dc36fcf1e82ae1734 /transport-helper.c
parentGit 1.7.0 (diff)
downloadtgif-d30db5605b03a45b2848fa9131c3485dc93f7dad.tar.xz
merge-one-file: fix "expr: non-numeric argument"
When invoking expr to compare two numbers, don't quote the variables which are the output of 'wc -c'. On OS X, this output includes spaces, which expr balks at: $ sz0=`wc -c </etc/passwd` $ sz1=`wc -c </etc/passwd` $ echo "'$sz0'" ' 3667' $ expr "$sz0" \< "$sz1" \* 2 expr: non-numeric argument $ expr $sz0 \< $sz1 \* 2 1 Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport-helper.c')
0 files changed, 0 insertions, 0 deletions