diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-04-25 10:23:53 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-04-25 10:23:53 +0200 |
| commit | c335e0ec67853b066fae56f6c61b0dbde4c71d74 (patch) | |
| tree | 0a854e70f4db4bf991b46d3a3e4ac65b4f1f76a5 /build-aux/vc-list-files | |
| parent | b54016675fd7e8e6b36444cde8ac85ff6302c7ff (diff) | |
| download | gnulib-c335e0ec67853b066fae56f6c61b0dbde4c71d74.tar.gz | |
vc-list-files: restore lost functionality with subdir argument
* build-aux/vc-list-files: When given a non-"." sub-directory
argument, substitute the $dir/ prefix back onto each resulting name.
Otherwise, coreutils' root_tests check would fail.
Diffstat (limited to 'build-aux/vc-list-files')
| -rwxr-xr-x | build-aux/vc-list-files | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index 4b465a4a8a..88d513f5a5 100755 --- a/build-aux/vc-list-files +++ b/build-aux/vc-list-files @@ -2,7 +2,7 @@ # List version-controlled file names. # Print a version string. -scriptversion=2009-04-24.14 +scriptversion=2009-04-25.10 # Copyright (C) 2006-2009 Free Software Foundation, Inc. @@ -72,17 +72,13 @@ esac test "x$dir" = x && dir=. if test -d .git; then - if test "x$dir" = x. ; then - dir=HEAD - else - dir=HEAD:$dir - fi + test "x$dir" = x. && dir= || dir="$dir/" # Ignore git symlinks - either they point into the tree, in which case # we don't need to visit the target twice, or they point somewhere # else (often into a submodule), in which case the content does not # belong to this package. - eval exec git ls-tree -r '"$dir"' \| sed -n '"s/^100[^ ]*.//p"' \ - $postprocess + eval exec git ls-tree -r 'HEAD:"$dir"' \ + \| sed -n '"s!^100[^ ]*.!'"$dir"'!p"' $postprocess elif test -d .hg; then eval exec hg locate '"$dir/*"' $postprocess elif test -d .bzr; then |