diff options
| author | Jay Soffian <jaysoffian@gmail.com> | 2011-10-06 18:25:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-06 20:24:59 (GMT) |
| commit | d30db5605b03a45b2848fa9131c3485dc93f7dad (patch) | |
| tree | ea1d54aaab59c2617037033dc36fcf1e82ae1734 /git-merge-one-file.sh | |
| parent | e923eaeb901ff056421b9007adcbbce271caa7b6 (diff) | |
| download | git-d30db5605b03a45b2848fa9131c3485dc93f7dad.zip git-d30db5605b03a45b2848fa9131c3485dc93f7dad.tar.gz git-d30db5605b03a45b2848fa9131c3485dc93f7dad.tar.bz2 | |
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 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index d067894..ae97e1d 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" |