Sync with 1.8.2.2
This commit is contained in:
Junio C Hamano
commit
e27004e341
@ -4,6 +4,24 @@ Git v1.8.2.2 Release Notes
|
||||
Fixes since v1.8.2.1
|
||||
--------------------
|
||||
|
||||
* Zsh completion forgot that '%' character used to signal untracked
|
||||
files needs to be escaped with another '%'.
|
||||
|
||||
* A commit object whose author or committer ident are malformed
|
||||
crashed some code that trusted that a name, an email and an
|
||||
timestamp can always be found in it.
|
||||
|
||||
* The new core.commentchar configuration was not applied to a few
|
||||
places.
|
||||
|
||||
* "git pull --rebase" did not pass "-v/-q" options to underlying
|
||||
"git rebase".
|
||||
|
||||
* When receive-pack detects error in the pack header it received in
|
||||
order to decide which of unpack-objects or index-pack to run, it
|
||||
returned without closing the error stream, which led to a hang
|
||||
sideband thread.
|
||||
|
||||
* "git diff --diff-algorithm=algo" was understood by the command line
|
||||
parser, but "git diff --diff-algorithm algo" was not.
|
||||
|
||||
|
||||
@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
|
||||
branch of the `git.git` repository.
|
||||
Documentation for older releases are available here:
|
||||
|
||||
* link:v1.8.2.1/git.html[documentation for release 1.8.2.1]
|
||||
* link:v1.8.2.2/git.html[documentation for release 1.8.2.2]
|
||||
|
||||
* release notes for
|
||||
link:RelNotes/1.8.2.2.txt[1.8.2.2].
|
||||
link:RelNotes/1.8.2.1.txt[1.8.2.1].
|
||||
link:RelNotes/1.8.2.txt[1.8.2].
|
||||
|
||||
|
||||
@ -68,10 +68,10 @@ setup () {
|
||||
) >> "$HOME"/.hgrc &&
|
||||
git config --global remote-hg.hg-git-compat true
|
||||
|
||||
export HGEDITOR=/usr/bin/true
|
||||
|
||||
export GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
|
||||
export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
|
||||
HGEDITOR=/usr/bin/true
|
||||
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
|
||||
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
|
||||
export HGEDITOR GIT_AUTHOR_DATE GIT_COMMITTER_DATE
|
||||
}
|
||||
|
||||
setup
|
||||
@ -88,7 +88,8 @@ test_expect_success 'encoding' '
|
||||
git add alpha &&
|
||||
git commit -m "add älphà" &&
|
||||
|
||||
export GIT_AUTHOR_NAME="tést èncödîng" &&
|
||||
GIT_AUTHOR_NAME="tést èncödîng" &&
|
||||
export GIT_AUTHOR_NAME &&
|
||||
echo beta > beta &&
|
||||
git add beta &&
|
||||
git commit -m "add beta" &&
|
||||
|
||||
@ -103,10 +103,11 @@ setup () {
|
||||
git config --global receive.denycurrentbranch warn
|
||||
git config --global remote-hg.hg-git-compat true
|
||||
|
||||
export HGEDITOR=/usr/bin/true
|
||||
HGEDITOR=/usr/bin/true
|
||||
|
||||
export GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
|
||||
export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
|
||||
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
|
||||
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
|
||||
export HGEDITOR GIT_AUTHOR_DATE GIT_COMMITTER_DATE
|
||||
}
|
||||
|
||||
setup
|
||||
@ -296,7 +297,8 @@ test_expect_success 'encoding' '
|
||||
git add alpha &&
|
||||
git commit -m "add älphà" &&
|
||||
|
||||
export GIT_AUTHOR_NAME="tést èncödîng" &&
|
||||
GIT_AUTHOR_NAME="tést èncödîng" &&
|
||||
export GIT_AUTHOR_NAME &&
|
||||
echo beta > beta &&
|
||||
git add beta &&
|
||||
git commit -m "add beta" &&
|
||||
|
||||
@ -23,7 +23,9 @@ test_expect_success 'submodule on detached working tree' '
|
||||
mkdir home &&
|
||||
(
|
||||
cd home &&
|
||||
export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
|
||||
GIT_WORK_TREE="$(pwd)" &&
|
||||
GIT_DIR="$(pwd)/.dotfiles" &&
|
||||
export GIT_WORK_TREE GIT_DIR &&
|
||||
git clone --bare ../remote .dotfiles &&
|
||||
git submodule add ../bundle1 .vim/bundle/sogood &&
|
||||
test_commit "sogood" &&
|
||||
@ -39,7 +41,9 @@ test_expect_success 'submodule on detached working tree' '
|
||||
(
|
||||
cd home2 &&
|
||||
git clone --bare ../remote .dotfiles &&
|
||||
export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
|
||||
GIT_WORK_TREE="$(pwd)" &&
|
||||
GIT_DIR="$(pwd)/.dotfiles" &&
|
||||
export GIT_WORK_TREE GIT_DIR &&
|
||||
git checkout master &&
|
||||
git submodule update --init &&
|
||||
(
|
||||
@ -55,7 +59,8 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
|
||||
mkdir home3 &&
|
||||
(
|
||||
cd home3 &&
|
||||
export GIT_DIR="$(pwd)/.dotfiles" &&
|
||||
GIT_DIR="$(pwd)/.dotfiles" &&
|
||||
export GIT_DIR &&
|
||||
git clone --bare ../remote "$GIT_DIR" &&
|
||||
git config core.bare false &&
|
||||
git config core.worktree .. &&
|
||||
@ -66,7 +71,8 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
|
||||
) &&
|
||||
(
|
||||
cd home &&
|
||||
export GIT_DIR="$(pwd)/.dotfiles" &&
|
||||
GIT_DIR="$(pwd)/.dotfiles" &&
|
||||
export GIT_DIR &&
|
||||
git config core.bare false &&
|
||||
git config core.worktree .. &&
|
||||
git pull &&
|
||||
|
||||
@ -74,7 +74,8 @@ test_expect_success REMOTE_SVN 'mark-file regeneration' '
|
||||
'
|
||||
|
||||
test_expect_success REMOTE_SVN 'incremental imports must lead to the same head' '
|
||||
export SVNRMAX=3 &&
|
||||
SVNRMAX=3 &&
|
||||
export SVNRMAX &&
|
||||
init_git &&
|
||||
git fetch svnsim &&
|
||||
test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master &&
|
||||
|
||||
@ -130,7 +130,8 @@ test_expect_success DATE_PARSER 'modification: feed last-modified' '
|
||||
test_debug 'cat gitweb.headers'
|
||||
|
||||
test_expect_success DATE_PARSER 'modification: feed if-modified-since (modified)' '
|
||||
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
|
||||
HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
|
||||
export HTTP_IF_MODIFIED_SINCE &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=atom;h=master" &&
|
||||
grep "Status: 200 OK" gitweb.headers
|
||||
@ -138,7 +139,8 @@ test_expect_success DATE_PARSER 'modification: feed if-modified-since (modified)
|
||||
test_debug 'cat gitweb.headers'
|
||||
|
||||
test_expect_success DATE_PARSER 'modification: feed if-modified-since (unmodified)' '
|
||||
export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
|
||||
HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
|
||||
export HTTP_IF_MODIFIED_SINCE &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=atom;h=master" &&
|
||||
grep "Status: 304 Not Modified" gitweb.headers
|
||||
@ -153,7 +155,8 @@ test_expect_success DATE_PARSER 'modification: snapshot last-modified' '
|
||||
test_debug 'cat gitweb.headers'
|
||||
|
||||
test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (modified)' '
|
||||
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
|
||||
HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
|
||||
export HTTP_IF_MODIFIED_SINCE &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
|
||||
grep "Status: 200 OK" gitweb.headers
|
||||
@ -161,7 +164,8 @@ test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (modif
|
||||
test_debug 'cat gitweb.headers'
|
||||
|
||||
test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (unmodified)' '
|
||||
export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
|
||||
HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
|
||||
export HTTP_IF_MODIFIED_SINCE &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
|
||||
grep "Status: 304 Not Modified" gitweb.headers
|
||||
@ -170,7 +174,8 @@ test_debug 'cat gitweb.headers'
|
||||
|
||||
test_expect_success DATE_PARSER 'modification: tree snapshot' '
|
||||
ID=`git rev-parse --verify HEAD^{tree}` &&
|
||||
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
|
||||
HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
|
||||
export HTTP_IF_MODIFIED_SINCE &&
|
||||
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
|
||||
gitweb_run "p=.git;a=snapshot;h=$ID;sf=tgz" &&
|
||||
grep "Status: 200 OK" gitweb.headers &&
|
||||
|
||||
Loading…
Reference in New Issue
Block a user