From 33016c491367c5144b3007927cd76492ac193d16 Mon Sep 17 00:00:00 2001 From: Tom Grennan Date: Tue, 28 Jul 2009 18:30:02 -0700 Subject: request-pull: allow ls-remote to notice remote.$nickname.uploadpack The location to pull from should be converted from the configured nickname to URL in the message, but ls-remote should be fed the nickname so that the command uses remote.$nickname.* variables, most notably "uploadpack". Signed-off-by: Tom Grennan Signed-off-by: Junio C Hamano diff --git a/git-request-pull.sh b/git-request-pull.sh index 5917773..fd95bea 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -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 -- cgit v0.10.2-6-g49f6 From 5c6d8bb29043a3e53c84f1782392a4d71dd10ff9 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Sat, 30 May 2009 22:08:02 -0700 Subject: config.txt: document add.ignore-errors Use the description of "--ignore-errors" from git-add.txt as inspiration. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano diff --git a/Documentation/config.txt b/Documentation/config.txt index c06eca4..ae0e5db 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -438,6 +438,11 @@ On some file system/operating system combinations, this is unreliable. Set this config setting to 'rename' there; However, This will remove the check that makes sure that existing object files will not get overwritten. +add.ignore-errors:: + Tells 'git-add' to continue adding files when some files cannot be + added due to indexing errors. Equivalent to the '--ignore-errors' + option of linkgit:git-add[1]. + alias.*:: Command aliases for the linkgit:git[1] command wrapper - e.g. after defining "alias.last = cat-file commit HEAD", the invocation -- cgit v0.10.2-6-g49f6 From e276f018f2c1f0fc962fbe44a36708d1cdebada8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 28 Jul 2009 23:52:58 -0700 Subject: GIT 1.6.3.4 Signed-off-by: Junio C Hamano diff --git a/Documentation/RelNotes-1.6.3.4.txt b/Documentation/RelNotes-1.6.3.4.txt new file mode 100644 index 0000000..cad461b --- /dev/null +++ b/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. + diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 902bfbf..a56dcb2 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.3.3 +DEF_VER=v1.6.3.4 LF=' ' diff --git a/RelNotes b/RelNotes index 392186f..03c996d 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.3.3.txt \ No newline at end of file +Documentation/RelNotes-1.6.3.4.txt \ No newline at end of file -- cgit v0.10.2-6-g49f6