avoid an unnecessary sub-shell

diff --git a/ChangeLog b/ChangeLog
index bb3d9cffa8cfb946b2599f33bdf7cd6072e0ccdf..6a6198b63f8ad1a59c8ed7cd34c40722f321eeb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-04  Bruce Korb  <address@hidden>
+
+       git-version-gen: avoid a sub-shell
+       * build-aux/git-version-gen: Redirect stderr in `...` via
+       "exec 2>...", rather than via an added sub-shell.
+
 2011-01-03  Ben Pfaff  <blp@cs.stanford.edu>
 
        git-version-gen: use (...) rather than sh -c '...'

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 694ba469702fb7901061dcebeef882c8798cb531..68c7d6440cceb1c635354507ce556789a980509b 100755 (executable)
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2011-01-03.20; # UTC
+scriptversion=2011-01-04.17; # UTC
 
 # Copyright (C) 2007-2011 Free Software Foundation, Inc.
 #
@@ -143,7 +143,7 @@ v=`echo "$v" |sed 's/^v//'`
 # Don't declare a version "dirty" merely because a time stamp has changed.
 git update-index --refresh > /dev/null 2>&1
 
-dirty=`(git diff-index --name-only HEAD) 2>/dev/null` || dirty=
+dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty=
 case "$dirty" in
     '') ;;
     *) # Append the suffix only if there isn't one already.