kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jay Soffian 2011-10-06 14:25:55 -04:00 committed by Junio C Hamano
parent e923eaeb90
commit d30db5605b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-one-file.sh
View File

@ -112,7 +112,7 @@ case "${1:-.}${2:-.}${3:-.}" in


# If we do not have enough common material, it is not # If we do not have enough common material, it is not
# worth trying two-file merge using common subsections. # 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" echo "Auto-merging $4"