5db79339a1
When the submodule's parent repo has an adjusted unlocked branch, it gets cloned by git, but git checks out master. git annex init then fails because it wants to enter the adjusted branch, but: adjusted branch adjusted/master(unlocked) already exists. Aborting because that branch may have changes that have not yet reached master Note that init actually then exits 0, leaving master checked out. This could also happen, absent submodules, if the parent repo has an adjusted unlocked branch, but it is not checked out. In the more common case where that branch is checked out, the clone uses the same branch, so no problem. The choices to fix this: * Init could delete the existing adjusted branch, and re-adjust. But then running init inside an adjusted branch on a crippled filesystem would lose any changes that have not been synced back to master. * Init could sync any changes back to master, but that would be very surprising behavior for it. * Init could simply check out the existing adjusted branch. If the branch is diverged from master, well, sync will sort that out later. This mirrors the behavior of cloning a repo that has an adjusted branch checked out that has not yet been synced back to master. Picked this choice. |
||
---|---|---|
.. | ||
AdjustedBranch | ||
Branch | ||
Content | ||
LockPool | ||
MetaData | ||
SpecialRemote | ||
View | ||
Action.hs | ||
AdjustedBranch.hs | ||
AutoMerge.hs | ||
BloomFilter.hs | ||
Branch.hs | ||
BranchState.hs | ||
CatFile.hs | ||
ChangedRefs.hs | ||
CheckAttr.hs | ||
CheckIgnore.hs | ||
Common.hs | ||
Concurrent.hs | ||
Content.hs | ||
CurrentBranch.hs | ||
Difference.hs | ||
DirHashes.hs | ||
Drop.hs | ||
Environment.hs | ||
Export.hs | ||
FileMatcher.hs | ||
Fixup.hs | ||
GitOverlay.hs | ||
HashObject.hs | ||
Hook.hs | ||
Import.hs | ||
Ingest.hs | ||
Init.hs | ||
InodeSentinal.hs | ||
Journal.hs | ||
Link.hs | ||
Locations.hs | ||
LockFile.hs | ||
LockPool.hs | ||
Magic.hs | ||
MetaData.hs | ||
Multicast.hs | ||
Notification.hs | ||
NumCopies.hs | ||
Path.hs | ||
Perms.hs | ||
Queue.hs | ||
RemoteTrackingBranch.hs | ||
ReplaceFile.hs | ||
SpecialRemote.hs | ||
Ssh.hs | ||
TaggedPush.hs | ||
Tmp.hs | ||
Transfer.hs | ||
UpdateInstead.hs | ||
Url.hs | ||
UUID.hs | ||
VariantFile.hs | ||
VectorClock.hs | ||
Version.hs | ||
View.hs | ||
Wanted.hs | ||
WorkTree.hs | ||
YoutubeDl.hs |