[PULL] git-svn updates from Ramkumar

The following changes since commit 563d4e59bd167fe2eecc5480e3841d878b1c8c2b:

  Fifth batch for 2.3 cycle (2015-01-14 12:44:03 -0800)

are available in the git repository at:

  git://bogomips.org/git-svn.git for-junio

for you to fetch changes up to a94655dcfedc6b266ba32a3d32b0d52a1ce6a928:

  git-svn: make it play nicely with submodules (2015-01-15 08:35:55 +0000)

----------------------------------------------------------------
Ramkumar Ramachandra (2):
      Git::SVN: handle missing ref_id case correctly
      git-svn: make it play nicely with submodules

 git-svn.perl    | 6 ++++++
 perl/Git/SVN.pm | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

Eric Wong <normalperson@yhbt.net> writes:

Thanks.  No tests necessary/feasible?  Just being curious.

Junio C Hamano <gitster@pobox.com> wrote:

They seemed simple and obvious enough to me, (and most importantly, didn't trigger regressions). If Ramkumar or anybody else has the time, I'd welcome them.

Eric Wong <normalperson@yhbt.net> writes:

I can see that the top-most one is about .git that is a textual symlink ".gitdir: <elsewhere>" and the code after this part needed to convert it to the real place in order to be able to read/write "${GIT_DIR}/<some file>", so that is obvious to me.

But the other one just says "handle missing ref_id case correctly" without clarifying what is incorrect in the original and how the desired correct behaviour is different (in other words, what breaks without this change)

To which a natural reaction was "Can the existing breakage demonstrated by a test?".

If it is obvious for git-svn folks, then I wouldn't complain, though.

Junio C Hamano wrote:

There's a lot to do, if we really want to dig deeper.

The second git-svn-basic test onwards doesn't pass for me, so I really can't do much in the way of contributing tests until that's fixed.

Couldn't open a repository: Unable to connect to a repository at URL 'file:///Users/artagnon/src/git/t/trash%20directory.t9100-git-svn-basic/svnrepo': Unable to open an ra_local session to URL: Unable to open repository 'file:///Users/artagnon/src/git/t/trash%20directory.t9100-git-svn-basic/svnrepo': Expected FS format between '1' and '4'; found format '6' at /Users/artagnon/src/git/perl/blib/lib/Git/SVN.pm line 148.

Ramkumar Ramachandra <artagnon@gmail.com> wrote:

I haven't seen this before. Which SVN Perl binding version are you using? Perhaps your "svnadmin" tool is from a different SVN version or installation of SVN than your Perl bindings?

Eric Wong wrote:

I have two installations of Subversion: the system one is at /Library/Developer/CommandLineTools @ version 1.7.17, and the brew installed one is at /usr/local @ version 1.8.10. When I build git from scratch, it links to the dated SVN bindings for some reason. I suspect I have to tweak $PERL5LIB?

Can we patch git-svn to link to the Right one on OS X?

Ramkumar Ramachandra <artagnon@gmail.com> wrote:

Adding it to GITPERLLIB should work...

You should be able to set up everything in the Makefile, that has special cases for Fink and Darwin ports, at least. Somebody who knows OS X packaging systems might have better advice.

Eric Wong wrote:

I tried everything including replicating the commands in the brew formula that does the Right thing: https://github.com/Homebrew/homebrew/blob/master/Library/Formula/git.rb

I'm clearly missing something. Can someone on Darwin tell us the right flags/ env variables?