Bug#661094: git-svn: fails to git svn dcommit"

[Jonathan Nieder]

Роман Ержуков wrote:

> It's not regression. It was after one local git commit, when I
> renamed the Java package.
[...]
> [svn-remote "svn"]
>         url = http://svn.dfu.i-teco.ru/projects
>         fetch = trunk/АС Выплаты:refs/remotes/trunk
>         branches = branches/АС Выплаты/*:refs/remotes/*
>         tags = tags/АС Выплаты/*:refs/remotes/tags/*

Thanks.

I tried to reproduce this with git 1.7.9.2 and libsvn1 1.6.17dfsg-3.
At first, I got a different error[*] ("Unable to determine upstream
SVN information"), which turned out to be due to an unrelated bug.
Unsetting "[log] abbrevcommit" in ~/.gitconfig made the error go
away.

Unfortunately after that, "git svn dcommit" works fine.

| $ git svn dcommit
| Committing to file:///tmp/test-repo/trunk/АС Выплаты ...
|         M       hello.c
| Committed r6
|         M       hello.c
| r6 = 9747b1cb9cddf37f85da9cce99f17d4507005524 (refs/remotes/trunk)
| No changes between current HEAD and refs/remotes/trunk
| Resetting to the latest refs/remotes/trunk

Reproduction recipe:

        svnadmin create /tmp/test-repo
        svnadmin load /tmp/test-repo <dump.txt
        git init wc
        cd wc
        git svn init -s file:///tmp/test-repo
        sed -i -e '
                s,trunk:,trunk/АС Выплаты:,
                s,branches/\*:,branches/АС Выплаты/\*:,
                s,tags/\*:,tags/АС Выплаты/\*:,
        ' .git/config
        git svn fetch
        echo 'hello! 3' >hello.c
        git commit -a -m test
        git svn dcommit

No assertion failure.

 $ ldd /usr/lib/i386-linux-gnu/libsvn_swig_perl-1.so.1 | grep libsvn
        libsvn_delta-1.so.1 => /usr/lib/i386-linux-gnu/libsvn_delta-1.so.1 
(0xb7701000)
        libsvn_subr-1.so.1 => /usr/lib/i386-linux-gnu/libsvn_subr-1.so.1 
(0xb76ae000)
 $ sha1sum /usr/lib/i386-linux-gnu/libsvn_subr-1.so.1
 8ce873afadd6910a764a2539e59e64c2158ba437  
/usr/lib/i386-linux-gnu/libsvn_subr-1.so.1

Ideas?

Jonathan

[*]
        $ git svn dcommit
        Use of uninitialized value $hash in string eq at 
/usr/lib/git-core/git-svn line 1899.
        Use of uninitialized value $hash in string eq at 
/usr/lib/git-core/git-svn line 1899.
        Unable to determine upstream SVN information from HEAD history.
        Perhaps the repository is empty. at /usr/lib/git-core/git-svn line 780.

It's because this copy of git is missing the fix 83cf21f98 (git-svn:
un-break "git svn rebase" when log.abbrevCommit=true, 2012-02-12).

SVN-fs-dump-format-version: 2

UUID: d089e280-d7f1-45d1-a139-be5e3fcc7ad3

Revision-number: 0
Prop-content-length: 56
Content-length: 56

K 8
svn:date
V 27
2012-02-24T18:26:04.339037Z
PROPS-END

Revision-number: 1
Prop-content-length: 113
Content-length: 113

K 10
svn:author
V 3
jrn
K 8
svn:date
V 27
2012-02-24T18:28:56.964680Z
K 7
svn:log
V 15
initial commit

PROPS-END

Node-path: trunk
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: trunk/АС Выплаты
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: trunk/АС Выплаты/hello.c
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 7
Text-content-md5: 8b8db3dfa426f6bdb1798d578f5239ae
Text-content-sha1: 5c372ab96c721258c5c12bb8ead291bbba5dace6
Content-length: 17

PROPS-END
hello!


Revision-number: 2
Prop-content-length: 125
Content-length: 125

K 10
svn:author
V 3
jrn
K 8
svn:date
V 27
2012-02-24T18:31:23.316749Z
K 7
svn:log
V 27
Set up branches/ hierarchy

PROPS-END

Node-path: branches
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: branches/АС Выплаты
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Revision-number: 3
Prop-content-length: 110
Content-length: 110

K 10
svn:author
V 3
jrn
K 8
svn:date
V 27
2012-02-24T18:31:30.595389Z
K 7
svn:log
V 12
Make branch

PROPS-END

Node-path: branches/АС Выплаты/br
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 2
Node-copyfrom-path: trunk/АС Выплаты


Revision-number: 4
Prop-content-length: 119
Content-length: 119

K 10
svn:author
V 3
jrn
K 8
svn:date
V 27
2012-02-24T18:31:49.992179Z
K 7
svn:log
V 21
Make tags/ hierarchy

PROPS-END

Node-path: tags
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Node-path: tags/АС Выплаты
Node-kind: dir
Node-action: add
Prop-content-length: 10
Content-length: 10

PROPS-END


Revision-number: 5
Prop-content-length: 104
Content-length: 104

K 10
svn:author
V 3
jrn
K 8
svn:date
V 27
2012-02-24T18:32:16.545364Z
K 7
svn:log
V 7
update

PROPS-END

Node-path: trunk/АС Выплаты/hello.c
Node-kind: file
Node-action: change
Text-content-length: 9
Text-content-md5: 1714433b8efc50db990ad4e367adccd7
Text-content-sha1: 034526ae697192541bfe12e39575df6348bdda8c
Content-length: 9

hello! 2