Merge branch 'jc/check-attr-honor-working-tree' into maint

diff --git a/git-gui/Makefile b/git-gui/Makefile
index e22ba5c321dc47fdf512f30c5e6c741c41fb99eb..cde8b2ea31969192136d5c541458cc43c358d4dc 100644 (file)
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -4,7 +4,7 @@ all::
 #
 # Define NO_MSGFMT if you do not have msgfmt from the GNU gettext
 # package and want to use our rough pure Tcl po->msg translator.
-# TCL_PATH must be vaild for this to work.
+# TCL_PATH must be valid for this to work.
 #
 
 GIT-VERSION-FILE: FORCE
@@ -254,7 +254,7 @@ lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
          auto_mkindex lib '*.tcl' \
        | $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
        else \
-        echo 1>&2 "    * $(TCL_PATH) failed; using unoptimized loading"; \
+        echo >&2 "    * $(TCL_PATH) failed; using unoptimized loading"; \
         rm -f $@ ; \
         echo '# Autogenerated by git-gui Makefile' >$@ && \
         echo >>$@ && \
@@ -274,8 +274,8 @@ TRACK_VARS = \
 GIT-GUI-VARS: FORCE
        @VARS='$(TRACK_VARS)'; \
        if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \
-               echo 1>&2 "    * new locations or Tcl/Tk interpreter"; \
-               echo 1>$@ "$$VARS"; \
+               echo >&2 "    * new locations or Tcl/Tk interpreter"; \
+               echo >$@ "$$VARS"; \
        fi
 
 ifdef GITGUI_MACOSXAPP