diff options
| author | Jeff King <peff@peff.net> | 2008-03-12 17:34:34 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-13 00:57:52 -0700 |
| commit | b4ce54fc61e7c76e2d7f47c34733f0f0bbb6c4cd (patch) | |
| tree | 4bb61d23645a1402c253f7b40e3ed9653999914a /t/t7600-merge.sh | |
| parent | aadbe44f883859536c5320e0ac1d6ed122c45671 (diff) | |
| download | git-b4ce54fc61e7c76e2d7f47c34733f0f0bbb6c4cd.tar.gz git-b4ce54fc61e7c76e2d7f47c34733f0f0bbb6c4cd.tar.xz | |
remove use of "tail -n 1" and "tail -1"
The "-n" syntax is not supported by System V versions of
tail (which prefer "tail -1"). Unfortunately "tail -1" is
not actually POSIX. We had some of both forms in our
scripts.
Since neither form works everywhere, this patch replaces
both with the equivalent sed invocation:
sed -ne '$p'
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 590505bea..219411fd0 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -165,7 +165,7 @@ verify_mergeheads() { fi && while test $# -gt 0 do - head=$(head -n $i .git/MERGE_HEAD | tail -n 1) + head=$(head -n $i .git/MERGE_HEAD | sed -ne \$p) if test "$1" != "$head" then echo "[OOPS] MERGE_HEAD $i != $1" |