[PATCH 2/4] merge-one-file: use 'wc' more portably
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:42:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
Some wc prefix the number by a tab. Be prepared for this. Signed-off-by: Johannes Schindelin <redacted> --- git-merge-one-file.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7d62d79..bc7c5ef 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh@@ -87,9 +87,9 @@ case "${1:-.}${2:-.}${3:-.}" in # This extracts OUR file in $orig, and uses git-apply to # remove lines that are unique to ours. orig=`git-unpack-file $2` - sz0=`wc -c <"$orig"` + sz0=`wc -c <"$orig" | tr -dc 0-9` diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add - sz1=`wc -c <"$orig"` + sz1=`wc -c <"$orig" | tr -dc 0-9` # If we do not have enough common material, it is not # worth trying two-file merge using common subsections.
--
1.5.0.rc2.gc5868-dirty