Merge branch 'maint'

* maint:
  Update draft release notes to 1.7.9.3
  CodingGuidelines: do not use 'which' in shell scripts
  CodingGuidelines: Add a note about spaces after redirection
  post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly
  post-receive-email: remove unused variable

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 483008699f923be17926e8ed938ae17868f6ddf5..45577117c2a02dd4a4f9e63e78139b3df665b8f2 100644 (file)
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -35,10 +35,22 @@ For shell scripts specifically (not exhaustive):
 
  - Case arms are indented at the same depth as case and esac lines.
 
+ - Redirection operators should be written with space before, but no
+   space after them.  In other words, write 'echo test >"$file"'
+   instead of 'echo test> $file' or 'echo test > $file'.  Note that
+   even though it is not required by POSIX to double-quote the
+   redirection target in a variable (as shown above), our code does so
+   because some versions of bash issue a warning without the quotes.
+
  - We prefer $( ... ) for command substitution; unlike ``, it
    properly nests.  It should have been the way Bourne spelled
    it from day one, but unfortunately isn't.
 
+ - If you want to find out if a command is available on the user's
+   $PATH, you should use 'type <command>', instead of 'which <command>'.
+   The output of 'which' is not machine parseable and its exit code
+   is not reliable across platforms.
+
  - We use POSIX compliant parameter substitutions and avoid bashisms;
    namely:
 

diff --git a/Documentation/RelNotes/1.7.9.3.txt b/Documentation/RelNotes/1.7.9.3.txt
index 1d03fd10c00edbfa8ec8ae213a04764714ac4f66..d7be177681f9cef64ad7e6e6498baca00973eb0a 100644 (file)
--- a/Documentation/RelNotes/1.7.9.3.txt
+++ b/Documentation/RelNotes/1.7.9.3.txt
@@ -14,4 +14,11 @@ Fixes since v1.7.9.2
  * "git add --refresh <pathspec>" used to warn about unmerged paths
    outside the given pathspec.
 
+ * The commit log template given with "git merge --edit" did not have
+   a short instructive text like what "git commit" gives.
+
+ * "gitweb" used to drop warnings in the log file when "heads" view is
+   accessed in a repository whose HEAD does not point at a valid
+   branch.
+
 Also contains minor fixes and documentation updates.

diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index ba077c13f96779d5b29237e83974b0910b4bbdde..01af9df15e180288723caadf42b500fe78a8c694 100755 (executable)
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -85,7 +85,6 @@ prep_for_email()
        oldrev=$(git rev-parse $1)
        newrev=$(git rev-parse $2)
        refname="$3"
-       maxlines=$4
 
        # --- Interpret
        # 0000->1234 (create)
@@ -461,7 +460,7 @@ generate_delete_branch_email()
 {
        echo "       was  $oldrev"
        echo ""
-       echo $LOGEND
+       echo $LOGBEGIN
        git show -s --pretty=oneline $oldrev
        echo $LOGEND
 }
@@ -561,7 +560,7 @@ generate_delete_atag_email()
 {
        echo "       was  $oldrev"
        echo ""
-       echo $LOGEND
+       echo $LOGBEGIN
        git show -s --pretty=oneline $oldrev
        echo $LOGEND
 }
@@ -626,7 +625,7 @@ generate_delete_general_email()
 {
        echo "       was  $oldrev"
        echo ""
-       echo $LOGEND
+       echo $LOGBEGIN
        git show -s --pretty=oneline $oldrev
        echo $LOGEND
 }