Skip to content

Commit a06d04c

Browse files
committed
[utils] fix work-tree path in update-checkout script
1 parent 1fc75fa commit a06d04c

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

utils/update-checkout

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ def update_working_copy(repo_path, branch):
4141
# Prior to Git 2.6, this is the way to do a "git pull
4242
# --rebase" that respects rebase.autostash. See
4343
# http://stackoverflow.com/a/30209750/125349
44-
status = check_output(['git', 'status', '--porcelain'])
4544
check_call(["git", "fetch"])
4645
check_call(["git", "rebase", "FETCH_HEAD"])
4746

@@ -64,7 +63,7 @@ def obtain_additional_swift_sources(with_ssh, branch):
6463
check_call(['git', 'clone', remote, dir_name])
6564
if branch:
6665
src_path = SWIFT_SOURCE_ROOT + "/" + dir_name + "/" + ".git"
67-
check_call(['git', '--git-dir', src_path, '--work-tree', SWIFT_SOURCE_ROOT, 'checkout', branch])
66+
check_call(['git', '--git-dir', src_path, '--work-tree', os.path.join(SWIFT_SOURCE_ROOT, dir_name), 'checkout', branch])
6867

6968
def main():
7069
parser = argparse.ArgumentParser(

0 commit comments

Comments
 (0)