diff options
| author |  Jay Soffian <jaysoffian@gmail.com> | 2011-10-06 14:25:55 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-06 13:24:59 -0700 |
| commit | d30db5605b03a45b2848fa9131c3485dc93f7dad (patch) | |
| tree | ea1d54aaab59c2617037033dc36fcf1e82ae1734 /Documentation/RelNotes-1.6.0.txt | |
| parent | Git 1.7.0 (diff) | |
| download | tgif-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 'Documentation/RelNotes-1.6.0.txt')
0 files changed, 0 insertions, 0 deletions