From 471dcfdbb23ad423168d928335bc36217f9e311d Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Thu, 1 Sep 2011 14:47:31 +0100 Subject: [PATCH 1/4] contrib/completion: "local var=()" is misinterpreted as func-decl by zsh Certain versions of zsh seems to treat local var=() as a function declaration, rather than an assignment of an empty array, although its documentation does not suggest that this should be the case. With zsh 4.3.15 on Fedora Core 15, this causes __git_ps1 " (%s)" to trigger an error message: local:2: command not found: svn_url_pattern when GIT_PS1_SHOWUPSTREAM="auto". Signed-off-by: Alex Merry Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index d7367e9faa..99fea1db28 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -106,9 +106,10 @@ __gitdir () __git_ps1_show_upstream () { local key value - local svn_remote=() svn_url_pattern count n + local svn_remote svn_url_pattern count n local upstream=git legacy="" verbose="" + svn_remote=() # get some config options from git-config local output="$(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n ')" while read -r key value; do From c32c95916549331a581fadfa749c4322c14ccd78 Mon Sep 17 00:00:00 2001 From: D Waitzman Date: Fri, 23 Mar 2012 11:02:43 -0400 Subject: [PATCH 2/4] Documentation/gitweb: trivial English fixes Change "it's" to "its" where a possessive is intended. Also add two missing "the" that were noticed by Ben Walton. Signed-off-by: David Waitzman --- Documentation/gitweb.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt index 605a085326..168e8bfed6 100644 --- a/Documentation/gitweb.txt +++ b/Documentation/gitweb.txt @@ -14,7 +14,7 @@ gitweb. DESCRIPTION ----------- -Gitweb provides a web interface to git repositories. It's features include: +Gitweb provides a web interface to git repositories. Its features include: * Viewing multiple Git repositories with common root. * Browsing every revision of the repository. @@ -60,7 +60,7 @@ to gitweb. The list of projects is generated by default by scanning the more exact; gitweb is not interested in a working area, and is best suited to showing "bare" repositories). -The name of repository in gitweb is path to it's `$GIT_DIR` (it's object +The name of the repository in gitweb is the path to its `$GIT_DIR` (its object database) relative to `$projectroot`. Therefore the repository $repo can be found at "$projectroot/$repo". From eb2c67ccbd5c6c5b7c73752dca2526bcce022b9e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 23 Mar 2012 14:40:39 -0700 Subject: [PATCH 3/4] .mailmap: unify various old mail addresses of gitster "git shortlog -s -e" should show a single current address with this. Signed-off-by: Junio C Hamano --- .mailmap | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 19c8726232..6303782106 100644 --- a/.mailmap +++ b/.mailmap @@ -29,7 +29,13 @@ Joachim Berdal Haga Jon Loeliger Jon Seymour Jonathan Nieder -Junio C Hamano +Junio C Hamano +Junio C Hamano +Junio C Hamano +Junio C Hamano +Junio C Hamano +Junio C Hamano +Junio C Hamano Karl Hasselström Kent Engstrom Lars Doelle From c16df57c5a778ef14ede7ad202c74146269d61ac Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 23 Mar 2012 14:50:23 -0700 Subject: [PATCH 4/4] Git 1.7.10-rc2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.10.txt | 18 +++++++++++++++++- GIT-VERSION-GEN | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt index 238234ed7c..ca917523bb 100644 --- a/Documentation/RelNotes/1.7.10.txt +++ b/Documentation/RelNotes/1.7.10.txt @@ -29,6 +29,16 @@ Compatibility Notes while and were deprecated in mid 2008 (v1.6.0). When you give these options to "git am", it will now warn and ask you not to use them. + * When you do not tell which branches and tags to push to the "git push" + command in any way, the command used "matching refs" rule to update + remote branches and tags with branches and tags with the same name you + locally have. In future versions of Git, this will change to use the + "upstream" rule to update the branch at the remote you would "pull" + from into your current branch with your local current branch. The + release after 1.7.10 will start issuing a warning about this change, + to encourage you to tell the command what to push out, e.g. by setting + push.default configuration. + Updates since v1.7.9 -------------------- @@ -180,6 +190,10 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance releases are contained in this release (see release notes to them for details). + * Build with NO_PERL_MAKEMAKER was broken and Git::I18N did not work + with versions of Perl older than 5.8.3. + (merge 5eb660e ab/perl-i18n later to maint). + * "git fast-import" accepted "ls" command with an empty path by mistake. (merge 178e1de jn/maint-fast-import-empty-ls later to maint). @@ -201,13 +215,15 @@ details). platform tools in /usr/bin) in config.mak-autogen. This may be useful for people on Solaris who have saner tools outside /usr/xpg[46]/bin. + * zsh port of bash completion script needed another workaround. + * "gitweb" used to drop warnings in the log file when "heads" view is accessed in a repository whose HEAD does not point at a valid branch. --- exec >/var/tmp/1 -O=v1.7.10-rc1-18-g0987145 +O=v1.7.10-rc1-32-geb2c67c echo O=$(git describe) git log --first-parent --oneline ^maint $O.. echo diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1c06cec047..c9425fb846 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.10-rc1 +DEF_VER=v1.7.10-rc2 LF=' '