Merge branch 'master' into next

* master:
  Update draft release notes to 1.7.10
  Update draft release notes to 1.7.9.2
  completion: Allow dash as the first character for __git_ps1

Documentation/RelNotes/1.7.10.txt

@@ -8,8 +8,6 @@ UI, Workflows & Features
 
  * Improved handling of views, labels and branches in git-p4 (in contrib).
 
- * Updated command line arguments completion script for zsh (in contrib).
-
  * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
    support incremental imports.
 
@@ -22,16 +20,12 @@ UI, Workflows & Features
  * "git clone" learned to detach the HEAD in the resulting repository
    when the source repository's HEAD does not point to a branch.
 
- * The commands in the "git diff" family and "git apply --stat" that
-   count the number of files changed and the number of lines
-   inserted/deleted have been updated to match the output from
-   "diffstat".  This also opens the door to i18n this line.
-
  * When showing a patch while ignoring whitespace changes, the context
    lines are taken from the postimage, in order to make it easier to
    view the output.
 
- * "git grep" pays attention to -diff (hence -binary) attributes now.
+ * "diff-highlight" filter (in contrib/) was updated to produce more
+   aesthetically pleasing output.
 
  * "git tag --list" can be given "--points-at <object>" to limit its
    output to those that point at the given object.
@@ -79,41 +73,13 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
 releases are contained in this release (see release notes to them for
 details).
 
- * When you have both .../foo and .../foo.git, "git clone .../foo" did not
-   favor the former but the latter.
-   (merge b3256eb jk/git-dir-lookup later to maint).
-
- * Some systems need to explicitly link -lcharset to get locale_charset().
-   (merge b522528 dp/i18n-libcharset later to maint).
-
- * The output from "git diff --stat" for two paths that have the same
-   amount of changes showed graph bars of different length due to the
-   way we handled rounding errors.
-   (merge 2eeeef2 jc/diff-stat-scaler later to maint).
-
- * We failed to give the true terminal width to any subcommand when
-   they are invoked with the pager, i.e. "git -p cmd".
-   (merge ad6c373 zj/term-columns later to maint).
-
- * The transport programs ignored --no-progress and showed progress when
-   sending their output to a terminal.
-   (merge 01fdc21 cb/transfer-no-progress later to maint).
-
- * Sometimes error status detected by a check in an earlier phase of
-   receive-pack (the other end of 'git push') was lost by later
-   checks, resulting in false indication of success.
-   (merge ef7e93d cb/receive-pack-keep-errors later to maint).
-
- * t5541 ignored user-supplied port number used for HTTP server testing
-   (merge d202a51 cb/maint-t5541-make-server-port-portable later to maint).
-
- * "rev-list --verify" sometimes skipped verification depending on the
-   phase of the moon, which dates back to 1.7.8.x series.
-   (merge cb8da70 cb/maint-rev-list-verify-object later to maint).
+ * "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.
 
 ---
 exec >/var/tmp/1
-O=v1.7.9.1-264-g76bdcf0
+O=v1.7.9.1-289-g5609586
 echo O=$(git describe)
 git log --first-parent --oneline ^maint $O..
 echo

Documentation/RelNotes/1.7.9.2.txt

@@ -4,27 +4,66 @@ Git v1.7.9.2 Release Notes
 Fixes since v1.7.9.1
 --------------------
 
-* The error message emitted when we see an empty loose object was
-  not phrased correctly.
+ * Bash completion script (in contrib/) did not like a pattern that
+   begins with a dash to be passed to __git_ps1 helper function.
 
-* The code to ask for password did not fall back to the terminal
-  input when GIT_ASKPASS is set but does not work (e.g. lack of X
-  with GUI askpass helper).
+ * Adaptation of the bash completion script (in contrib/) for zsh
+   incorrectly listed all subcommands when "git <TAB><TAB>" was given
+   to ask for list of porcelain subcommands.
 
-* map_user() was not rewriting its output correctly, which resulted
-  in the user visible symptom that "git blame -e" sometimes showed
-  excess '>' at the end of email addresses.
+ * The build procedure for profile-directed optimized binary was not
+   working very well.
 
-* "git checkout -b" did not allow switching out of an unborn branch.
+ * Some systems need to explicitly link -lcharset to get locale_charset().
 
-* "git commit" refused to create a commit when entries added with
-  "add -N" remained in the index, without telling Git what their content
-  in the next commit should be. We should have created the commit without
-  these paths.
+ * t5541 ignored user-supplied port number used for HTTP server testing.
 
-* Search box in "gitweb" did not accept non-ASCII characters correctly.
+ * The error message emitted when we see an empty loose object was
+   not phrased correctly.
 
-* Search interface of "gitweb" did not show multiple matches in the same file
-  correctly.
+ * The code to ask for password did not fall back to the terminal
+   input when GIT_ASKPASS is set but does not work (e.g. lack of X
+   with GUI askpass helper).
+
+ * We failed to give the true terminal width to any subcommand when
+   they are invoked with the pager, i.e. "git -p cmd".
+
+ * map_user() was not rewriting its output correctly, which resulted
+   in the user visible symptom that "git blame -e" sometimes showed
+   excess '>' at the end of email addresses.
+
+ * "git checkout -b" did not allow switching out of an unborn branch.
+
+ * When you have both .../foo and .../foo.git, "git clone .../foo" did not
+   favor the former but the latter.
+
+ * "git commit" refused to create a commit when entries added with
+   "add -N" remained in the index, without telling Git what their content
+   in the next commit should be. We should have created the commit without
+   these paths.
+
+ * "git diff --stat" said "files", "insertions", and "deletions" even
+   when it is showing one "file", one "insertion" or one "deletion".
+
+ * The output from "git diff --stat" for two paths that have the same
+   amount of changes showed graph bars of different length due to the
+   way we handled rounding errors.
+
+ * "git grep" did not pay attention to -diff (hence -binary) attribute.
+
+ * The transport programs (fetch, push, clone)ignored --no-progress
+   and showed progress when sending their output to a terminal.
+
+ * Sometimes error status detected by a check in an earlier phase of
+   "git receive-pack" (the other end of "git push") was lost by later
+   checks, resulting in false indication of success.
+
+ * "git rev-list --verify" sometimes skipped verification depending on
+   the phase of the moon, which dates back to 1.7.8.x series.
+
+ * Search box in "gitweb" did not accept non-ASCII characters correctly.
+
+ * Search interface of "gitweb" did not show multiple matches in the same file
+   correctly.
 
 Also contains minor fixes and documentation updates.

contrib/completion/git-completion.bash

@@ -313,7 +313,7 @@ __git_ps1 ()
 		fi
 
 		local f="$w$i$s$u"
-		printf "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
+		printf -- "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
 	fi
 }