[llvm-dev] git llvm push?

[Craig Topper via llvm-dev]

Ok that's exactly the problem I had. The script expects that to return a
directory name. But its just echoing back the argument because it doesn't
recognize it. I assume it must be some difference in versions of git. I've
been hacking around it with this

diff --git a/llvm/utils/git-svn/git-llvm b/llvm/utils/git-svn/git-llvm
index 0afa836..28a0a9b 100755
--- a/llvm/utils/git-svn/git-llvm
+++ b/llvm/utils/git-svn/git-llvm
@@ -392,6 +392,11 @@ def cmd_push(args):

     # We need a staging area for SVN, let's hide it in the .git directory.
     dot_git_dir = git('rev-parse', '--git-common-dir')
+    # Not all versions of git support --git-common-dir and just print the
+    # unknown command back. If this happens, fall back to --git-dir
+    if dot_git_dir == '--git-common-dir':
+      dot_git_dir = git('rev-parse', '--git-dir')
+
     svn_root = os.path.join(dot_git_dir, 'llvm-upstream-svn')
     svn_init(svn_root)


~Craig


On Fri, May 3, 2019 at 12:56 PM Cameron McInally <cameron.mcinally at nyu.edu>
wrote:

> llvm-project/llvm> git rev-parse --git-common-dir
> --git-common-dir
> llvm-project/llvm>
>
> On Fri, May 3, 2019 at 3:48 PM Craig Topper <craig.topper at gmail.com>
> wrote:
>
>> I might have seen this issue. What does "git rev-parse --git-common-dir"
>> return for you?
>>
>> ~Craig
>>
>>
>> On Fri, May 3, 2019 at 12:35 PM Cameron McInally via llvm-dev <
>> llvm-dev at lists.llvm.org> wrote:
>>
>>> Hey,
>>>
>>> First time using LLVM's git repo. Does 'git llvm push' take a really
>>> long time to work? I've tried to push a couple of times now and receive a
>>> message like:
>>>
>>> <scrubbed> llvm-project/llvm> git llvm push
>>> Pushing 1 commit:
>>>   2159c44 Update PatternMatcher for FNeg
>>>
>>> Committed 2159c44 to svn.
>>> <scrubbed> llvm-project/llvm>
>>>
>>> The svn repo never seems to update though. Any ideas?
>>> _______________________________________________
>>> LLVM Developers mailing list
>>> llvm-dev at lists.llvm.org
>>> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
>>> <https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.llvm.org_cgi-2Dbin_mailman_listinfo_llvm-2Ddev&d=DwMFaQ&c=slrrB7dE8n7gBJbeO0g-IQ&r=O_4M49EtSpZ_-BQYeigzGv0P4__noMcSu2RYEjS1vKs&m=dRYQouxPmqxI-Gmg0oI9YDMppte-m8OkTB7n5xrNQtg&s=mTiQJ33-XQ-BSpS5RkqKYg2aqVHl8WE5KHIeXWVfslc&e=>
>>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20190503/421ca237/attachment.html>