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>
Jay Soffian committed
Oct 6, 2011 at 14:25 UTC
d30db5605b03a45b2848fa9131c3485dc93f7dad
1 file changed
+1
-1
git-merge-one-file.sh
+1
-1
@@ -112,7 +112,7 @@ case "${1:-.}${2:-.}${3:-.}" in
112
113
# If we do not have enough common material, it is not
114
# worth trying two-file merge using common subsections.
115
- expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
115
+ expr $sz0 \< $sz1 \* 2 >/dev/null || : >$orig
116
;;
117
*)
118
echo "Auto-merging $4"