[ANNOUNCE] GIT 1.6.0-rc2

[ANNOUNCE] GIT 1.6.0-rc2

[Junio C Hamano]

GIT 1.6.0-rc2 is the second (or should we call it the third?) preview of
the upcoming release.  It is available at the usual places:

  http://www.kernel.org/pub/software/scm/git/

  git-1.6.0-rc2.tar.{gz,bz2}			(source tarball)
  git-htmldocs-1.6.0-rc2.tar.{gz,bz2}		(preformatted docs)
  git-manpages-1.6.0-rc2.tar.{gz,bz2}		(preformatted docs)

The RPM binary packages for a few architectures are also provided
as courtesy.

  testing/RPMS/$arch/*-1.6.0.rc2-1.fc9.$arch.rpm	(RPM)

----------------------------------------------------------------

Changes since v1.6.0-rc1 are as follows:

Abhijit Menon-Sen (7):
      `git submodule add` now requires a <path>
      Make it clear that push can take multiple refspecs
      Make the DESCRIPTION match <x>... items in the SYNOPSIS
      Git.pm: localise $? in command_close_bidi_pipe()
      Fix hash slice syntax error
      Fix typo in perl/Git.pm
      Fix typos in INSTALL

Alex Riesen (1):
      Make use of stat.ctime configurable

Alexander Gavrilov (9):
      git-gui: Fix the Remote menu separator.
      git-gui: Preserve scroll position on reshow_diff.
      Support copy and rename detection in fast-export.
      gitk: Kill back-end processes on window close
      gitk: Arrange to kill diff-files & diff-index on quit
      gitk: On Windows, use a Cygwin-specific flag for kill
      gitk: Fixed broken exception handling in diff
      gitk: Fixed automatic row selection during load
      gitk: Fallback to selecting the head commit upon load

Anders Melchiorsen (4):
      Advertise the ability to abort a commit
      Documentation: fix diff.external example
      Flush output in start_async
      Add output flushing before fork()

Avery Pennarun (2):
      Teach "git diff -p" Pascal/Delphi funcname pattern
      git-svn: Abort with an error if 'fetch' parameter is invalid.

Brandon Casey (3):
      t/t4202-log.sh: add newline at end of file
      Teach fsck and prune that tmp_obj_ file names may not be 14 bytes long
      perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section

Brian Gernhardt (1):
      Documentation: Remove mentions of git-svnimport.

Cesar Eduardo Barros (1):
      Documentation/git-rev-parse.txt: update for new git-describe output format

Christian Couder (2):
      merge-base: die with an error message if not passed a commit ref
      documentation: user-manual: update "using-bisect" section

Christian Stimming (2):
      git-gui: Update German translation
      gitk: Updated German translation

Ciaran McCreesh (1):
      Make git-add -i accept ranges like 7-

David D. Kilzer (1):
      Fix race condition in t9119-git-svn-info.sh

Dmitry Potapov (1):
      correct access right for git-svn-dcommit test

Eric Wong (2):
      git-svn: properly set path for "info" command
      t9119: conditionally re-enable test depending on svn(1) version

Giuseppe Bilotta (2):
      diff: add ruby funcname pattern
      diff: chapter and part in funcname for tex

Jeff King (3):
      init: handle empty "template" parameter
      Compact commit template message
      init: handle empty "template" parameter

Jim Meyering (1):
      git-cvsimport.perl: Print "UNKNOWN LINE..." on stderr, not stdout.

Johannes Schindelin (3):
      sort_in_topological_order(): avoid setting a commit flag
      clone: Add an option to set up a mirror
      clone --bare: Add ".git" suffix to the directory name to clone into

Johannes Sixt (1):
      git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core'

Jon Jensen (1):
      Fix reference to Everyday Git, which is an HTML document and not a man page.

Jonathan Nieder (1):
      git-diff(1): "--c" -> "--cc" typo fix

Junio C Hamano (19):
      Allow building without any git installed
      Allow installing in the traditional way
      ls-tree documentation: enhance notes on subdirectory and pathspec behaviour
      Documentation: clarify what is shown in "git-ls-files -s" output
      t7001: fix "git mv" test
      Teach gitlinks to ie_modified() and ce_modified_check_fs()
      Fix merge name generation in "merge in C"
      Fix test-parse-options "integer" test
      Teach --find-copies-harder to "git blame"
      make sure parsed wildcard refspec ends with slash
      Documentation: clarify diff --cc
      Update my e-mail address
      Start 1.5.6.5 RelNotes to describe accumulated fixes
      builtin-name-rev.c: split deeply nested part from the main function
      RelNotes 1.5.6.5 updates
      fix diff-tree --stdin documentation
      Files given on the command line are relative to $cwd
      GIT 1.5.6.5
      GIT 1.6.0-rc2

Kevin Ballard (1):
      format-patch: Produce better output with --inline or --attach

Lee Marlow (11):
      bash completion: remove unused function _git_diff_tree
      bash completion: Add more long options for 'git log'
      bash completion: Add completion for 'git grep'
      bash completion: Add completion for 'git clone'
      bash completion: Add completion for 'git clean'
      bash completion: Add completion for 'git init'
      bash completion: Add completion for 'git revert'
      bash completion: More completions for 'git stash'
      bash completion: Add completion for 'git archive'
      bash completion: Add completion for 'git ls-files'
      bash completion: Add completion for 'git mv'

Linus Torvalds (1):
      diff.renamelimit is a basic diff configuration

Michele Ballabio (2):
      git-gui: update po/it.po
      git-gui: add a part about format strings in po/README

Mikael Magnusson (2):
      git-gui: Update swedish translation.
      gitk: Update swedish translation.

Mike Ralphson (2):
      Documentation: typos / spelling fixes in older RelNotes
      Documentation: typos / spelling fixes

Nanako Shiraishi (1):
      git-gui: update Japanese translation

Olivier Marin (1):
      builtin-verify-tag: fix -v option parsing

Pierre Habouzit (2):
      Allow "non-option" revision options in parse_option-enabled commands
      git-submodule: move ill placed shift.

Pieter de Bie (1):
      git-name-rev: allow --name-only in combination with --stdin

René Scharfe (2):
      archive: allow --exec and --remote without equal sign
      git-name-rev: don't use printf without format

Shawn O. Pearce (2):
      git-gui: Fix gitk search in $PATH to work on Windows
      git-gui: Update git-gui.pot for 0.11 nearing release

Steffen Prohaska (6):
      Refactor, adding prepare_git_cmd(const char **argv)
      run-command (Windows): Run dashless "git <cmd>"
      git-gui: Correct installation of library to be $prefix/share
      git-gui (Windows): Switch to relative discovery of oguilib
      git-gui (Windows): Change wrapper to execdir 'libexec/git-core'
      Modify mingw_main() workaround to avoid link errors

Stephan Beyer (1):
      builtin-revert.c: typofix

Steve Haslam (1):
      Propagate -u/--upload-pack option of "git clone" to transport.

Steven Grimm (1):
      Optimize sha1_object_info for loose objects, not concurrent repacks

Todd Zullinger (1):
      Replace uses of "git-var" with "git var"

Re: [ANNOUNCE] GIT 1.6.0-rc2

[Peter Zijlstra]

On Wed, 2008-08-06 at 17:31 -0700, Junio C Hamano wrote:
> GIT 1.6.0-rc2 is the second (or should we call it the third?) preview of
> the upcoming release.  It is available at the usual places:
> 
>   http://www.kernel.org/pub/software/scm/git/
> 
>   git-1.6.0-rc2.tar.{gz,bz2}			(source tarball)
>   git-htmldocs-1.6.0-rc2.tar.{gz,bz2}		(preformatted docs)
>   git-manpages-1.6.0-rc2.tar.{gz,bz2}		(preformatted docs)
> 
> The RPM binary packages for a few architectures are also provided
> as courtesy.
> 
>   testing/RPMS/$arch/*-1.6.0.rc2-1.fc9.$arch.rpm	(RPM)

Quick question - where does one go to find out the cool new features
that make it 1.6 and should convince me to upgrade and try this whicked
new release?

Re: [ANNOUNCE] GIT 1.6.0-rc2

[Junio C Hamano]

Peter Zijlstra <peterz@infradead.org> writes:

> Quick question - where does one go to find out the cool new features
> that make it 1.6 and should convince me to upgrade and try this whicked
> new release?

Draft release notes for 1.6.0 was posted to the list some time ago
already, but as always:

    http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.txt

Re: [ANNOUNCE] GIT 1.6.0-rc2

[Peter Zijlstra]

On Thu, 2008-08-07 at 03:00 -0700, Junio C Hamano wrote:
> Peter Zijlstra <peterz@infradead.org> writes:
> 
> > Quick question - where does one go to find out the cool new features
> > that make it 1.6 and should convince me to upgrade and try this whicked
> > new release?
> 
> Draft release notes for 1.6.0 was posted to the list some time ago
> already, but as always:
> 
>     http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.txt

Thanks!

Re: [ANNOUNCE] GIT 1.6.0-rc2

[David Miller]

From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 07 Aug 2008 03:00:25 -0700

> Peter Zijlstra <peterz@infradead.org> writes:
> 
> > Quick question - where does one go to find out the cool new features
> > that make it 1.6 and should convince me to upgrade and try this whicked
> > new release?
> 
> Draft release notes for 1.6.0 was posted to the list some time ago
> already, but as always:
> 
>     http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.txt

Just FYI, I have some issue with 1.6.x git when pulling remotely from
it on sparc64.  I suspect it is the usual unaligned access issue and I
will debug it further soon.

Re: [ANNOUNCE] GIT 1.6.0-rc2

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Thu, 07 Aug 2008 05:26:48 -0700 (PDT)

> From: Junio C Hamano <gitster@pobox.com>
> Date: Thu, 07 Aug 2008 03:00:25 -0700
> 
> > Peter Zijlstra <peterz@infradead.org> writes:
> > 
> > > Quick question - where does one go to find out the cool new features
> > > that make it 1.6 and should convince me to upgrade and try this whicked
> > > new release?
> > 
> > Draft release notes for 1.6.0 was posted to the list some time ago
> > already, but as always:
> > 
> >     http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.txt
> 
> Just FYI, I have some issue with 1.6.x git when pulling remotely from
> it on sparc64.  I suspect it is the usual unaligned access issue and I
> will debug it further soon.

As a followup this turned out to be the classic "PATH when doing GIT over
SSH" problem.

I have to say this is very unfun to debug, and even less fun to "fix"
even once you know this is the problem.  And what's more I know this is
the second time I've had to spend a night debugging this very problem.

I ended up having to make a ~/.ssh/environment file and then restart my
SSH server with "PermitUserEnvironment yes" added to sshd_config.

But I can't believe this is what I have to do just to pull from a machine
where I have GIT only installed in my home directory.  What if I were just
a normal user and couldn't change the SSHD config?  What hoops would I
need to jump through to get my PATH setup correctly? :)

It doesn't even work to put ~/bin into the PATH listed in the system wide
/etc/environment, because that does not do tilde expansion, SSHD just takes
it as-is.

Wouldn't it make sense to put the bindir into PATH when we try to do
execv_git_cmd()?  The code has already put the gitexecdir into the
PATH at this point.

Thanks!

Re: [ANNOUNCE] GIT 1.6.0-rc2

[Jan Hudec]

On Sat, Sep 13, 2008 at 01:33:30 -0700, David Miller wrote:
> As a followup this turned out to be the classic "PATH when doing GIT over
> SSH" problem.
> 
> I have to say this is very unfun to debug, and even less fun to "fix"
> even once you know this is the problem.  And what's more I know this is
> the second time I've had to spend a night debugging this very problem.
> 
> I ended up having to make a ~/.ssh/environment file and then restart my
> SSH server with "PermitUserEnvironment yes" added to sshd_config.
> 
> But I can't believe this is what I have to do just to pull from a machine
> where I have GIT only installed in my home directory.  What if I were just
> a normal user and couldn't change the SSHD config?  What hoops would I
> need to jump through to get my PATH setup correctly? :)
> 
> It doesn't even work to put ~/bin into the PATH listed in the system wide
> /etc/environment, because that does not do tilde expansion, SSHD just takes
> it as-is.
> 
> Wouldn't it make sense to put the bindir into PATH when we try to do
> execv_git_cmd()?  The code has already put the gitexecdir into the
> PATH at this point.

I don't think it gets to execv_git_cmd(). Git on local side will run
    ssh <host> git upload-pack
and it's ssh that can't find git in ~/bin (or maybe it's still using the
dashed form for backward compatibility; the argument stands either way).

There are two possible solutions (besides the .ssh/environment one):
 1. Without hacking git: Use a separate key pair for git access and configure
    that key on the server with 'command="/home/you/bin/git-shell"' option in
    .ssh/authorized_keys. Git shell should run the command from exec-dir
    properly.
 2. Hack git to support some variable to set the remote command for ssh
    protocol.

-- 
						 Jan 'Bulb' Hudec <bulb@ucw.cz>

Re: [ANNOUNCE] GIT 1.6.0-rc2

[David Miller]

From: Jan Hudec <bulb@ucw.cz>
Date: Mon, 15 Sep 2008 19:12:40 +0200

> On Sat, Sep 13, 2008 at 01:33:30 -0700, David Miller wrote:
> > Wouldn't it make sense to put the bindir into PATH when we try to do
> > execv_git_cmd()?  The code has already put the gitexecdir into the
> > PATH at this point.
> 
> I don't think it gets to execv_git_cmd(). Git on local side will run
>     ssh <host> git upload-pack
> and it's ssh that can't find git in ~/bin (or maybe it's still using the
> dashed form for backward compatibility; the argument stands either way).

That's not the case I'm running into.  The initial GIT execution
works, it's when GIT forks up sub processes and tries to execute other
things that problem show up.

I added tracing and on the ssh remote system, and my PATH had the
GIT exec dir in my path when the problem triggers.