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 | 59bbd3ca9eed1371e674dcc519e55373e51ee560 (patch) | |
| tree | 3969f59bd348528e34fea1c9c64edb62dd03d0d7 /utils/git-svn | |
| parent | d75c17840807eb766ddaece87f32a9bd083093fa (diff) | |
| download | llvm-59bbd3ca9eed1371e674dcc519e55373e51ee560.tar.gz | |
Fix `git-llvm` script to handle `git worktree` setups correctly
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286140 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/git-svn')
| -rwxr-xr-x | utils/git-svn/git-llvm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/git-svn/git-llvm b/utils/git-svn/git-llvm index c5159aebec46..de7d89dc666e 100755 --- a/utils/git-svn/git-llvm +++ b/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 |