Skip to content

Commit

Permalink
Sync with 1.6.3.4
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Jul 29, 2009
2 parents f552e51 + e276f01 commit 441b40d
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 2 deletions.
36 changes: 36 additions & 0 deletions Documentation/RelNotes-1.6.3.4.txt
@@ -0,0 +1,36 @@
GIT v1.6.3.4 Release Notes
==========================

Fixes since v1.6.3.3
--------------------

* "git add --no-ignore-errors" did not override configured
add.ignore-errors configuration.

* "git apply --whitespace=fix" did not fix trailing whitespace on an
incomplete line.

* "git branch" opened too many commit objects unnecessarily.

* "git checkout -f $commit" with a path that is a file (or a symlink) in
the work tree to a commit that has a directory at the path issued an
unnecessary error message.

* "git diff -c/--cc" was very inefficient in coalescing the removed lines
shared between parents.

* "git diff -c/--cc" showed removed lines at the beginning of a file
incorrectly.

* "git remote show nickname" did not honor configured
remote.nickname.uploadpack when inspecting the branches at the remote.

* "git request-pull" when talking to the terminal for a preview
showed some of the output in the pager.

* "git request-pull start nickname [end]" did not honor configured
remote.nickname.uploadpack when it ran git-ls-remote against the remote
repository to learn the current tip of branches.

Includes other documentation updates and minor fixes.

3 changes: 2 additions & 1 deletion Documentation/git.txt
Expand Up @@ -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.6.3.3/git.html[documentation for release 1.6.3.3]
* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]

* release notes for
link:RelNotes-1.6.3.4.txt[1.6.3.4],
link:RelNotes-1.6.3.3.txt[1.6.3.3],
link:RelNotes-1.6.3.2.txt[1.6.3.2],
link:RelNotes-1.6.3.1.txt[1.6.3.1],
Expand Down
2 changes: 1 addition & 1 deletion git-request-pull.sh
Expand Up @@ -28,13 +28,13 @@ headrev=`git rev-parse --verify "$head"^0` || exit
merge_base=`git merge-base $baserev $headrev` ||
die "fatal: No commits in common between $base and $head"

url=$(get_remote_url "$url")
branch=$(git ls-remote "$url" \
| sed -n -e "/^$headrev refs.heads./{
s/^.* refs.heads.//
p
q
}")
url=$(get_remote_url "$url")
if [ -z "$branch" ]; then
echo "warn: No branch of $url is at:" >&2
git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2
Expand Down

0 comments on commit 441b40d

Please sign in to comment.