projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'
[gnulib.git]
/
tests
/
test-vc-list-files-git.sh
diff --git
a/tests/test-vc-list-files-git.sh
b/tests/test-vc-list-files-git.sh
index
a42aec1
..
b31f99a
100755
(executable)
--- a/
tests/test-vc-list-files-git.sh
+++ b/
tests/test-vc-list-files-git.sh
@@
-1,6
+1,6
@@
#!/bin/sh
# Unit tests for vc-list-files
#!/bin/sh
# Unit tests for vc-list-files
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008
-2014
Free Software Foundation, Inc.
# This file is part of the GNUlib Library.
#
# This program is free software: you can redistribute it and/or modify
# This file is part of the GNUlib Library.
#
# This program is free software: you can redistribute it and/or modify
@@
-16,26
+16,22
@@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. */
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. */
-if ( diff --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then
- compare() { diff -u "$@"; }
-elif ( cmp --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then
- compare() { cmp -s "$@"; }
-else
- compare() { cmp "$@"; }
-fi
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ "$abs_aux_dir" .
tmpdir=vc-git-$$
tmpdir=vc-git-$$
-trap 'st=$?; cd '"`pwd`"' && rm -rf $tmpdir; exit $st' 0
-trap '(exit $?); exit $?' 1 2 13 15
+GIT_DIR= GIT_WORK_TREE=; unset GIT_DIR GIT_WORK_TREE
fail=1
mkdir $tmpdir && cd $tmpdir &&
# without git, skip the test
# The double use of 'exit' is needed for the reference to $? inside the trap.
{ ( git init -q ) > /dev/null 2>&1 \
fail=1
mkdir $tmpdir && cd $tmpdir &&
# without git, skip the test
# The double use of 'exit' is needed for the reference to $? inside the trap.
{ ( git init -q ) > /dev/null 2>&1 \
- ||
{ echo "Skipping test: git not found in PATH"; (exit 77); exit 77; }
; } &&
+ ||
skip_ "git not found in PATH"
; } &&
mkdir d &&
touch d/a b c &&
mkdir d &&
touch d/a b c &&
+ git config user.email "you@example.com" &&
+ git config user.name "Your Name" &&
git add . > /dev/null &&
git commit -q -a -m log &&
printf '%s\n' b c d/a > expected &&
git add . > /dev/null &&
git commit -q -a -m log &&
printf '%s\n' b c d/a > expected &&
@@
-43,4
+39,4
@@
mkdir $tmpdir && cd $tmpdir &&
compare expected actual &&
fail=0
compare expected actual &&
fail=0
-
(exit $fail); e
xit $fail
+
E
xit $fail