From: Jim Meyering Date: Sat, 25 Apr 2009 08:23:53 +0000 (+0200) Subject: vc-list-files: restore lost functionality with subdir argument X-Git-Tag: v0.1~5984 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=c335e0ec67853b066fae56f6c61b0dbde4c71d74;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index fb16e2e68..cd817252a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-04-25 Jim Meyering + + 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. + 2009-04-24 Eric Blake vc-list-files: ignore git symlinks diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index 4b465a4a8..88d513f5a 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