Re: [PATCH] vc-list-files: restore lost functionality with subdir argument

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 4/25/2009 7:14 AM:
> I convinced myself.  If $dir contains $, then you have the wrong quoting.
>  So I'm applying the above patch.

Except that when I committed, the timestamp went backwards!  We need to be
more consistent about using UTC timestamps, as in this patch that I
actually pushed.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknzDnsACgkQ84KuGfSFAYBFIACgsvErEp0mBPxOYdZ9oapWnQ6j
57gAnR+i8N3aHSMWiFom/9gBDbH/saE1
=w7Mz
-----END PGP SIGNATURE-----

>From 496fee86d6ccab0e07f1c83a5cf880f16a6bff11 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Sat, 25 Apr 2009 07:15:12 -0600
Subject: [PATCH] vc-list-files: fix shell quoting error

* build-aux/vc-list-files: Protect against $ in $dir.  Normalize
timestamp.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog               |    6 ++++++
 build-aux/vc-list-files |    7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd81725..689b372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-25  Eric Blake  <address@hidden>
+
+       vc-list-files: fix shell quoting error
+       * build-aux/vc-list-files: Protect against $ in $dir.  Normalize
+       timestamp.
+
 2009-04-25  Jim Meyering  <address@hidden>

        vc-list-files: restore lost functionality with subdir argument
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index 88d513f..08dc8ab 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-25.10
+scriptversion=2009-04-25.13; # UTC

 # Copyright (C) 2006-2009 Free Software Foundation, Inc.

@@ -78,7 +78,7 @@ if test -d .git; then
   # else (often into a submodule), in which case the content does not
   # belong to this package.
   eval exec git ls-tree -r 'HEAD:"$dir"' \
-    \| sed -n '"s!^100[^       ]*.!'"$dir"'!p"' $postprocess
+    \| sed -n '"s!^100[^       ]*.!$dir!p"' $postprocess
 elif test -d .hg; then
   eval exec hg locate '"$dir/*"' $postprocess
 elif test -d .bzr; then
@@ -109,5 +109,6 @@ fi
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
-- 
1.6.1.2