-
Notifications
You must be signed in to change notification settings - Fork 5
Do not use .umap for files in this repo
Xymanek edited this page May 21, 2021
·
1 revision
For projects that use git LFS for their assets, having a .umap
file here will produce the following when doing git subtree add
:
PS D:\Dev\Projects\XCom 2 WOTC\CovertInfiltration> git subtree add --prefix .scripts/X2ModBuildCommon https://github.com/X2CommunityCore/X2ModBuildCommon main --squash
git fetch https://github.com/X2CommunityCore/X2ModBuildCommon main
remote: Enumerating objects: 136, done.
remote: Counting objects: 100% (136/136), done.
remote: Compressing objects: 100% (85/85), done.
Receiving objects: 76% (104/136)136 (delta 83), reused 101 (delta 51), pack-reused 0
Receiving objects: 100% (136/136), 148.90 KiB | 447.00 KiB/s, done.
Resolving deltas: 100% (83/83), done.
From https://github.com/X2CommunityCore/X2ModBuildCommon
* branch main -> FETCH_HEAD
Encountered 1 file(s) that should have been pointers, but weren't:
.scripts/X2ModBuildCommon/EmptyMap.umap
Unstaged changes after reset:
M .scripts/X2ModBuildCommon/EmptyMap.umap
Added dir '.scripts/X2ModBuildCommon'
PS D:\Dev\Projects\XCom 2 WOTC\CovertInfiltration> git log -2
commit ffbd3085b6f7aaafedcc891bb892b38679613a85 (HEAD -> cooker-experiments-b3)
Merge: b6ce587 139c258
Author: Xymanek <[email protected]>
Date: Fri May 21 10:07:51 2021 +0300
Merge commit '139c2585a7305ecdd1f01a62e486750b9049c302' as '.scripts/X2ModBuildCommon'
commit 139c2585a7305ecdd1f01a62e486750b9049c302
Author: Xymanek <[email protected]>
Date: Fri May 21 10:07:51 2021 +0300
Squashed '.scripts/X2ModBuildCommon/' content from commit 81ab7a4
git-subtree-dir: .scripts/X2ModBuildCommon
git-subtree-split: 81ab7a45821909902aa0cadea8fc345b26bdcaac
PS D:\Dev\Projects\XCom 2 WOTC\CovertInfiltration> git status
On branch cooker-experiments-b3
Your branch is ahead of 'origin/cooker-experiments-b3' by 3 commits.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: .scripts/X2ModBuildCommon/EmptyMap.umap
Notice the EmptyMap.umap
lines.
I didn't test, but I assume git LFS would keep getting confused when doing updates and similar