Re: [PULL] svn pathnameencoding for git svn dcommit
- From
Kazutoshi Satoda <k_satoda@f2.dion.ne.jp>
- Date
- Feb 16, 2016, 03:29 UTC
- Message-ID
- <56C297A9.2080705@f2.dion.ne.jp>
- In-Reply-To
- <20160215005210.GA31141@dcvr.yhbt.net>
On 2016/02/15 9:52 +0900, Eric Wong wrote:
> I've amended tests to both commits, but the URL encoding one > requires an HTTP server to test effectively.
Thank you for the tests. But, on my environment, both of them failed unexpectedly. (Windows 7 SP1, x86_64 Cygwin, LANG=ja_JP.UTF-8)
For now, I don't have enough time to investigate this further. Let me just share the result.
> $ ./t9115-git-svn-dcommit-funky-renames.sh -x --run='11-12'
(snip)
Show 74 quoted lines
> expecting success: > neq=$(printf "\201\202") && > git config svn.pathnameencoding cp932 && > echo neq >"$neq" && > git add "$neq" && > git commit -m "neq" && > git svn dcommit > > +++ printf '\201\202' > ++ neq=$'\201\202' > ++ git config svn.pathnameencoding cp932 > ++ echo neq > ++ git add $'\201\202' > ++ git commit -m neq > On branch master > > Initial commit > > Untracked files: > svnrepo/ > "\357\202\201\357\202\202" > > nothing added to commit but untracked files present > error: last command exited with $?=1 > not ok 11 - svn.pathnameencoding=cp932 new file on dcommit > # > # neq=$(printf "\201\202") && > # git config svn.pathnameencoding cp932 && > # echo neq >"$neq" && > # git add "$neq" && > # git commit -m "neq" && > # git svn dcommit > # > > expecting success: > inf=$(printf "\201\207") && > git config svn.pathnameencoding cp932 && > echo inf >"$inf" && > git add "$inf" && > git commit -m "inf" && > git svn dcommit && > git mv "$inf" inf && > git commit -m "inf rename" && > git svn dcommit > > +++ printf '\201\207' > ++ inf=$'\201\207' > ++ git config svn.pathnameencoding cp932 > ++ echo inf > ++ git add $'\201\207' > ++ git commit -m inf > On branch master > > Initial commit > > Untracked files: > svnrepo/ > "\357\202\201\357\202\202" > "\357\202\201\357\202\207" > > nothing added to commit but untracked files present > error: last command exited with $?=1 > not ok 12 - svn.pathnameencoding=cp932 rename on dcommit > # > # inf=$(printf "\201\207") && > # git config svn.pathnameencoding cp932 && > # echo inf >"$inf" && > # git add "$inf" && > # git commit -m "inf" && > # git svn dcommit && > # git mv "$inf" inf && > # git commit -m "inf rename" && > # git svn dcommit > #
Strangely, after the test failure, "git status" in the trash directory reports different status.
Show 14 quoted lines
> $ cd 'trash directory.t9115-git-svn-dcommit-funky-renames' > $ git status > On branch master > > Initial commit > > Untracked files: > (use "git add <file>..." to include in what will be committed) > > svnrepo/ > "\201\202" > "\201\207" > > nothing added to commit but untracked files present (use "git add" to track)
I can manually add and commit them.
Show 6 quoted lines
> $ neq=$(printf "\201\202") > $ git add "$neq" > $ git commit -m "neq" > [master (root-commit) 3fd464f] neq > 1 file changed, 1 insertion(+) > create mode 100644 "\201\202"
I can't see how "\357\202\201\357\202\202" came as output in the test.
-- k_satoda