Skip to content

Commit e27004e

Browse files
gitstergitster
committed
Sync with 1.8.2.2
2 parents cd33b41 + 4a9a4f0 commit e27004e

7 files changed

Lines changed: 54 additions & 20 deletions

File tree

‎Documentation/RelNotes/1.8.2.2.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@ Git v1.8.2.2 Release Notes
44
Fixes since v1.8.2.1
55
--------------------
66

7+
* Zsh completion forgot that '%' character used to signal untracked
8+
files needs to be escaped with another '%'.
9+
10+
* A commit object whose author or committer ident are malformed
11+
crashed some code that trusted that a name, an email and an
12+
timestamp can always be found in it.
13+
14+
* The new core.commentchar configuration was not applied to a few
15+
places.
16+
17+
* "git pull --rebase" did not pass "-v/-q" options to underlying
18+
"git rebase".
19+
20+
* When receive-pack detects error in the pack header it received in
21+
order to decide which of unpack-objects or index-pack to run, it
22+
returned without closing the error stream, which led to a hang
23+
sideband thread.
24+
725
* "git diff --diff-algorithm=algo" was understood by the command line
826
parser, but "git diff --diff-algorithm algo" was not.
927

‎Documentation/git.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
4343
branch of the `git.git` repository.
4444
Documentation for older releases are available here:
4545

46-
* link:v1.8.2.1/git.html[documentation for release 1.8.2.1]
46+
* link:v1.8.2.2/git.html[documentation for release 1.8.2.2]
4747

4848
* release notes for
49+
link:RelNotes/1.8.2.2.txt[1.8.2.2].
4950
link:RelNotes/1.8.2.1.txt[1.8.2.1].
5051
link:RelNotes/1.8.2.txt[1.8.2].
5152

‎contrib/remote-helpers/test-hg-bidi.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ setup () {
6868
) >> "$HOME"/.hgrc &&
6969
git config --global remote-hg.hg-git-compat true
7070

71-
export HGEDITOR=/usr/bin/true
72-
73-
export GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
74-
export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
71+
HGEDITOR=/usr/bin/true
72+
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
73+
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
74+
export HGEDITOR GIT_AUTHOR_DATE GIT_COMMITTER_DATE
7575
}
7676

7777
setup
@@ -88,7 +88,8 @@ test_expect_success 'encoding' '
8888
git add alpha &&
8989
git commit -m "add älphà" &&
9090
91-
export GIT_AUTHOR_NAME="tést èncödîng" &&
91+
GIT_AUTHOR_NAME="tést èncödîng" &&
92+
export GIT_AUTHOR_NAME &&
9293
echo beta > beta &&
9394
git add beta &&
9495
git commit -m "add beta" &&

‎contrib/remote-helpers/test-hg-hg-git.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,11 @@ setup () {
103103
git config --global receive.denycurrentbranch warn
104104
git config --global remote-hg.hg-git-compat true
105105

106-
export HGEDITOR=/usr/bin/true
106+
HGEDITOR=/usr/bin/true
107107

108-
export GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
109-
export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
108+
GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0230"
109+
GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
110+
export HGEDITOR GIT_AUTHOR_DATE GIT_COMMITTER_DATE
110111
}
111112

112113
setup
@@ -296,7 +297,8 @@ test_expect_success 'encoding' '
296297
git add alpha &&
297298
git commit -m "add älphà" &&
298299
299-
export GIT_AUTHOR_NAME="tést èncödîng" &&
300+
GIT_AUTHOR_NAME="tést èncödîng" &&
301+
export GIT_AUTHOR_NAME &&
300302
echo beta > beta &&
301303
git add beta &&
302304
git commit -m "add beta" &&

