Skip to content

Commit 887c409

Browse files
committed
Merge branch 'maint'
* maint: Update draft release notes to 1.7.9.2 completion: Allow dash as the first character for __git_ps1
2 parents b3a769d + 72d5e74 commit 887c409

File tree

2 files changed

+56
-17
lines changed

2 files changed

+56
-17
lines changed

Documentation/RelNotes/1.7.9.2.txt

Lines changed: 55 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,66 @@ Git v1.7.9.2 Release Notes
44
Fixes since v1.7.9.1
55
--------------------
66

7-
* The error message emitted when we see an empty loose object was
8-
not phrased correctly.
7+
* Bash completion script (in contrib/) did not like a pattern that
8+
begins with a dash to be passed to __git_ps1 helper function.
99

10-
* The code to ask for password did not fall back to the terminal
11-
input when GIT_ASKPASS is set but does not work (e.g. lack of X
12-
with GUI askpass helper).
10+
* Adaptation of the bash completion script (in contrib/) for zsh
11+
incorrectly listed all subcommands when "git <TAB><TAB>" was given
12+
to ask for list of porcelain subcommands.
1313

14-
* map_user() was not rewriting its output correctly, which resulted
15-
in the user visible symptom that "git blame -e" sometimes showed
16-
excess '>' at the end of email addresses.
14+
* The build procedure for profile-directed optimized binary was not
15+
working very well.
1716

18-
* "git checkout -b" did not allow switching out of an unborn branch.
17+
* Some systems need to explicitly link -lcharset to get locale_charset().
1918

20-
* "git commit" refused to create a commit when entries added with
21-
"add -N" remained in the index, without telling Git what their content
22-
in the next commit should be. We should have created the commit without
23-
these paths.
19+
* t5541 ignored user-supplied port number used for HTTP server testing.
2420

25-
* Search box in "gitweb" did not accept non-ASCII characters correctly.
21+
* The error message emitted when we see an empty loose object was
22+
not phrased correctly.
2623

27-
* Search interface of "gitweb" did not show multiple matches in the same file
28-
correctly.
24+
* The code to ask for password did not fall back to the terminal
25+
input when GIT_ASKPASS is set but does not work (e.g. lack of X
26+
with GUI askpass helper).
27+
28+
* We failed to give the true terminal width to any subcommand when
29+
they are invoked with the pager, i.e. "git -p cmd".
30+
31+
* map_user() was not rewriting its output correctly, which resulted
32+
in the user visible symptom that "git blame -e" sometimes showed
33+
excess '>' at the end of email addresses.
34+
35+
* "git checkout -b" did not allow switching out of an unborn branch.
36+
37+
* When you have both .../foo and .../foo.git, "git clone .../foo" did not
38+
favor the former but the latter.
39+
40+
* "git commit" refused to create a commit when entries added with
41+
"add -N" remained in the index, without telling Git what their content
42+
in the next commit should be. We should have created the commit without
43+
these paths.
44+
45+
* "git diff --stat" said "files", "insertions", and "deletions" even
46+
when it is showing one "file", one "insertion" or one "deletion".
47+
48+
* The output from "git diff --stat" for two paths that have the same
49+
amount of changes showed graph bars of different length due to the
50+
way we handled rounding errors.
51+
52+
* "git grep" did not pay attention to -diff (hence -binary) attribute.
53+
54+
* The transport programs (fetch, push, clone)ignored --no-progress
55+
and showed progress when sending their output to a terminal.
56+
57+
* Sometimes error status detected by a check in an earlier phase of
58+
"git receive-pack" (the other end of "git push") was lost by later
59+
checks, resulting in false indication of success.
60+
61+
* "git rev-list --verify" sometimes skipped verification depending on
62+
the phase of the moon, which dates back to 1.7.8.x series.
63+
64+
* Search box in "gitweb" did not accept non-ASCII characters correctly.
65+
66+
* Search interface of "gitweb" did not show multiple matches in the same file
67+
correctly.
2968

3069
Also contains minor fixes and documentation updates.

contrib/completion/git-completion.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ __git_ps1 ()
313313
fi
314314

315315
local f="$w$i$s$u"
316-
printf "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
316+
printf -- "${1:- (%s)}" "$c${b##refs/heads/}${f:+ $f}$r$p"
317317
fi
318318
}
319319

0 commit comments

Comments
 (0)