undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 1.7.1.2

Browse Source
This commit is contained in:
Junio C Hamano 2010-07-27 16:40:15 -07:00
commit 33a0292e61
5 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Documentation/RelNotes-1.7.0.7.txt Normal file
View File

@ -0,0 +1,16 @@
Git v1.7.0.7 Release Notes
==========================
Fixes since v1.7.0.6
--------------------
* "make NO_CURL=NoThanks install" was broken.
* An overlong line after ".gitdir: " in a git file caused out of bounds
access to an array on the stack.
* "git config --path conf.var" to attempt to expand a variable conf.var
that uses "~/" short-hand segfaulted when $HOME environment variable
was not set.
And other minor fixes and documentation updates.

9
Documentation/RelNotes-1.7.1.2.txt
View File

@ -17,3 +17,12 @@ Fixes since v1.7.1.1
* "git rev-parse --parseopt --stop-at-non-option" did not stop at non option
when --keep-dashdash was in effect.
* An overlong line after ".gitdir: " in a git file caused out of bounds
access to an array on the stack.
* "git config --path conf.var" to attempt to expand a variable conf.var
that uses "~/" short-hand segfaulted when $HOME environment variable
was not set.
And other minor fixes and documentation updates.

6
Documentation/git.txt
View File

@ -49,15 +49,17 @@ Documentation for older releases are available here:
* release notes for
link:RelNotes-1.7.2.txt[1.7.2].
* link:v1.7.1.1/git.html[documentation for release 1.7.1.1]
* link:v1.7.1.2/git.html[documentation for release 1.7.1.2]
* release notes for
link:RelNotes-1.7.1.2.txt[1.7.1.2],
link:RelNotes-1.7.1.1.txt[1.7.1.1],
link:RelNotes-1.7.1.txt[1.7.1].
* link:v1.7.0.6/git.html[documentation for release 1.7.0.6]
* link:v1.7.0.7/git.html[documentation for release 1.7.0.7]
* release notes for
link:RelNotes-1.7.0.7.txt[1.7.0.7],
link:RelNotes-1.7.0.6.txt[1.7.0.6],
link:RelNotes-1.7.0.5.txt[1.7.0.5],
link:RelNotes-1.7.0.4.txt[1.7.0.4],

2
path.c
View File

@ -316,6 +316,8 @@ char *expand_user_path(const char *path)
size_t username_len = first_slash - username;
if (username_len == 0) {
const char *home = getenv("HOME");
if (!home)
goto return_null;
strbuf_add(&user_path, home, strlen(home));
} else {
struct passwd *pw = getpw_str(username, username_len);

24
t/t1300-repo-config.sh
View File

@ -707,19 +707,41 @@ test_expect_success 'set --path' '
git config --path path.trailingtilde "foo~" &&
test_cmp expect .git/config'
if test "${HOME+set}"
then
test_set_prereq HOMEVAR
fi
cat >expect <<EOF
$HOME/
/dev/null
foo~
EOF
test_expect_success 'get --path' '
test_expect_success HOMEVAR 'get --path' '
git config --get --path path.home > result &&
git config --get --path path.normal >> result &&
git config --get --path path.trailingtilde >> result &&
test_cmp expect result
'
cat >expect <<\EOF
/dev/null
foo~
EOF
test_expect_success 'get --path copes with unset $HOME' '
(
unset HOME;
test_must_fail git config --get --path path.home \
>result 2>msg &&
git config --get --path path.normal >>result &&
git config --get --path path.trailingtilde >>result
) &&
grep "[Ff]ailed to expand.*~/" msg &&
test_cmp expect result
'
rm .git/config
git config quote.leading " test"