‎t/t7409-submodule-detached-worktree.sh‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ test_expect_success 'submodule on detached working tree' '
2323
mkdir home &&
2424
(
2525
cd home &&
26-
export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
26+
GIT_WORK_TREE="$(pwd)" &&
27+
GIT_DIR="$(pwd)/.dotfiles" &&
28+
export GIT_WORK_TREE GIT_DIR &&
2729
git clone --bare ../remote .dotfiles &&
2830
git submodule add ../bundle1 .vim/bundle/sogood &&
2931
test_commit "sogood" &&
@@ -39,7 +41,9 @@ test_expect_success 'submodule on detached working tree' '
3941
(
4042
cd home2 &&
4143
git clone --bare ../remote .dotfiles &&
42-
export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
44+
GIT_WORK_TREE="$(pwd)" &&
45+
GIT_DIR="$(pwd)/.dotfiles" &&
46+
export GIT_WORK_TREE GIT_DIR &&
4347
git checkout master &&
4448
git submodule update --init &&
4549
(
@@ -55,7 +59,8 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
5559
mkdir home3 &&
5660
(
5761
cd home3 &&
58-
export GIT_DIR="$(pwd)/.dotfiles" &&
62+
GIT_DIR="$(pwd)/.dotfiles" &&
63+
export GIT_DIR &&
5964
git clone --bare ../remote "$GIT_DIR" &&
6065
git config core.bare false &&
6166
git config core.worktree .. &&
@@ -66,7 +71,8 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
6671
) &&
6772
(
6873
cd home &&
69-
export GIT_DIR="$(pwd)/.dotfiles" &&
74+
GIT_DIR="$(pwd)/.dotfiles" &&
75+
export GIT_DIR &&
7076
git config core.bare false &&
7177
git config core.worktree .. &&
7278
git pull &&

‎t/t9020-remote-svn.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ test_expect_success REMOTE_SVN 'mark-file regeneration' '
7474
'
7575

7676
test_expect_success REMOTE_SVN 'incremental imports must lead to the same head' '
77-
export SVNRMAX=3 &&
77+
SVNRMAX=3 &&
78+
export SVNRMAX &&
7879
init_git &&
7980
git fetch svnsim &&
8081
test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master &&

‎t/t9501-gitweb-standalone-http-status.sh‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,17 @@ test_expect_success DATE_PARSER 'modification: feed last-modified' '
130130
test_debug 'cat gitweb.headers'
131131

132132
test_expect_success DATE_PARSER 'modification: feed if-modified-since (modified)' '
133-
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
133+
HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
134+
export HTTP_IF_MODIFIED_SINCE &&
134135
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
135136
gitweb_run "p=.git;a=atom;h=master" &&
136137
grep "Status: 200 OK" gitweb.headers
137138
'
138139
test_debug 'cat gitweb.headers'
139140

140141
test_expect_success DATE_PARSER 'modification: feed if-modified-since (unmodified)' '
141-
export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
142+
HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
143+
export HTTP_IF_MODIFIED_SINCE &&
142144
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
143145
gitweb_run "p=.git;a=atom;h=master" &&
144146
grep "Status: 304 Not Modified" gitweb.headers
@@ -153,15 +155,17 @@ test_expect_success DATE_PARSER 'modification: snapshot last-modified' '
153155
test_debug 'cat gitweb.headers'
154156

155157
test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (modified)' '
156-
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
158+
HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
159+
export HTTP_IF_MODIFIED_SINCE &&
157160
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
158161
gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
159162
grep "Status: 200 OK" gitweb.headers
160163
'
161164
test_debug 'cat gitweb.headers'
162165

163166
test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (unmodified)' '
164-
export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
167+
HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
168+
export HTTP_IF_MODIFIED_SINCE &&
165169
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
166170
gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
167171
grep "Status: 304 Not Modified" gitweb.headers
@@ -170,7 +174,8 @@ test_debug 'cat gitweb.headers'
170174

171175
test_expect_success DATE_PARSER 'modification: tree snapshot' '
172176
ID=`git rev-parse --verify HEAD^{tree}` &&
173-
export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
177+
HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
178+
export HTTP_IF_MODIFIED_SINCE &&
174179
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
175180
gitweb_run "p=.git;a=snapshot;h=$ID;sf=tgz" &&
176181
grep "Status: 200 OK" gitweb.headers &&

0 commit comments

Comments
 (0)