<div dir="ltr">On which OS you are checking out the repo? If you are cloning it on a linux machine, it could be a result of file name case issue here. (os x filesystem is case insensitive)<div><br></div><div>Cheers<br><div class="gmail_extra"><div><div class="gmail_signature"><div dir="ltr"><br><br></div></div></div>
<br><div class="gmail_quote">On Thu, Dec 8, 2016 at 3:00 PM, Ryan Parman via swift-users <span dir="ltr"><<a href="mailto:swift-users@swift.org" target="_blank">swift-users@swift.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">I’ve been using Git for about 8 years now, so I know my way around. But in checking out a release of Swift, I’m running into errors.<br>
<br>
```<br>
$ git clone -q -b swift-3.0.2-PREVIEW-1 <a href="https://github.com/apple/swift.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift.git</a>;<br>
Note: checking out '<wbr>dc2c3d580f52367eebaada34901a94<wbr>5466e947df'.<br>
<br>
You are in 'detached HEAD' state. You can look around, make experimental<br>
changes and commit them, and you can discard any commits you make in this<br>
state without impacting any branches by performing another checkout.<br>
<br>
If you want to create a new branch to retain commits you create, you may<br>
do so (now or later) by using -b with the checkout command again. Example:<br>
<br>
git checkout -b <new-branch-name><br>
```<br>
<br>
So far, so good. (I also did this exact same thing with swift-3.0.1-RELEASE — same issue.)<br>
<br>
Now, for the util scripts:<br>
<br>
```<br>
$ cd swift && \<br>
./utils/update-checkout --clone && \<br>
./utils/build-script -r \<br>
;<br>
--- Cloning 'compiler-rt' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-compiler-rt.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-compiler-rt.git</a> compiler-rt<br>
Cloning into 'compiler-rt'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 67008, done.<br>
remote: Compressing objects: 100% (721/721), done.<br>
remote: Total 67008 (delta 461), reused 0 (delta 0), pack-reused 66286<br>
Receiving objects: 100% (67008/67008), 12.01 MiB | 6.94 MiB/s, done.<br>
Resolving deltas: 100% (54564/54564), done.<br>
Already on 'stable'<br>
Your branch is up-to-date with 'origin/stable'.<br>
--- Cloning 'llvm' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-llvm.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-llvm.git</a> llvm<br>
Cloning into 'llvm'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 1288275, done.<br>
remote: Compressing objects: 100% (1733/1733), done.<br>
remote: Total 1288275 (delta 1048), reused 0 (delta 0), pack-reused 1286542<br>
Receiving objects: 100% (1288275/1288275), 288.84 MiB | 10.42 MiB/s, done.<br>
Resolving deltas: 100% (1065091/1065091), done.<br>
Checking out files: 100% (22170/22170), done.<br>
Already on 'stable'<br>
Your branch is up-to-date with 'origin/stable'.<br>
--- Cloning 'swift-xcode-playground-<wbr>support' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-xcode-playground-support.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-xcode-playground-<wbr>support.git</a> swift-xcode-playground-support<br>
Cloning into 'swift-xcode-playground-<wbr>support'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 483, done.<br>
remote: Total 483 (delta 0), reused 0 (delta 0), pack-reused 482<br>
Receiving objects: 100% (483/483), 139.53 KiB | 0 bytes/s, done.<br>
Resolving deltas: 100% (301/301), done.<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
--- Cloning 'swift-corelibs-foundation' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-corelibs-foundation.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-corelibs-foundation.git</a> swift-corelibs-foundation<br>
Cloning into 'swift-corelibs-foundation'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 13088, done.<br>
remote: Compressing objects: 100% (58/58), done.<br>
remote: Total 13088 (delta 17), reused 0 (delta 0), pack-reused 13030<br>
Receiving objects: 100% (13088/13088), 8.57 MiB | 6.03 MiB/s, done.<br>
Resolving deltas: 100% (9875/9875), done.<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
--- Cloning 'clang' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-clang.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-clang.git</a> clang<br>
Cloning into 'clang'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 628505, done.<br>
remote: Compressing objects: 100% (498/498), done.<br>
remote: Total 628505 (delta 316), reused 15 (delta 15), pack-reused 627992<br>
Receiving objects: 100% (628505/628505), 128.49 MiB | 9.96 MiB/s, done.<br>
Resolving deltas: 100% (532138/532138), done.<br>
Checking out files: 100% (13004/13004), done.<br>
Already on 'stable'<br>
Your branch is up-to-date with 'origin/stable'.<br>
--- Cloning 'llbuild' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-llbuild.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-llbuild.git</a> llbuild<br>
Cloning into 'llbuild'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 7253, done.<br>
remote: Compressing objects: 100% (3/3), done.<br>
remote: Total 7253 (delta 1), reused 0 (delta 0), pack-reused 7250<br>
Receiving objects: 100% (7253/7253), 6.90 MiB | 4.61 MiB/s, done.<br>
Resolving deltas: 100% (4769/4769), done.<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
--- Cloning 'cmark' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-cmark.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-cmark.git</a> cmark<br>
Cloning into 'cmark'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 8390, done.<br>
remote: Compressing objects: 100% (2/2), done.<br>
remote: Total 8390 (delta 1), reused 0 (delta 0), pack-reused 8388<br>
Receiving objects: 100% (8390/8390), 2.75 MiB | 1.34 MiB/s, done.<br>
Resolving deltas: 100% (5825/5825), done.<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
--- Cloning 'lldb' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-lldb.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-lldb.git</a> lldb<br>
Cloning into 'lldb'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 196362, done.<br>
remote: Compressing objects: 100% (310/310), done.<br>
remote: Total 196362 (delta 128), reused 0 (delta 0), pack-reused 196016<br>
Receiving objects: 100% (196362/196362), 111.11 MiB | 9.09 MiB/s, done.<br>
Resolving deltas: 100% (148069/148069), done.<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
--- Cloning 'swift-corelibs-xctest' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-corelibs-xctest.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-corelibs-xctest.git</a> swift-corelibs-xctest<br>
Cloning into 'swift-corelibs-xctest'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 2419, done.<br>
remote: Compressing objects: 100% (14/14), done.<br>
remote: Total 2419 (delta 1), reused 0 (delta 0), pack-reused 2404<br>
Receiving objects: 100% (2419/2419), 494.95 KiB | 0 bytes/s, done.<br>
Resolving deltas: 100% (1184/1184), done.<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
--- Cloning 'swift-integration-tests' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-integration-tests.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-integration-tests.git</a> swift-integration-tests<br>
Cloning into 'swift-integration-tests'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 280, done.<br>
remote: Total 280 (delta 0), reused 0 (delta 0), pack-reused 279<br>
Receiving objects: 100% (280/280), 38.71 KiB | 0 bytes/s, done.<br>
Resolving deltas: 100% (156/156), done.<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
--- Cloning 'swiftpm' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-package-manager.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-package-manager.git</a> swiftpm<br>
Cloning into 'swiftpm'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 16567, done.<br>
remote: Compressing objects: 100% (124/124), done.<br>
remote: Total 16567 (delta 44), reused 0 (delta 0), pack-reused 16441<br>
Receiving objects: 100% (16567/16567), 3.87 MiB | 3.27 MiB/s, done.<br>
Resolving deltas: 100% (11574/11574), done.<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
--- Cloning 'swift-corelibs-libdispatch' ---<br>
+ git clone --recursive <a href="https://github.com/apple/swift-corelibs-libdispatch.git" rel="noreferrer" target="_blank">https://github.com/apple/<wbr>swift-corelibs-libdispatch.git</a> swift-corelibs-libdispatch<br>
Cloning into 'swift-corelibs-libdispatch'..<wbr>.<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 3911, done.<br>
remote: Compressing objects: 100% (2/2), done.<br>
remote: Total 3911 (delta 0), reused 0 (delta 0), pack-reused 3909<br>
Receiving objects: 100% (3911/3911), 1.75 MiB | 1.51 MiB/s, done.<br>
Resolving deltas: 100% (2704/2704), done.<br>
Submodule 'libkqueue' (<a href="https://github.com/mheily/libkqueue.git" rel="noreferrer" target="_blank">https://github.com/mheily/<wbr>libkqueue.git</a>) registered for path 'libkqueue'<br>
Submodule 'libpwq' (<a href="https://github.com/mheily/libpwq.git" rel="noreferrer" target="_blank">https://github.com/mheily/<wbr>libpwq.git</a>) registered for path 'libpwq'<br>
Cloning into '/root/package-swift/swift-<wbr>corelibs-libdispatch/<wbr>libkqueue'...<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 4313, done.<br>
remote: Compressing objects: 100% (8/8), done.<br>
remote: Total 4313 (delta 1), reused 0 (delta 0), pack-reused 4305<br>
Receiving objects: 100% (4313/4313), 991.03 KiB | 1.35 MiB/s, done.<br>
Resolving deltas: 100% (2904/2904), done.<br>
Cloning into '/root/package-swift/swift-<wbr>corelibs-libdispatch/libpwq'..<wbr>.<br>
warning: templates not found /usr/local/git/share/git-core/<wbr>templates<br>
remote: Counting objects: 1740, done.<br>
remote: Total 1740 (delta 0), reused 0 (delta 0), pack-reused 1740<br>
Receiving objects: 100% (1740/1740), 469.59 KiB | 0 bytes/s, done.<br>
Resolving deltas: 100% (1066/1066), done.<br>
Submodule path 'libkqueue': checked out '<wbr>1873b1864195ff00e82bec17fa650a<wbr>89c4575d41'<br>
Submodule path 'libpwq': checked out '<wbr>23fba319ee26ae97dd4a64ff605d4b<wbr>b613a016b2'<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
--- Updating '/root/package-swift/compiler-<wbr>rt' ---<br>
+ git fetch<br>
+ git checkout stable<br>
Already on 'stable'<br>
Your branch is up-to-date with 'origin/stable'.<br>
+ git rebase FETCH_HEAD<br>
Current branch stable is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/llvm' ---<br>
+ git fetch<br>
+ git checkout stable<br>
Already on 'stable'<br>
Your branch is up-to-date with 'origin/stable'.<br>
+ git rebase FETCH_HEAD<br>
Current branch stable is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/swift-<wbr>xcode-playground-support' ---<br>
+ git fetch<br>
+ git checkout master<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
+ git rebase FETCH_HEAD<br>
Current branch master is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/swift-<wbr>corelibs-foundation' ---<br>
+ git fetch<br>
+ git checkout master<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
+ git rebase FETCH_HEAD<br>
Current branch master is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/clang' ---<br>
+ git fetch<br>
+ git checkout stable<br>
Already on 'stable'<br>
Your branch is up-to-date with 'origin/stable'.<br>
+ git rebase FETCH_HEAD<br>
Current branch stable is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/llbuild' ---<br>
+ git fetch<br>
+ git checkout master<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
+ git rebase FETCH_HEAD<br>
Current branch master is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/cmark' ---<br>
+ git fetch<br>
+ git checkout master<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
+ git rebase FETCH_HEAD<br>
Current branch master is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/lldb' ---<br>
+ git fetch<br>
+ git checkout master<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
+ git rebase FETCH_HEAD<br>
Current branch master is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/swift-<wbr>corelibs-xctest' ---<br>
+ git fetch<br>
+ git checkout master<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
+ git rebase FETCH_HEAD<br>
Current branch master is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/swift-<wbr>integration-tests' ---<br>
+ git fetch<br>
+ git checkout master<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
+ git rebase FETCH_HEAD<br>
Current branch master is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/swiftpm' ---<br>
+ git fetch<br>
+ git checkout master<br>
Already on 'master'<br>
Your branch is up-to-date with 'origin/master'.<br>
+ git rebase FETCH_HEAD<br>
Current branch master is up to date.<br>
+ git submodule update --recursive<br>
--- Updating '/root/package-swift/swift' ---<br>
+ git fetch<br>
+ git checkout master<br>
Checking out files: 100% (10034/10034), done.<br>
Previous HEAD position was dc2c3d580f... Change version string to 'swift-3.0.2-PREVIEW-1'.<br>
Branch master set up to track remote branch master from origin.<br>
Switched to a new branch 'master'<br>
+ git rebase FETCH_HEAD<br>
First, rewinding head to replay your work on top of it...<br>
Applying: [upstream-update] Rename of namespace clang::CodeGenOptions => clang::codegenoptions. NFC.<br>
Using index info to reconstruct a base tree...<br>
M lib/IRGen/IRGenModule.cpp<br>
Falling back to patching base and 3-way merge...<br>
Auto-merging lib/IRGen/IRGenModule.cpp<br>
CONFLICT (content): Merge conflict in lib/IRGen/IRGenModule.cpp<br>
error: Failed to merge in the changes.<br>
Patch failed at 0001 [upstream-update] Rename of namespace clang::CodeGenOptions => clang::codegenoptions. NFC.<br>
The copy of the patch that failed is found in: .git/rebase-apply/patch<br>
<br>
When you have resolved this problem, run "git rebase --continue".<br>
If you prefer to skip this patch, run "git rebase --skip" instead.<br>
To check out the original branch and stop rebasing, run "git rebase --abort".<br>
<br>
./utils/update-checkout: fatal error: command terminated with a non-zero exit status 128, aborting<br>
make: *** [compile] Error 1<br>
```<br>
<br>
I tried following the white rabbit for a while, resolving the merge conflicts (in favor of non-HEAD), but after a while I decided that this probably wasn’t normal and I should try asking here.<br>
<br>
Am I encountering something weird?<br>
<br>
Thanks for any pointers.<br>
<br>
--<br>
Ryan Parman<br>
<a href="https://github.com/skyzyx" rel="noreferrer" target="_blank">https://github.com/skyzyx</a><br>
<a href="https://keybase.io/skyzyx" rel="noreferrer" target="_blank">https://keybase.io/skyzyx</a><br>
<br>
<br>
______________________________<wbr>_________________<br>
swift-users mailing list<br>
<a href="mailto:swift-users@swift.org">swift-users@swift.org</a><br>
<a href="https://lists.swift.org/mailman/listinfo/swift-users" rel="noreferrer" target="_blank">https://lists.swift.org/<wbr>mailman/listinfo/swift-users</a><br>
</blockquote></div><br></div></div></div>