diff options
| author | Mehdi Amini <mehdi.amini@apple.com> | 2016-11-07 20:35:02 +0000 |
|---|---|---|
| committer | Mehdi Amini <mehdi.amini@apple.com> | 2016-11-07 20:35:02 +0000 |
| commit | f95a459d5915462f7bf52414557caeffce8aa8ed (patch) | |
| tree | 2b80c04d3275f9012a7aebf26b91f1f41fd9bbe2 /llvm/utils/git-svn/git-llvm | |
| parent | f1271c8d087273af381e2ae5e447c2314c4a1f74 (diff) | |
| download | llvm-f95a459d5915462f7bf52414557caeffce8aa8ed.zip llvm-f95a459d5915462f7bf52414557caeffce8aa8ed.tar.gz llvm-f95a459d5915462f7bf52414557caeffce8aa8ed.tar.bz2 | |
Fix `git-llvm` script to handle `git worktree` setups correctly
llvm-svn: 286140
Diffstat (limited to 'llvm/utils/git-svn/git-llvm')
| -rwxr-xr-x | llvm/utils/git-svn/git-llvm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/utils/git-svn/git-llvm b/llvm/utils/git-svn/git-llvm index c5159ae..de7d89d 100755 --- a/llvm/utils/git-svn/git-llvm +++ b/llvm/utils/git-svn/git-llvm @@ -221,7 +221,8 @@ def cmd_push(args): os.chdir(git_root) # We need a staging area for SVN, let's hide it in the .git directory. - svn_root = os.path.join(git_root, '.git', 'llvm-upstream-svn') + dot_git_dir = git('rev-parse', '--git-common-dir') + svn_root = os.path.join(dot_git_dir, 'llvm-upstream-svn') svn_init(svn_root) rev_range = args.rev_range |