Mercurial > hg > octave-kai > gnulib-hg
changeset 11503:3b896d8318fe
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.
author | Jim Meyering <meyering@redhat.com> |
---|---|
date | Sat, 25 Apr 2009 10:23:53 +0200 |
parents | 460f2a0ec442 |
children | 86c375a26d4d |
files | ChangeLog build-aux/vc-list-files |
diffstat | 2 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-04-25 Jim Meyering <meyering@redhat.com> + + 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 <ebb9@byu.net> vc-list-files: ignore git symlinks
--- 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 @@ 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