Skip to content

Commit 441b40d

Browse files
committed
Sync with 1.6.3.4
Signed-off-by: Junio C Hamano <[email protected]>
2 parents f552e51 + e276f01 commit 441b40d

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed

Documentation/RelNotes-1.6.3.4.txt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
GIT v1.6.3.4 Release Notes
2+
==========================
3+
4+
Fixes since v1.6.3.3
5+
--------------------
6+
7+
* "git add --no-ignore-errors" did not override configured
8+
add.ignore-errors configuration.
9+
10+
* "git apply --whitespace=fix" did not fix trailing whitespace on an
11+
incomplete line.
12+
13+
* "git branch" opened too many commit objects unnecessarily.
14+
15+
* "git checkout -f $commit" with a path that is a file (or a symlink) in
16+
the work tree to a commit that has a directory at the path issued an
17+
unnecessary error message.
18+
19+
* "git diff -c/--cc" was very inefficient in coalescing the removed lines
20+
shared between parents.
21+
22+
* "git diff -c/--cc" showed removed lines at the beginning of a file
23+
incorrectly.
24+
25+
* "git remote show nickname" did not honor configured
26+
remote.nickname.uploadpack when inspecting the branches at the remote.
27+
28+
* "git request-pull" when talking to the terminal for a preview
29+
showed some of the output in the pager.
30+
31+
* "git request-pull start nickname [end]" did not honor configured
32+
remote.nickname.uploadpack when it ran git-ls-remote against the remote
33+
repository to learn the current tip of branches.
34+
35+
Includes other documentation updates and minor fixes.
36+

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.6.3.3/git.html[documentation for release 1.6.3.3]
46+
* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
4747

4848
* release notes for
49+
link:RelNotes-1.6.3.4.txt[1.6.3.4],
4950
link:RelNotes-1.6.3.3.txt[1.6.3.3],
5051
link:RelNotes-1.6.3.2.txt[1.6.3.2],
5152
link:RelNotes-1.6.3.1.txt[1.6.3.1],

git-request-pull.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ headrev=`git rev-parse --verify "$head"^0` || exit
2828
merge_base=`git merge-base $baserev $headrev` ||
2929
die "fatal: No commits in common between $base and $head"
3030

31-
url=$(get_remote_url "$url")
3231
branch=$(git ls-remote "$url" \
3332
| sed -n -e "/^$headrev refs.heads./{
3433
s/^.* refs.heads.//
3534
p
3635
q
3736
}")
37+
url=$(get_remote_url "$url")
3838
if [ -z "$branch" ]; then
3939
echo "warn: No branch of $url is at:" >&2
4040
git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2

0 commit comments

Comments
 (0)