From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 6 Oct 2011 18:25:55 +0000 (-0400)
Subject: merge-one-file: fix "expr: non-numeric argument"
X-Git-Tag: v1.7.7.1~8^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d30db5605b03a45b2848fa9131c3485dc93f7dad;p=git.git

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>
---

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index d067894bf..ae97e1dfa 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -112,7 +112,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 
 		# If we do not have enough common material, it is not
 		# worth trying two-file merge using common subsections.
-		expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
+		expr $sz0 \< $sz1 \* 2 >/dev/null || : >$orig
 		;;
 	*)
 		echo "Auto-merging $4"