git-subrepo
git-subrepo copied to clipboard
Published
20 hours ago •
ingydotnet
ingydotnet
Can't push subrepo after resolving merge conflict
trafficstars
I had merge conflict on one of my subrepos and I followed the suggested workflow to resolve the conflict. Afterwards, when I tried to execute:
# git subrepo push lib/external_repo
I received message:
git subrepo push lib/external_repo
git-subrepo: Command failed: 'git worktree add .git/tmp/subrepo/lib/external_repo subrepo/lib/external_repo'.
fatal: '.git/tmp/subrepo/lib/external_repo' already exists
It's not clear to me how I should clean up after I execute git subrepo commit lib/external_repo. Simply deleting .git/tmp/lib/external_repo doesn't work:
# rm -rf .git/tmp/
# git subrepo push lib/external_repo
git-subrepo: Command failed: 'git worktree add .git/tmp/subrepo/lib/external_repo subrepo/lib/external_repo'.
fatal: 'subrepo/lib/external_repo' is already checked out at '.git/tmp/subrepo/lib/external_repo'
@mklepaczewski I think that git subrepo clean lib/external_repo would work.
But apparently there is something missing in the information or logic to handle this case in a good way. Will look into it and see if I can make this workflow clearer.
@mklepaczewski before you clean, could you run git subrepo push -vd lib/external_repo? so that I get some information on why it fails.
(edit: updated formatting)
Note: In previous comments I replaced lib/docker_setup_scripts with lib/external_repo. Here I leave it as it was reported by git subrepo push -vd lib/docker_setup_scripts :
$ /home/matt/test(master)# git subrepo push -vd lib/docker_setup_scripts
>>> git rev-parse --verify HEAD
* Assert that working copy is clean: /home/matt/test
* Check for worktree with branch subrepo/lib/docker_setup_scripts
* Fetch the upstream: [email protected]:mklepaczewski/docker-setup-scripts.git (master).
>>> git fetch --no-tags --quiet [email protected]:mklepaczewski/docker-setup-scripts.git master
* Get the upstream subrepo HEAD commit.
>>> git rev-parse FETCH_HEAD^0
* Create ref 'refs/subrepo/lib/docker_setup_scripts/fetch'.
>>> git update-ref refs/subrepo/lib/docker_setup_scripts/fetch 745d89d11d95fb5742f9d4e5eccc1a07de26509e
* Check upstream head against .gitrepo commit.
* Deleting old 'subrepo/lib/docker_setup_scripts' branch.
* Remove worktree:
>>> git branch -D subrepo/lib/docker_setup_scripts
* Create subrepo branch 'subrepo/lib/docker_setup_scripts'.
* Check if the 'subrepo/lib/docker_setup_scripts' branch already exists.
* Subrepo parent: 7c39beb968b36c735b406ace87313e93d52a46e4
* Create new commits with parents into the subrepo fetch
>>> git rev-list --reverse --ancestry-path 7c39beb968b36c735b406ace87313e93d52a46e4..HEAD
* Working on 03113878e30b24adce3d4889e62cf7b20b8e4ed9
>>> git config --blob 03113878e30b24adce3d4889e62cf7b20b8e4ed9:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* Check for rebase
* Find parents
* Create a new commit -p 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
>>> git cat-file -e 03113878e30b24adce3d4889e62cf7b20b8e4ed9:lib/docker_setup_scripts
* Create with content
* Working on 0d05351996f47dbbe47505c77910d0ccd81e22fa
>>> git config --blob 0d05351996f47dbbe47505c77910d0ccd81e22fa:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 03113878e30b24adce3d4889e62cf7b20b8e4ed9
* Check for rebase
* Find parents
* Create a new commit -p 5021d0a58f5adc93c6d32f6af9b133cc48fe6ca6
>>> git cat-file -e 0d05351996f47dbbe47505c77910d0ccd81e22fa:lib/docker_setup_scripts
* Create with content
* Working on 5c1abbe642d91c3c423d094fdc028849d43f7ba8
>>> git config --blob 5c1abbe642d91c3c423d094fdc028849d43f7ba8:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 0d05351996f47dbbe47505c77910d0ccd81e22fa
* Check for rebase
* Find parents
* Create a new commit -p a6918bd63d206224160423daa82cf19ab571583d
>>> git cat-file -e 5c1abbe642d91c3c423d094fdc028849d43f7ba8:lib/docker_setup_scripts
* Create with content
* Working on 53ad79692006f9ec4f7c56af26b07af30aea0081
>>> git config --blob 53ad79692006f9ec4f7c56af26b07af30aea0081:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 5c1abbe642d91c3c423d094fdc028849d43f7ba8
* Check for rebase
* Find parents
* Create a new commit -p bffce79e4ed52cb881642059900ce5be2f698924
>>> git cat-file -e 53ad79692006f9ec4f7c56af26b07af30aea0081:lib/docker_setup_scripts
* Create with content
* Working on 7b2233fe64add3308ba6af2cfab872a51e7907bc
>>> git config --blob 7b2233fe64add3308ba6af2cfab872a51e7907bc:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 53ad79692006f9ec4f7c56af26b07af30aea0081
* Check for rebase
* Find parents
* Create a new commit -p 60160bc3c998d21742397918bd4a885d7d678c3e
>>> git cat-file -e 7b2233fe64add3308ba6af2cfab872a51e7907bc:lib/docker_setup_scripts
* Create with content
* Working on 389fc983bd7ffe973a55543b66ebad84d7228fe8
>>> git config --blob 389fc983bd7ffe973a55543b66ebad84d7228fe8:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 7b2233fe64add3308ba6af2cfab872a51e7907bc
* Check for rebase
* Find parents
* Create a new commit -p 5f0da976ed4a1422a7ec203ca89a6956fc4382aa
>>> git cat-file -e 389fc983bd7ffe973a55543b66ebad84d7228fe8:lib/docker_setup_scripts
* Create with content
* Working on 46a837c183b6cd27b72f2449e265dcdd9df70c3b
>>> git config --blob 46a837c183b6cd27b72f2449e265dcdd9df70c3b:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 389fc983bd7ffe973a55543b66ebad84d7228fe8
* Check for rebase
* Find parents
* Create a new commit -p 31536ced1a81ec0b020887cd89431363fa7957d6
>>> git cat-file -e 46a837c183b6cd27b72f2449e265dcdd9df70c3b:lib/docker_setup_scripts
* Create with content
* Working on 815f024da056160ef8256b4a802aea28016e9dfd
>>> git config --blob 815f024da056160ef8256b4a802aea28016e9dfd:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 46a837c183b6cd27b72f2449e265dcdd9df70c3b
* Check for rebase
* Find parents
* Create a new commit -p a1ff86ff6c19b5594654af92c8539d41931455b8
>>> git cat-file -e 815f024da056160ef8256b4a802aea28016e9dfd:lib/docker_setup_scripts
* Create with content
* Working on ed1604c1e8ef17d1b97dc557fcaa6019132ba73d
>>> git config --blob ed1604c1e8ef17d1b97dc557fcaa6019132ba73d:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 815f024da056160ef8256b4a802aea28016e9dfd
* Check for rebase
* Find parents
* Create a new commit -p a522038c33271445fdd66f8b61c02857f3c7bfa2
>>> git cat-file -e ed1604c1e8ef17d1b97dc557fcaa6019132ba73d:lib/docker_setup_scripts
* Create with content
* Working on a56a6ca5732be387cfd6427a7bf34d3003fc163e
>>> git config --blob a56a6ca5732be387cfd6427a7bf34d3003fc163e:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: ed1604c1e8ef17d1b97dc557fcaa6019132ba73d
* Check for rebase
* Find parents
* Create a new commit -p d7f58c455c5829c2f5e7413702604f6d46fdc849
>>> git cat-file -e a56a6ca5732be387cfd6427a7bf34d3003fc163e:lib/docker_setup_scripts
* Create with content
* Working on e47970002b5870c0446d12d07ddfbaa3b6af04b1
>>> git config --blob e47970002b5870c0446d12d07ddfbaa3b6af04b1:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: a56a6ca5732be387cfd6427a7bf34d3003fc163e
* Check for rebase
* Find parents
* Create a new commit -p 17515856cd3f0e1228ef975f2867ae67b8175860
>>> git cat-file -e e47970002b5870c0446d12d07ddfbaa3b6af04b1:lib/docker_setup_scripts
* Create with content
* Working on ec99993231dce96774338b0dba6ce7094513cc26
>>> git config --blob ec99993231dce96774338b0dba6ce7094513cc26:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: e47970002b5870c0446d12d07ddfbaa3b6af04b1
* Check for rebase
* Find parents
* Create a new commit -p 4bc44282b4eba9db7bd334577f265ba4975c2ecd
>>> git cat-file -e ec99993231dce96774338b0dba6ce7094513cc26:lib/docker_setup_scripts
* Create with content
* Working on ea9dd8ad1e01b33e79cdf4084d21257b1a3d4fe5
>>> git config --blob ea9dd8ad1e01b33e79cdf4084d21257b1a3d4fe5:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: ec99993231dce96774338b0dba6ce7094513cc26
* Check for rebase
* Find parents
* Create a new commit -p 63ec163d55c22b360aeefe56de389cc1ad34f9b7
>>> git cat-file -e ea9dd8ad1e01b33e79cdf4084d21257b1a3d4fe5:lib/docker_setup_scripts
* Create with content
* Working on f2603b81c859aa7ec5c039711628fc1cb7f38d12
>>> git config --blob f2603b81c859aa7ec5c039711628fc1cb7f38d12:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: ea9dd8ad1e01b33e79cdf4084d21257b1a3d4fe5
* Check for rebase
* Find parents
* Create a new commit -p 62e15f3a652f06f1c5ee37a38311ab3256fa34e8
>>> git cat-file -e f2603b81c859aa7ec5c039711628fc1cb7f38d12:lib/docker_setup_scripts
* Create with content
* Working on c315a13876ca2dc5fc068c25a89a43b26f686b06
>>> git config --blob c315a13876ca2dc5fc068c25a89a43b26f686b06:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: f2603b81c859aa7ec5c039711628fc1cb7f38d12
* Check for rebase
* Find parents
* Create a new commit -p ef975f08efdb1322106b71ea94f2107a5f317dad
>>> git cat-file -e c315a13876ca2dc5fc068c25a89a43b26f686b06:lib/docker_setup_scripts
* Create with content
* Working on bd745431f483919cc0c90fb2e066183c1ba85ca1
>>> git config --blob bd745431f483919cc0c90fb2e066183c1ba85ca1:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: c315a13876ca2dc5fc068c25a89a43b26f686b06
* Check for rebase
* Find parents
* Create a new commit -p 2aa792b6fcd94061191b4371d89d7c0a9cae0f1a
>>> git cat-file -e bd745431f483919cc0c90fb2e066183c1ba85ca1:lib/docker_setup_scripts
* Create with content
* Working on 9cd71ecf469bcaf38d988e45163a51a8a717dc38
>>> git config --blob 9cd71ecf469bcaf38d988e45163a51a8a717dc38:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: bd745431f483919cc0c90fb2e066183c1ba85ca1
* Check for rebase
* Find parents
* Create a new commit -p 3fbed85350a6a698b5203b40f0c54cd651ad684f
>>> git cat-file -e 9cd71ecf469bcaf38d988e45163a51a8a717dc38:lib/docker_setup_scripts
* Create with content
* Working on 6aee97fa25561f4b309b9fe080c666a504c84972
>>> git config --blob 6aee97fa25561f4b309b9fe080c666a504c84972:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 9cd71ecf469bcaf38d988e45163a51a8a717dc38
* Check for rebase
* Find parents
* Create a new commit -p 7cfa391f83ad7d23e10c8583f4d75df5d624d01e
>>> git cat-file -e 6aee97fa25561f4b309b9fe080c666a504c84972:lib/docker_setup_scripts
* Create with content
* Working on 47cfc744389014feb695566841e72ef7281e9a37
>>> git config --blob 47cfc744389014feb695566841e72ef7281e9a37:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 6aee97fa25561f4b309b9fe080c666a504c84972
* Check for rebase
* Find parents
* Create a new commit -p 60956847b64c4f5bb5ed1ee178979c3d3ae2b78c
>>> git cat-file -e 47cfc744389014feb695566841e72ef7281e9a37:lib/docker_setup_scripts
* Create with content
* Working on 4a620179d0860043152c4bb768b4daafad2c2f4e
>>> git config --blob 4a620179d0860043152c4bb768b4daafad2c2f4e:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 47cfc744389014feb695566841e72ef7281e9a37
* Check for rebase
* Find parents
* Create a new commit -p b1c5eaf9955bac5c3da70fb43ae6f024cf184955
>>> git cat-file -e 4a620179d0860043152c4bb768b4daafad2c2f4e:lib/docker_setup_scripts
* Create with content
* Working on c5808d4adde525d894a8dc21eac6c6fa6a358a63
>>> git config --blob c5808d4adde525d894a8dc21eac6c6fa6a358a63:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 4a620179d0860043152c4bb768b4daafad2c2f4e
* Check for rebase
* Find parents
* Create a new commit -p 4437a79ef3a040bbcef9945a250d737e52263d80
>>> git cat-file -e c5808d4adde525d894a8dc21eac6c6fa6a358a63:lib/docker_setup_scripts
* Create with content
* Working on fb3503ef8ad495d84bb81123dfd18c8dd28f3252
>>> git config --blob fb3503ef8ad495d84bb81123dfd18c8dd28f3252:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: c5808d4adde525d894a8dc21eac6c6fa6a358a63
* Check for rebase
* Find parents
* Create a new commit -p 69a9dc1c7e5476aeb80d9af291f6bb5fa1ef9598
>>> git cat-file -e fb3503ef8ad495d84bb81123dfd18c8dd28f3252:lib/docker_setup_scripts
* Create with content
* Working on 936b6a469db08b081dc3904e8f8dba04e70e4394
>>> git config --blob 936b6a469db08b081dc3904e8f8dba04e70e4394:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: fb3503ef8ad495d84bb81123dfd18c8dd28f3252
* Check for rebase
* Find parents
* Create a new commit -p e8f4cd463054de4ef52e2d0bcf62ec01797ba3ad
>>> git cat-file -e 936b6a469db08b081dc3904e8f8dba04e70e4394:lib/docker_setup_scripts
* Create with content
* Working on e641a3fca564786f173c3f04b7ec3a1a3c9b981a
>>> git config --blob e641a3fca564786f173c3f04b7ec3a1a3c9b981a:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 936b6a469db08b081dc3904e8f8dba04e70e4394
* Check for rebase
* Find parents
* Create a new commit -p 28e98218f7b18d7ca20cafc2a7f31e26424c8329
>>> git cat-file -e e641a3fca564786f173c3f04b7ec3a1a3c9b981a:lib/docker_setup_scripts
* Create with content
* Working on 0b10be1f40266a35f7d6e3ba86ea81dd47a32fd9
>>> git config --blob 0b10be1f40266a35f7d6e3ba86ea81dd47a32fd9:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: e641a3fca564786f173c3f04b7ec3a1a3c9b981a
* Check for rebase
* Find parents
* Create a new commit -p da6b2c0be04ad3d62d0ce60ddcb78c461ca2dd7a
>>> git cat-file -e 0b10be1f40266a35f7d6e3ba86ea81dd47a32fd9:lib/docker_setup_scripts
* Create with content
* Working on 79a40904b124108d087906cf21936d3e1b6f18b5
>>> git config --blob 79a40904b124108d087906cf21936d3e1b6f18b5:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 0b10be1f40266a35f7d6e3ba86ea81dd47a32fd9
* Check for rebase
* Find parents
* Create a new commit -p 6dd768a54b6f629c5b5d87fc61af0e012d895e96
>>> git cat-file -e 79a40904b124108d087906cf21936d3e1b6f18b5:lib/docker_setup_scripts
* Create with content
* Working on b602aec45b3801b2675a54390e829543e904adfc
>>> git config --blob b602aec45b3801b2675a54390e829543e904adfc:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 79a40904b124108d087906cf21936d3e1b6f18b5
* Check for rebase
* Find parents
* Create a new commit -p 34c7554e0c9cac2baab064657e0819b6714f5c11
>>> git cat-file -e b602aec45b3801b2675a54390e829543e904adfc:lib/docker_setup_scripts
* Create with content
* Working on 8187a146ef6c80c443020ac68f12f3f8f2c94136
>>> git config --blob 8187a146ef6c80c443020ac68f12f3f8f2c94136:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: b602aec45b3801b2675a54390e829543e904adfc
* Check for rebase
* Find parents
* Create a new commit -p 021c822bd7287ff8658246d39e8eaa7d08bae3ad
>>> git cat-file -e 8187a146ef6c80c443020ac68f12f3f8f2c94136:lib/docker_setup_scripts
* Create with content
* Working on 6459860fc4c9f7e7badf65a295fc4208bf677c1c
>>> git config --blob 6459860fc4c9f7e7badf65a295fc4208bf677c1c:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 8187a146ef6c80c443020ac68f12f3f8f2c94136
* Check for rebase
* Find parents
* Create a new commit -p 19f5981345e465e4df9e02806c5fe05efee43093
>>> git cat-file -e 6459860fc4c9f7e7badf65a295fc4208bf677c1c:lib/docker_setup_scripts
* Create with content
* Working on 5802935e6df79d8f065d19093b10109ee7bbab6c
>>> git config --blob 5802935e6df79d8f065d19093b10109ee7bbab6c:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 6459860fc4c9f7e7badf65a295fc4208bf677c1c
* Check for rebase
* Find parents
* Create a new commit -p ed1b6faed4b8a874d7f03a8eadbe7999bcdfb848
>>> git cat-file -e 5802935e6df79d8f065d19093b10109ee7bbab6c:lib/docker_setup_scripts
* Create with content
* Working on 813f4aba9d668c16038afe0253cc60bf31f26b49
>>> git config --blob 813f4aba9d668c16038afe0253cc60bf31f26b49:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 5802935e6df79d8f065d19093b10109ee7bbab6c
* Check for rebase
* Find parents
* Create a new commit -p d8213429ac93fc55cc06c438fc36ecd4af0b099d
>>> git cat-file -e 813f4aba9d668c16038afe0253cc60bf31f26b49:lib/docker_setup_scripts
* Create with content
* Working on bc85d5f58302a0268bb3e87c35682527cd53fd0c
>>> git config --blob bc85d5f58302a0268bb3e87c35682527cd53fd0c:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 813f4aba9d668c16038afe0253cc60bf31f26b49
* Check for rebase
* Find parents
* Create a new commit -p 34698fcb662b05639c007dc5494549b93f934e08
>>> git cat-file -e bc85d5f58302a0268bb3e87c35682527cd53fd0c:lib/docker_setup_scripts
* Create with content
* Working on e3fe52ea1dd308d28c6d41284dec95309489693d
>>> git config --blob e3fe52ea1dd308d28c6d41284dec95309489693d:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child:
* Ignore e3fe52ea1dd308d28c6d41284dec95309489693d, it's not in the selected path
* Working on e0cd4ee2896b0c392c20e98eb892b208a753b03d
>>> git config --blob e0cd4ee2896b0c392c20e98eb892b208a753b03d:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child:
* Ignore e0cd4ee2896b0c392c20e98eb892b208a753b03d, it's not in the selected path
* Working on 6b140ba53ffeb05c86b776d59009a111d9747519
>>> git config --blob 6b140ba53ffeb05c86b776d59009a111d9747519:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child:
* Ignore 6b140ba53ffeb05c86b776d59009a111d9747519, it's not in the selected path
* Working on cd234a55b98fa5ce032ded0b1d4e86f6dc14998c
>>> git config --blob cd234a55b98fa5ce032ded0b1d4e86f6dc14998c:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: bc85d5f58302a0268bb3e87c35682527cd53fd0c 6b140ba53ffeb05c86b776d59009a111d9747519
* Check for rebase
* Find parents
* Create a new commit -p 7d5d45225104186de6fe7311642c1ab1a889fc99
>>> git cat-file -e cd234a55b98fa5ce032ded0b1d4e86f6dc14998c:lib/docker_setup_scripts
* Create with content
* Working on a44053813a03697d07011f1f25017a638221c366
>>> git config --blob a44053813a03697d07011f1f25017a638221c366:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: cd234a55b98fa5ce032ded0b1d4e86f6dc14998c
* Check for rebase
* Find parents
* Create a new commit -p e714ff27c185210f9fe0e22ba09eea98c55cee0d
>>> git cat-file -e a44053813a03697d07011f1f25017a638221c366:lib/docker_setup_scripts
* Create with content
* Working on 0f053091c9a02dcd233a34dcf84667fcb6f3454f
>>> git config --blob 0f053091c9a02dcd233a34dcf84667fcb6f3454f:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: a44053813a03697d07011f1f25017a638221c366
* Check for rebase
* Find parents
* Create a new commit -p d4ce8bdbd40254b70f1d58db450017e4cc963f7c
>>> git cat-file -e 0f053091c9a02dcd233a34dcf84667fcb6f3454f:lib/docker_setup_scripts
* Create with content
* Working on 05e38eb3eb63e6dd4e4e55d33ad4e00c25667b7d
>>> git config --blob 05e38eb3eb63e6dd4e4e55d33ad4e00c25667b7d:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 0f053091c9a02dcd233a34dcf84667fcb6f3454f
* Check for rebase
* Find parents
* Create a new commit -p 12d9d5ff61dd9f4c06949e876cc0ae1c0d771afa
>>> git cat-file -e 05e38eb3eb63e6dd4e4e55d33ad4e00c25667b7d:lib/docker_setup_scripts
* Create with content
* Working on cb56ee062da5d37b4245ad2d148e56d2423e7f42
>>> git config --blob cb56ee062da5d37b4245ad2d148e56d2423e7f42:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 05e38eb3eb63e6dd4e4e55d33ad4e00c25667b7d
* Check for rebase
* Find parents
* Create a new commit -p ef9fa63744254d6e1fb0fa76217651f7933e3dac
>>> git cat-file -e cb56ee062da5d37b4245ad2d148e56d2423e7f42:lib/docker_setup_scripts
* Create with content
* Working on 70feec2e1466d71e4afaf1e6b60352be7b0eed97
>>> git config --blob 70feec2e1466d71e4afaf1e6b60352be7b0eed97:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: cb56ee062da5d37b4245ad2d148e56d2423e7f42
* Check for rebase
* Find parents
* Create a new commit -p 77070b657ca4c2484fdfd1c2ba0eb9aa1c4c24d2
>>> git cat-file -e 70feec2e1466d71e4afaf1e6b60352be7b0eed97:lib/docker_setup_scripts
* Create with content
* Working on e31d1f49c1b01c4b128cb5fb71711319c332dadd
>>> git config --blob e31d1f49c1b01c4b128cb5fb71711319c332dadd:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 70feec2e1466d71e4afaf1e6b60352be7b0eed97
* Check for rebase
* Find parents
* Create a new commit -p a2c753c286d9e00461cf6d30ceaf2363bbc76407
>>> git cat-file -e e31d1f49c1b01c4b128cb5fb71711319c332dadd:lib/docker_setup_scripts
* Create with content
* Working on 5f73391df3ae74cb14c45b0947c235eda0f5ce4f
>>> git config --blob 5f73391df3ae74cb14c45b0947c235eda0f5ce4f:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: e31d1f49c1b01c4b128cb5fb71711319c332dadd
* Check for rebase
* Find parents
* Create a new commit -p 17f9532232c61959ff6c8efc50ab073f7e69442d
>>> git cat-file -e 5f73391df3ae74cb14c45b0947c235eda0f5ce4f:lib/docker_setup_scripts
* Create with content
* Working on 55bf7e20dc3d49d7d5fc3feab98ff36daa2d4c5b
>>> git config --blob 55bf7e20dc3d49d7d5fc3feab98ff36daa2d4c5b:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 5f73391df3ae74cb14c45b0947c235eda0f5ce4f
* Check for rebase
* Find parents
* Create a new commit -p 3f227a57c5d783a8764700d809ca44b2cb4aeb1b
>>> git cat-file -e 55bf7e20dc3d49d7d5fc3feab98ff36daa2d4c5b:lib/docker_setup_scripts
* Create with content
* Working on 73f6e1602ee794829ff3f4c1f1cae00e0d8dc9b4
>>> git config --blob 73f6e1602ee794829ff3f4c1f1cae00e0d8dc9b4:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 55bf7e20dc3d49d7d5fc3feab98ff36daa2d4c5b
* Check for rebase
* Find parents
* Create a new commit -p 75eac81d9e899e79c954ef5ed25d673261bfd7b0
>>> git cat-file -e 73f6e1602ee794829ff3f4c1f1cae00e0d8dc9b4:lib/docker_setup_scripts
* Create with content
* Working on 17f2a02d3a1ba87aba9f297be8c5a113f757e5f4
>>> git config --blob 17f2a02d3a1ba87aba9f297be8c5a113f757e5f4:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child:
* Ignore 17f2a02d3a1ba87aba9f297be8c5a113f757e5f4, it's not in the selected path
* Working on 5bfa421fe67bd7971b76e44d11abbec24e4fb14f
>>> git config --blob 5bfa421fe67bd7971b76e44d11abbec24e4fb14f:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child:
* Ignore 5bfa421fe67bd7971b76e44d11abbec24e4fb14f, it's not in the selected path
* Working on e964d535992981edfc545d54ce73820b4de8137f
>>> git config --blob e964d535992981edfc545d54ce73820b4de8137f:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child:
* Ignore e964d535992981edfc545d54ce73820b4de8137f, it's not in the selected path
* Working on 95c41b61246adbc962b83ec6612c1bbfe3741242
>>> git config --blob 95c41b61246adbc962b83ec6612c1bbfe3741242:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child:
* Ignore 95c41b61246adbc962b83ec6612c1bbfe3741242, it's not in the selected path
* Working on eabb10a3f1c5e264a9749f306b8034c2e671c791
>>> git config --blob eabb10a3f1c5e264a9749f306b8034c2e671c791:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child:
* Ignore eabb10a3f1c5e264a9749f306b8034c2e671c791, it's not in the selected path
* Working on fc6cba719d656831733b0e6d3696c0b0a5db98c1
>>> git config --blob fc6cba719d656831733b0e6d3696c0b0a5db98c1:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: eabb10a3f1c5e264a9749f306b8034c2e671c791 73f6e1602ee794829ff3f4c1f1cae00e0d8dc9b4
* Check for rebase
* Find parents
* Create a new commit -p 5f4e57116184ab87054e119f37d5a7d8f0a2edf8
>>> git cat-file -e fc6cba719d656831733b0e6d3696c0b0a5db98c1:lib/docker_setup_scripts
* Create with content
* Working on 09b7b141c47df167b72aac116a512db0e4d034c0
>>> git config --blob 09b7b141c47df167b72aac116a512db0e4d034c0:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: fc6cba719d656831733b0e6d3696c0b0a5db98c1
* Check for rebase
* Find parents
* Create a new commit -p 4f46aacaecc9fdb4d11464e3694254014d07f5aa
>>> git cat-file -e 09b7b141c47df167b72aac116a512db0e4d034c0:lib/docker_setup_scripts
* Create with content
* Working on e1dc9b02a6ea0c1ce25f72ca5bf20c02cc59c097
>>> git config --blob e1dc9b02a6ea0c1ce25f72ca5bf20c02cc59c097:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 09b7b141c47df167b72aac116a512db0e4d034c0
* Check for rebase
* Find parents
* Create a new commit -p affb4ae83198d7e7497a827919ba42ed42d57029
>>> git cat-file -e e1dc9b02a6ea0c1ce25f72ca5bf20c02cc59c097:lib/docker_setup_scripts
* Create with content
* Working on 398221db6a19fa34e5397adeac33f23ef7d2dd83
>>> git config --blob 398221db6a19fa34e5397adeac33f23ef7d2dd83:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: e1dc9b02a6ea0c1ce25f72ca5bf20c02cc59c097
* Check for rebase
* Find parents
* Create a new commit -p 3fa27f58d6a9aab7d41d4fc8a1b17d08b56c8dfc
>>> git cat-file -e 398221db6a19fa34e5397adeac33f23ef7d2dd83:lib/docker_setup_scripts
* Create with content
* Working on f04ef3ba8400a0589a146faa2f44bc506f44b66c
>>> git config --blob f04ef3ba8400a0589a146faa2f44bc506f44b66c:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 398221db6a19fa34e5397adeac33f23ef7d2dd83
* Check for rebase
* Find parents
* Create a new commit -p ca7024391e58e9f4a173b18bd81bd472a7a52296
>>> git cat-file -e f04ef3ba8400a0589a146faa2f44bc506f44b66c:lib/docker_setup_scripts
* Create with content
* Working on d2c7cc4af6f2ad5305f6061fcd4a0e8d827759e5
>>> git config --blob d2c7cc4af6f2ad5305f6061fcd4a0e8d827759e5:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: f04ef3ba8400a0589a146faa2f44bc506f44b66c
* Check for rebase
* Find parents
* Create a new commit -p 9c0e2de7cbf8b1f7494e8227d16873bbce5435fb
>>> git cat-file -e d2c7cc4af6f2ad5305f6061fcd4a0e8d827759e5:lib/docker_setup_scripts
* Create with content
* Working on 74fab4628538191e7559f2e7a76413a490d43580
>>> git config --blob 74fab4628538191e7559f2e7a76413a490d43580:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: d2c7cc4af6f2ad5305f6061fcd4a0e8d827759e5
* Check for rebase
* Find parents
* Create a new commit -p e6521e748670e5ae709470943fb1f090a8c11cde
>>> git cat-file -e 74fab4628538191e7559f2e7a76413a490d43580:lib/docker_setup_scripts
* Create with content
* Working on bf9c6ce0ebc62f4d5518ceeea7ed54ef9d49a2cc
>>> git config --blob bf9c6ce0ebc62f4d5518ceeea7ed54ef9d49a2cc:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: 74fab4628538191e7559f2e7a76413a490d43580
* Check for rebase
* Find parents
* Create a new commit -p 30f56161cba8f00204e178b73101d78929bc0660
>>> git cat-file -e bf9c6ce0ebc62f4d5518ceeea7ed54ef9d49a2cc:lib/docker_setup_scripts
* Create with content
* Working on c6fc90cdc7ada3d25cb6bd26c03fb66f2038dfac
>>> git config --blob c6fc90cdc7ada3d25cb6bd26c03fb66f2038dfac:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: bf9c6ce0ebc62f4d5518ceeea7ed54ef9d49a2cc
* Check for rebase
* Find parents
* Create a new commit -p 71f951c68bbd6e05e02b9d74617f6f9d6460b5f5
>>> git cat-file -e c6fc90cdc7ada3d25cb6bd26c03fb66f2038dfac:lib/docker_setup_scripts
* Create with content
* Working on 2b41ba15ea89752b4a52581a56d5dab157066cef
>>> git config --blob 2b41ba15ea89752b4a52581a56d5dab157066cef:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 6fc8fbe8762ec05483720919dd7afcba76c7f5ca
* is child: c6fc90cdc7ada3d25cb6bd26c03fb66f2038dfac
* Check for rebase
* Find parents
* Create a new commit -p 408672b1fd6f3401c286a98ed012999a74c6f516
>>> git cat-file -e 2b41ba15ea89752b4a52581a56d5dab157066cef:lib/docker_setup_scripts
* Create with content
* Working on 7e03275de7c663663e64b7eb648248000b6455c7
>>> git config --blob 7e03275de7c663663e64b7eb648248000b6455c7:lib/docker_setup_scripts/.gitrepo subrepo.commit
* .gitrepo reference commit: 745d89d11d95fb5742f9d4e5eccc1a07de26509e
* is child: 2b41ba15ea89752b4a52581a56d5dab157066cef
* Check for rebase
* Find parents
* Create a new commit -p 989a5a13eaa7043f72d6096e2ef818f20e99f0fb -p 745d89d11d95fb5742f9d4e5eccc1a07de26509e
>>> git cat-file -e 7e03275de7c663663e64b7eb648248000b6455c7:lib/docker_setup_scripts
* Create with content
* Create branch 'subrepo/lib/docker_setup_scripts' for this new commit set 4ea68a881eb64167aeff169b4ab7876837930281.
>>> git branch subrepo/lib/docker_setup_scripts 4ea68a881eb64167aeff169b4ab7876837930281
* Remove the .gitrepo file from 6fc8fbe8762ec05483720919dd7afcba76c7f5ca..subrepo/lib/docker_setup_scripts
>>> git filter-branch -f --prune-empty --tree-filter rm -f .gitrepo 6fc8fbe8762ec05483720919dd7afcba76c7f5ca..subrepo/lib/docker_setup_scripts
>>> git worktree add .git/tmp/subrepo/lib/docker_setup_scripts subrepo/lib/docker_setup_scripts
git-subrepo: Command failed: 'git worktree add .git/tmp/subrepo/lib/docker_setup_scripts subrepo/lib/docker_setup_scripts'.
fatal: '.git/tmp/subrepo/lib/docker_setup_scripts' already exists
Forgot to mention: git subrepo lean lib/docker_setup_scripts did the trick - thank you!
I'm fine with doing the extra step, but I feel it should be included in the list of steps to follow when merge conflict is reported.
There seems to be a previous worktree present that prevents the push. I need to see if that should be automatically removed in the push.