From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Mar 2008 08:10:53 +0000 (-0700)
Subject: Merge branch 'jk/portable'
X-Git-Tag: v1.5.5-rc0~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1f17868b303f762556034db81d02c55de2878e07;p=git.git

Merge branch 'jk/portable'

* jk/portable:
  t6000lib: re-fix tr portability
  t7505: use SHELL_PATH in hook
  t9112: add missing #!/bin/sh header
  filter-branch: use $SHELL_PATH instead of 'sh'
  filter-branch: don't use xargs -0
  add NO_EXTERNAL_GREP build option
  t6000lib: tr portability fix
  t4020: don't use grep -a
  add test_cmp function for test scripts
  remove use of "tail -n 1" and "tail -1"
  grep portability fix: don't use "-e" or "-q"
  more tr portability test script fixes
  t0050: perl portability fix
  tr portability fixes
---

1f17868b303f762556034db81d02c55de2878e07
diff --cc t/t4201-shortlog.sh
index eef4cafda,91ea69631..672b28859
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@@ -45,11 -45,6 +45,11 @@@ A U Thor (5)
  
  EOF
  
- test_expect_success 'shortlog wrapping' 'diff -u expect out'
+ test_expect_success 'shortlog wrapping' 'test_cmp expect out'
  
 +git log HEAD > log
 +GIT_DIR=non-existing git shortlog -w < log > out
 +
 +test_expect_success 'shortlog from non-git directory' 'diff -u expect out'
 +
  test_done