Closed n3dst4 closed 1 month ago
Here's the result of git subrepo push -v packages/shared-fvt-bits
:
* Assert that working copy is clean: /home/ndc/projects/investigator-fvtt
* Check for worktree with branch subrepo/packages/shared-fvtt-bits
* Fetch the upstream: git@github.com:n3dst4/shared-fvtt-bits.git (main).
* Get the upstream subrepo HEAD commit.
* Create ref 'refs/subrepo/packages/shared-fvtt-bits/fetch'.
* Check upstream head against .gitrepo commit.
* Deleting old 'subrepo/packages/shared-fvtt-bits' branch.
* Remove worktree: .git/tmp/subrepo/packages/shared-fvtt-bits
* Create subrepo branch 'subrepo/packages/shared-fvtt-bits'.
* Check if the 'subrepo/packages/shared-fvtt-bits' branch already exists.
* Subrepo parent: 2a49ef8d9fd8579b7cce16a1be14f1afd6c2de40
* Create new commits with parents into the subrepo fetch
* Working on 01889d16585533ab74986bf3afe098be30b12ea3
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* Check for rebase
* Find parents
* Create a new commit -p 43d18ad678dabb14a191de24b885e16ba3e730aa
* Create with content
* Working on 13abaa7c54d79ad67d8ec2c7b2817aaaa49824af
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 01889d16585533ab74986bf3afe098be30b12ea3
* Check for rebase
* Find parents
* Create a new commit -p fe82fac35cb1cfc131d6ae557d8f797be989ad51
* Create with content
* Working on b3d1daaef7200bfb3a117e70c4d5a5a3c898aa58
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 13abaa7c54d79ad67d8ec2c7b2817aaaa49824af
* Check for rebase
* Find parents
* Create a new commit -p 4b91bf15899314a074540fb17744796541ec5a37
* Create with content
* Working on c37313fd146e48f655ba671ea57b290dbeee1cf7
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 13abaa7c54d79ad67d8ec2c7b2817aaaa49824af b3d1daaef7200bfb3a117e70c4d5a5a3c898aa58
* Check for rebase
* Find parents
* Create a new commit -p 00678344cc02124ea9902c5483810c5868bbb788
* Create with content
* Working on bad8bb27de54a82090441822b05dfaf9e0f9b477
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child:
* Ignore bad8bb27de54a82090441822b05dfaf9e0f9b477, it's not in the selected path
* Working on 4f6ff3866a614d32638d4ea5849b972054d2354b
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: c37313fd146e48f655ba671ea57b290dbeee1cf7 bad8bb27de54a82090441822b05dfaf9e0f9b477
* Check for rebase
* Find parents
* Create a new commit -p d585aad4f0fa0f8590cef773810e58c3d4dbd776
* Create with content
* Working on 3a2db9da3bb191daa2a9aa63b932de6dbabd7a58
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 4f6ff3866a614d32638d4ea5849b972054d2354b
* Check for rebase
* Find parents
* Create a new commit -p 021595d27dbb92c69fc09d80441f91a57495e7a3
* Create with content
* Working on 05c1567cff62aa00ee9b48c29d5787627a9f0e05
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 3a2db9da3bb191daa2a9aa63b932de6dbabd7a58
* Check for rebase
* Find parents
* Create a new commit -p deb84ad39ec2881c663fd2aa35c7b047858531a2
* Create with content
* Working on 2ce0b24940ad10188ce49d189244ae1340a7c9f4
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 05c1567cff62aa00ee9b48c29d5787627a9f0e05
* Check for rebase
* Find parents
* Create a new commit -p 6a418fd1efb982746d3f3276c0dbeca5f158bb25
* Create with content
* Working on 20fa8ab06e7f098e42154732c720832819e5b9c1
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 2ce0b24940ad10188ce49d189244ae1340a7c9f4
* Check for rebase
* Find parents
* Create a new commit -p 24c8ccc7f299647f16904f29df02cd0aa14275c3
* Create with content
* Working on e26e4d84adf94847fb580d69ba0cae52e963e60f
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 20fa8ab06e7f098e42154732c720832819e5b9c1
* Check for rebase
* Find parents
* Create a new commit -p d7571eebbad2b57331d0989e575920723100440e
* Create with content
* Working on 3007947833ac4b35be7ab810f67800f923702e28
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: e26e4d84adf94847fb580d69ba0cae52e963e60f
* Check for rebase
* Find parents
* Create a new commit -p 0101e9af369f6627c7b8971f56f98f23613ee568
* Create with content
* Working on fbd4d2c15302efd69ffb04f13e82a6b4a33529a6
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 3007947833ac4b35be7ab810f67800f923702e28
* Check for rebase
* Find parents
* Create a new commit -p 1affdb5cb52136f7ba8a3104198dd319ef3dc154
* Create with content
* Working on 094d4e1f81145fbb9f5095a0e4a30657f3b3c14f
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: fbd4d2c15302efd69ffb04f13e82a6b4a33529a6
* Check for rebase
* Find parents
* Create a new commit -p f6df15ea228d221d096c3833e67c7541e91d5045
* Create with content
* Working on 36424489ad8070db3e7af157fb61f904e4c23963
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 094d4e1f81145fbb9f5095a0e4a30657f3b3c14f
* Check for rebase
* Find parents
* Create a new commit -p 1e763525cb105b25440b40befe46e502a3b154bb
* Create with content
* Working on 6eb31365c89f8f2d34b7eeffbd0303d671f7c303
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 36424489ad8070db3e7af157fb61f904e4c23963
* Check for rebase
* Find parents
* Create a new commit -p 43ae7222b681e731cdc899cf856ec20ed252c4b9
* Create with content
* Working on 662421e028423160f5c19a532e21a5f102efbd45
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 6eb31365c89f8f2d34b7eeffbd0303d671f7c303
* Check for rebase
* Find parents
* Create a new commit -p 679766c67ea597ecfdab70ce6fbe5707582e0792
* Create with content
* Working on b6ed22c948f72850bf0b6c1963ce1607cbd77266
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 662421e028423160f5c19a532e21a5f102efbd45
* Check for rebase
* Find parents
* Create a new commit -p db2c4136476a44b09936b0ebe6179647087fcad5
* Create with content
* Working on f1d9ff9fdb4fbd4ebdd8d06fd09ccb7ca3d54b25
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: b6ed22c948f72850bf0b6c1963ce1607cbd77266
* Check for rebase
* Find parents
* Create a new commit -p 8d82eea507afda89219e5b0e8151810fa77d00e8
* Create with content
* Working on 9eda2ee09dfbaeb745946d64db341a06eadb849d
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: f1d9ff9fdb4fbd4ebdd8d06fd09ccb7ca3d54b25
* Check for rebase
* Find parents
* Create a new commit -p 68b327ebc9a9e72d5f36c460f60e43043fcf20f5
* Create with content
* Working on 64034e4caead643aafae2c3f47540398c9a28a95
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 9eda2ee09dfbaeb745946d64db341a06eadb849d
* Check for rebase
* Find parents
* Create a new commit -p 043ccaf32c8a72099a13dbafe38772d1e6e603af
* Create with content
* Working on f2838a811b36344cf8d99599d2a4c97447b8df9c
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 64034e4caead643aafae2c3f47540398c9a28a95
* Check for rebase
* Find parents
* Create a new commit -p 7d585ff0879a18b1f7272a45e66799184caceaef
* Create with content
* Working on d28f4050bd307961607454d7515b84d63dcf161e
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: f2838a811b36344cf8d99599d2a4c97447b8df9c
* Check for rebase
* Find parents
* Create a new commit -p 99df96fc6f91302178a44844245946cca5bf42a0
* Create with content
* Working on 331b610c88a2ff53ee173855c7e75d1878bec25a
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: d28f4050bd307961607454d7515b84d63dcf161e
* Check for rebase
* Find parents
* Create a new commit -p 79a3d854720901c4b199c653d93c17d66e6fbffe
* Create with content
* Working on 8699e52c8a90ceee82a167999db8290a5aa0e0dd
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 331b610c88a2ff53ee173855c7e75d1878bec25a
* Check for rebase
* Find parents
* Create a new commit -p b7ac17c03706d21d7f42e0ae06272bfefc4f67db
* Create with content
* Working on 0b4cc61c8eb1d5e1318a414eb3fbe315aa788ccb
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 8699e52c8a90ceee82a167999db8290a5aa0e0dd
* Check for rebase
* Find parents
* Create a new commit -p 3661dc64fc967f4391c73057a3514e15a53755a0
* Create with content
* Working on b8100022532ed966d31878d256f63a5d1c4d4447
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 0b4cc61c8eb1d5e1318a414eb3fbe315aa788ccb
* Check for rebase
* Find parents
* Create a new commit -p 110646f226e1ad85aeb6734065b8b79181ba318c
* Create with content
* Working on f301d36fd4de641da447b99cde12f88cfa981089
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: b8100022532ed966d31878d256f63a5d1c4d4447
* Check for rebase
* Find parents
* Create a new commit -p b5e446505703e4e14bf15ec1d6730fc12e810a76
* Create with content
* Working on 71a132472eebdc85e500988e0ca21ef75fc6dfe5
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: f301d36fd4de641da447b99cde12f88cfa981089
* Check for rebase
* Find parents
* Create a new commit -p b42501c87e7823240882e7579a2ac0c7b9c5e87f
* Create with content
* Working on e883dff1a70b78021232d77567847ab989edb0a7
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 71a132472eebdc85e500988e0ca21ef75fc6dfe5
* Check for rebase
* Find parents
* Create a new commit -p 91d0410c9a1074fedc7f8038efe4991c0ffcae0b
* Create with content
* Working on 54861103cf7b4ef412450f95212c55dbc96e25b8
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: e883dff1a70b78021232d77567847ab989edb0a7
* Check for rebase
* Find parents
* Create a new commit -p d51a61d9f282e18101666fa617fb9e8915a253a3
* Create with content
* Working on c88ffa7e56ccd519646ccab535c5d286a253346a
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 54861103cf7b4ef412450f95212c55dbc96e25b8
* Check for rebase
* Find parents
* Create a new commit -p 194bd28802767508950e11b30eb62eec9506f561
* Create with content
* Working on 86f8c669bb0921c9f2c0fc9846b62f981931cee3
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: c88ffa7e56ccd519646ccab535c5d286a253346a
* Check for rebase
* Find parents
* Create a new commit -p 5461284a70eb69b22954d9da74194e78ed9ca6d7
* Create with content
* Working on dfbe08e6cb0a238ea28e26f7d1b9414e90d3119a
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 86f8c669bb0921c9f2c0fc9846b62f981931cee3
* Check for rebase
* Find parents
* Create a new commit -p 18560ce66dbaa11f25d8255e675d8f2cf3f829d6
* Create with content
* Working on f0cbd92d15fd4be3760d55013117fd9a2f9d1a46
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: dfbe08e6cb0a238ea28e26f7d1b9414e90d3119a
* Check for rebase
* Find parents
* Create a new commit -p b25db65b3d7042a17675a1ad2a6f03beb6e0cb58
* Create with content
* Working on 7a7d6a40f1d13340789be215dc3b2457e7b365a5
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: f0cbd92d15fd4be3760d55013117fd9a2f9d1a46
* Check for rebase
* Find parents
* Create a new commit -p 5f5b9636f86e6abb327316c49b037caaeec77a3a
* Create with content
* Working on e04b5b0ff99c6404655221c93a831a8ebd5e8e7a
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 7a7d6a40f1d13340789be215dc3b2457e7b365a5
* Check for rebase
* Find parents
* Create a new commit -p 9c487cdcf08a09e0db38cad4e87bc20cf8d41cb9
* Create with content
* Working on 703009182f5079fd94e6374c3cf280a125e06196
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: e04b5b0ff99c6404655221c93a831a8ebd5e8e7a
* Check for rebase
* Find parents
* Create a new commit -p 854d36cb307114adc6b624fa7c6cab3eb06e7fe1
* Create with content
* Working on f7bfab5f584a3b410143749972598f5645203740
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 703009182f5079fd94e6374c3cf280a125e06196
* Check for rebase
* Find parents
* Create a new commit -p 7f0a77a24488472891cfcbc1c2fcae29626ba1a6
* Create with content
* Working on e7d5b75e13fa5a5f31d86f41f2b4010cc9c4960e
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: f7bfab5f584a3b410143749972598f5645203740
* Check for rebase
* Find parents
* Create a new commit -p af8afdebb267698d1f5bced8a7a0dcae82c06f33
* Create with content
* Working on f4514e639b88ffbd2d2d6d6f94a2ceb011532795
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: e7d5b75e13fa5a5f31d86f41f2b4010cc9c4960e
* Check for rebase
* Find parents
* Create a new commit -p d0525891fa69169660750e009bba1bf4b406c879
* Create with content
* Working on be76a3f673db6dc7cd6b7c98498613efe84ce664
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: f4514e639b88ffbd2d2d6d6f94a2ceb011532795
* Check for rebase
* Find parents
* Create a new commit -p af4842fc05209069f2398cf26ad1c339962059d5
* Create with content
* Working on 685025d9fd541fb1e49ecd0d1eb096b55dac3df0
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: be76a3f673db6dc7cd6b7c98498613efe84ce664
* Check for rebase
* Find parents
* Create a new commit -p 5f43d05be71d8fa43bfe7e49b74f6c5f4570b6a3
* Create with content
* Working on ff4c9b7a27e409ca8588e18b31345cbe2deca8a7
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 685025d9fd541fb1e49ecd0d1eb096b55dac3df0
* Check for rebase
* Find parents
* Create a new commit -p 246ba89ac6e8c959719508d1d064fefef6721b55
* Create with content
* Working on b0168ca940a7f1b90a082b2cd0bbdf8b812d6fce
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: ff4c9b7a27e409ca8588e18b31345cbe2deca8a7
* Check for rebase
* Find parents
* Create a new commit -p d32acd7f9a5ed70911ab1515571a466af530423f
* Create with content
* Working on e9ba3bc7d6654f0d8777e8b2c4d3fc1e4146c204
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: b0168ca940a7f1b90a082b2cd0bbdf8b812d6fce
* Check for rebase
* Find parents
* Create a new commit -p cc59a6a9fd560c789d2157787e5590a2309fa548
* Create with content
* Working on 65488524bad74913f6b823de18dc8129a02b577a
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: e9ba3bc7d6654f0d8777e8b2c4d3fc1e4146c204
* Check for rebase
* Find parents
* Create a new commit -p e529a6c95c8241b362a6cbcd9e16b4034fee17f9
* Create with content
* Working on cd821a19b04d9155670517dbcd665ea05482c3e4
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 65488524bad74913f6b823de18dc8129a02b577a
* Check for rebase
* Find parents
* Create a new commit -p fa448c42e92a6c0edf914d9db03b15491fab672a
* Create with content
* Working on 66af19af1eb1278cb74a982f08c3814a31fdc8e6
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: cd821a19b04d9155670517dbcd665ea05482c3e4
* Check for rebase
* Find parents
* Create a new commit -p 54a35d1a21202fce57533bbf1027c0a5be42a89d
* Create with content
* Working on 524406d92f3fba2e6a7a8cb2b136f7641cef45e2
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 66af19af1eb1278cb74a982f08c3814a31fdc8e6
* Check for rebase
* Find parents
* Create a new commit -p e5a7712650acb43fd92985a4546a1cf06ff4a08d
* Create with content
* Working on 0a6c46727ce9eed469c32add878c9dbe9ed153db
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 524406d92f3fba2e6a7a8cb2b136f7641cef45e2
* Check for rebase
* Find parents
* Create a new commit -p b279647bfa8d2068d573b4975821f1ab8a0c93b9
* Create with content
* Working on fe636c1d38cb6100491b0542281ab29a6faf8fde
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 0a6c46727ce9eed469c32add878c9dbe9ed153db
* Check for rebase
* Find parents
* Create a new commit -p fa77d8458cbe134261964b96ab9b2a3788de9825
* Create with content
* Working on db2eb48bf4d49a2edb180ea9b57c1f6b4da01864
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: fe636c1d38cb6100491b0542281ab29a6faf8fde
* Check for rebase
* Find parents
* Create a new commit -p bfc64852a687802635c58fdf055481c40632611e
* Create with content
* Working on a561ca097e2db1c1d97f381421397dfc97b196d3
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: db2eb48bf4d49a2edb180ea9b57c1f6b4da01864
* Check for rebase
* Find parents
* Create a new commit -p 5097fa6c69a363e0a979ecc2130d0e52509846fd
* Create with content
* Working on bd5bdc51df34425a0ad4b6fc6cc121170dbe5144
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: a561ca097e2db1c1d97f381421397dfc97b196d3
* Check for rebase
* Find parents
* Create a new commit -p 5f78805d8351edf2315823e44f3349f15f5b8d6b
* Create with content
* Working on e61dd01d32896f9c4f2f1d7fd9b60306b52f8934
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: bd5bdc51df34425a0ad4b6fc6cc121170dbe5144
* Check for rebase
* Find parents
* Create a new commit -p df0445bb051851d2f3b73c59c2b8c397b0d332e1
* Create with content
* Working on 6010cb211b816ea7f089f11c55f40673e83fee44
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: e61dd01d32896f9c4f2f1d7fd9b60306b52f8934
* Check for rebase
* Find parents
* Create a new commit -p 72d83bb49dea45651c49ed284f55f77b5950cef2
* Create with content
* Working on 2fe6f344253937ebb56a132e1f976a3ae1e4513d
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 6010cb211b816ea7f089f11c55f40673e83fee44
* Check for rebase
* Find parents
* Create a new commit -p 1c8dd89c1be461a896b0359d56b8a9d1b1c38d15
* Create with content
* Working on eecfcfb106bdbf4773a0d26f201bdad6930e72aa
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 2fe6f344253937ebb56a132e1f976a3ae1e4513d
* Check for rebase
* Find parents
* Create a new commit -p afdf5d5ccda946e79662b65d01723d1812814d5b
* Create with content
* Working on 7e8ce73c1f40398b72948b11425fe9a892665032
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: eecfcfb106bdbf4773a0d26f201bdad6930e72aa
* Check for rebase
* Find parents
* Create a new commit -p d2cb3e0338aea0c2832f39dbd0c1bcc47d854aa6
* Create with content
* Working on d3e7b505387b37f0918b667a42a560f737aabb7f
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 7e8ce73c1f40398b72948b11425fe9a892665032
* Check for rebase
* Find parents
* Create a new commit -p 1a8ad333e2e0496a80d32b6c5fe2f1b7facaf3ff
* Create with content
* Working on 933d2a149b57d066f5a9ae756ef81f940a6a8353
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: d3e7b505387b37f0918b667a42a560f737aabb7f
* Check for rebase
* Find parents
* Create a new commit -p dd1525c3644f415e171a52314788c3c9806c3dc1
* Create with content
* Working on 6a14749ed11183244c39d963914bcc91ba3d6ecb
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 933d2a149b57d066f5a9ae756ef81f940a6a8353
* Check for rebase
* Find parents
* Create a new commit -p bf713ee97448adc5bb107d96a253f69fcc37851f
* Create with content
* Working on f4bef5095b13d0c0c439ec850b4b91776f6ed977
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 6a14749ed11183244c39d963914bcc91ba3d6ecb
* Check for rebase
* Find parents
* Create a new commit -p 1088f4361791ee2f1c10698aea3b4a6a9ece4283
* Create with content
* Working on 5f08650af0bdf9a965c1ced6b0a4171d67aae63a
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: f4bef5095b13d0c0c439ec850b4b91776f6ed977
* Check for rebase
* Find parents
* Create a new commit -p 95e01fa59d9733ca43b07b80b76add9a63be8742
* Create with content
* Working on 6704992f70eb8518561de8ecd2fd8be4c0769773
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 5f08650af0bdf9a965c1ced6b0a4171d67aae63a
* Check for rebase
* Find parents
* Create a new commit -p d70aea6f8ce9d9b70b59663c4ffcb8de34540062
* Create with content
* Working on ccd60a736c2545009f73fc1443fe43c2ccff9751
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 6704992f70eb8518561de8ecd2fd8be4c0769773
* Check for rebase
* Find parents
* Create a new commit -p 56e42fb453e0becf555b8fe1770b4c258527ba6f
* Create with content
* Working on 183521fe968bca857f0c192102d6fc6c6af9d728
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: ccd60a736c2545009f73fc1443fe43c2ccff9751
* Check for rebase
* Find parents
* Create a new commit -p 4417a68f8cf517a0eeb8d9e0f2fea8074b8fb2a1
* Create with content
* Working on befea0666308547652ab24b9fd5fc8e166744752
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 183521fe968bca857f0c192102d6fc6c6af9d728
* Check for rebase
* Find parents
* Create a new commit -p 5db083c3c66b9ff8280ce08e66dc80b6361134a6
* Create with content
* Working on 50f86a67977157b8ccba115f2656b1db9f2fc7c2
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: befea0666308547652ab24b9fd5fc8e166744752
* Check for rebase
* Find parents
* Create a new commit -p 0a78f163c805e791dd044ff773c1c6224cc2df3e
* Create with content
* Working on 9e4561adce24dff1266233bc03e52783575eda0c
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 50f86a67977157b8ccba115f2656b1db9f2fc7c2
* Check for rebase
* Find parents
* Create a new commit -p b6c982dc79cf4b148d1f041b678482e9855d7806
* Create with content
* Working on 1f0c86704e6b330ef6a857384e25c0b3c37da31a
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 9e4561adce24dff1266233bc03e52783575eda0c
* Check for rebase
* Find parents
* Create a new commit -p ee34ce300ae0e8ef23a7d8e0c3a0b0fa4b92dd5f
* Create with content
* Working on c4978cf86e435806654e3715049b44c4813e4e76
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 1f0c86704e6b330ef6a857384e25c0b3c37da31a
* Check for rebase
* Find parents
* Create a new commit -p 273538663db7d7d8dace043109250e5611ac123d
* Create with content
* Working on ea18be0d1fbe818ab74263bb32a929e05c45a8b1
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: c4978cf86e435806654e3715049b44c4813e4e76
* Check for rebase
* Find parents
* Create a new commit -p 5953aa310f97c0ddee6f0153489b6cab68fb091b
* Create with content
* Working on cc89562b61f0918e3c85bb5d287145db42d2f537
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: ea18be0d1fbe818ab74263bb32a929e05c45a8b1
* Check for rebase
* Find parents
* Create a new commit -p 619891526796e4350cbdb8882afb9d46b82d79f9
* Create with content
* Working on c869060ffeb07c3f8b7395b585199f08531a0203
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: cc89562b61f0918e3c85bb5d287145db42d2f537
* Check for rebase
* Find parents
* Create a new commit -p b7e5ef074db5b11c758940c08fff7a8180ce2c6c
* Create with content
* Working on b8aa4a45a1d496a597c0be7f82849cde4399a16f
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: c869060ffeb07c3f8b7395b585199f08531a0203
* Check for rebase
* Find parents
* Create a new commit -p b7d6e3b0dde24d9457bb999b118856346f98e185
* Create with content
* Working on 41d23465041e78b266a0f52dcd7d61a48deb26cb
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: b8aa4a45a1d496a597c0be7f82849cde4399a16f
* Check for rebase
* Find parents
* Create a new commit -p 1b2271a75c2d56bfed903c5d4e0f769774ace0a5
* Create with content
* Working on e19cfbc51e43162f18056c4316ecce25482bad39
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 41d23465041e78b266a0f52dcd7d61a48deb26cb
* Check for rebase
* Find parents
* Create a new commit -p fe83e236bc9963028a36106bc4ca70afb5ea375f
* Create with content
* Working on 8c3155e60e77050b12243e6bc8a3cdd644cedb17
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: e19cfbc51e43162f18056c4316ecce25482bad39
* Check for rebase
* Find parents
* Create a new commit -p 0a23d8086f0dd4ea060d883c1a057ed2554426f9
* Create with content
* Working on 71a6afa9ec00ba728ff468c51a615fc134e523c4
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 8c3155e60e77050b12243e6bc8a3cdd644cedb17
* Check for rebase
* Find parents
* Create a new commit -p 2554cf5318e69d60caa9b6dcbc4b8c4560d7a652
* Create with content
* Working on ca1fc647aa3dd99ae28767f26a07e686e34176bd
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 71a6afa9ec00ba728ff468c51a615fc134e523c4
* Check for rebase
* Find parents
* Create a new commit -p 90c275b2bf36f4b6604bd7b3e8abd30f097383e9
* Create with content
* Working on d825c5e5560b73d84f8e19b8a4c2f5d4d84939b7
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: ca1fc647aa3dd99ae28767f26a07e686e34176bd
* Check for rebase
* Find parents
* Create a new commit -p f18dd4812fce5feb86a4c4c602ad7466273c8f49
* Create with content
* Working on 4b9424c1cff36dcd924256df4a694aeef882b2ac
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: d825c5e5560b73d84f8e19b8a4c2f5d4d84939b7
* Check for rebase
* Find parents
* Create a new commit -p f6cf49e1025fd2f685afb922f490e4e5530c8cb8
* Create with content
* Working on 6ee1390e986511b70391a3e08bd93218cdc5f247
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 4b9424c1cff36dcd924256df4a694aeef882b2ac
* Check for rebase
* Find parents
* Create a new commit -p 9f3e2e1bb3732f58b5f059552ed15cd23038ffa2
* Create with content
* Working on b5175ae92619c1402067553fe28af66dacfa128d
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 6ee1390e986511b70391a3e08bd93218cdc5f247
* Check for rebase
* Find parents
* Create a new commit -p 6b0622e566e17512502e34c354d3437ba32810b3
* Create with content
* Working on ae4a10c9f9d89a31bd5063e6b078ef1ffff7d98d
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: b5175ae92619c1402067553fe28af66dacfa128d
* Check for rebase
* Find parents
* Create a new commit -p 8dfd741873bea13433df8c580332a51bb8e86800
* Create with content
* Working on 5715519a69f5216b307c19003f036931826679e8
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: ae4a10c9f9d89a31bd5063e6b078ef1ffff7d98d
* Check for rebase
* Find parents
* Create a new commit -p 75b49b465ed1cbe0fefd0b011a76e4a53c08cf05
* Create with content
* Working on 2f98e632df9282e51956825a3636fad0bba52ff3
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 5715519a69f5216b307c19003f036931826679e8
* Check for rebase
* Find parents
* Create a new commit -p 8715242a4724e67a4edd8ce2fb3049e568745f9c
* Create with content
* Working on 7181986bcec102def1bdebc65c21017628c4e5ed
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 2f98e632df9282e51956825a3636fad0bba52ff3
* Check for rebase
* Find parents
* Create a new commit -p a2d0eda1e7b21660467841437b9c286a5f1f1dc6
* Create with content
* Working on 7dc4b817f68051e1a79933fec120fcda741c9e2b
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 7181986bcec102def1bdebc65c21017628c4e5ed
* Check for rebase
* Find parents
* Create a new commit -p c3ae52e2b4c9c52b4b571bf089eccc95ce88e190
* Create with content
* Working on 0f0d199ee59f04b50686b17b4551b97ce9bbaf67
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 7dc4b817f68051e1a79933fec120fcda741c9e2b
* Check for rebase
* Find parents
* Create a new commit -p 348c6c6dd8993cf2d0600f1192812dede5acfbc5
* Create with content
* Working on 0b2d95af265411f7d275a159ba9a2257f384d83a
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 0f0d199ee59f04b50686b17b4551b97ce9bbaf67
* Check for rebase
* Find parents
* Create a new commit -p 8b85d27c228a431655f0c7cf8e6c41ffdb0ff629
* Create with content
* Working on 55f6119cccc92ea0a1f7358946818e2430b3224b
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 0b2d95af265411f7d275a159ba9a2257f384d83a
* Check for rebase
* Find parents
* Create a new commit -p 8d51c4033c2d2d44d9217549378b6f0c9961d2c3
* Create with content
* Working on 0bc2d5f5c7664c2ef4e636ec6398d08750b04d13
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 55f6119cccc92ea0a1f7358946818e2430b3224b
* Check for rebase
* Find parents
* Create a new commit -p 2df4959458c4eef68e5c8287a211b2632b0b98d9
* Create with content
* Working on d9cd864aefbf7faadc7c45477dbc64f9fbf76b0d
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 0bc2d5f5c7664c2ef4e636ec6398d08750b04d13
* Check for rebase
* Find parents
* Create a new commit -p 919c73722670be9fde0028d1408166e6857e06ee
* Create with content
* Working on e6080f3e6d4bb424c4024f299392e63f829b38d8
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 094d4e1f81145fbb9f5095a0e4a30657f3b3c14f d9cd864aefbf7faadc7c45477dbc64f9fbf76b0d
* Check for rebase
* Find parents
* Create a new commit -p 1e19802cf56686c651cfcaefdb6d6130cf90f325
* Create with content
* Working on 503bc927c7b6e5b6d07eb01adb4e2514ff68ba89
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: e6080f3e6d4bb424c4024f299392e63f829b38d8
* Check for rebase
* Find parents
* Create a new commit -p bd4e87145f738cb00baae353d9a40be71b7146ae
* Create with content
* Working on ac0b9971b471174894e794966172645b4a81bfe3
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: e6080f3e6d4bb424c4024f299392e63f829b38d8 503bc927c7b6e5b6d07eb01adb4e2514ff68ba89
* Check for rebase
* Find parents
* Create a new commit -p b9c58ffdbbe5010e7811abb4d20a04de9fa5a26b
* Create with content
* Working on f40e7c67ac68c015647d70898ae024b8232e591a
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: ac0b9971b471174894e794966172645b4a81bfe3
* Check for rebase
* Find parents
* Create a new commit -p 40aab5d1a39e93bbb229dfc57b9698b022e61da3
* Create with content
* Working on f862a608ae1366fa127e4216df7dc207e48f6779
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: f40e7c67ac68c015647d70898ae024b8232e591a
* Check for rebase
* Find parents
* Create a new commit -p 8557a54b4b882d361a95e9caf9e7cb9843082f5b
* Create with content
* Working on 2a779eb220781e5c28dc7f12a496965dc0e8bcb7
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: f862a608ae1366fa127e4216df7dc207e48f6779
* Check for rebase
* Find parents
* Create a new commit -p a310b4e913f26cf17020c1e50da0023763e32367
* Create with content
* Working on 7caff374855c8556576522a52dd1c4f7457ff0d6
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 2a779eb220781e5c28dc7f12a496965dc0e8bcb7
* Check for rebase
* Find parents
* Create a new commit -p 4515f0e977a815af6828c15da2308208e8f28733
* Create with content
* Working on 4c06e18fbac731a55f999d75260cb42270a1bc01
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 7caff374855c8556576522a52dd1c4f7457ff0d6
* Check for rebase
* Find parents
* Create a new commit -p 95dbce8f5aa2020096508d0e55a72ab471582d50
* Create with content
* Working on d0feb124c0abf72e41dd8d134a720aa402530f0b
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 4c06e18fbac731a55f999d75260cb42270a1bc01
* Check for rebase
* Find parents
* Create a new commit -p d25ee010dd2bc6510818ef66606f9f18e3f2a570
* Create with content
* Working on 22535c04312efc47aa00e1be264b252361c9f095
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: d0feb124c0abf72e41dd8d134a720aa402530f0b
* Check for rebase
* Find parents
* Create a new commit -p 830aa9d8eafe2401b53c29ccdca1dae49ed847a3
* Create with content
* Working on b0c7ce6b2e5987be20703c535aad9b2dfe0877e7
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 22535c04312efc47aa00e1be264b252361c9f095
* Check for rebase
* Find parents
* Create a new commit -p 55cae8576e7088ab0654a9f82a6225dde9935e2a
* Create with content
* Working on 10594e085ae36b3bc88b4d6566646897bf488062
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: b0c7ce6b2e5987be20703c535aad9b2dfe0877e7
* Check for rebase
* Find parents
* Create a new commit -p d54c8492d07cf9c4a6e3f4714b1ecafe96a8abd6
* Create with content
* Working on 157942d24336f8af25b81479f8cb520a889f50ff
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: b0c7ce6b2e5987be20703c535aad9b2dfe0877e7 10594e085ae36b3bc88b4d6566646897bf488062
* Check for rebase
* Find parents
* Create a new commit -p e1840f162fded119a65043edd7cac40e11b66adb
* Create with content
* Working on 63b6dae637fd970c9a63e93ed58c4183888465c3
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 157942d24336f8af25b81479f8cb520a889f50ff
* Check for rebase
* Find parents
* Create a new commit -p 0cf002ef9b49bdfa2a91ef762b8aed77d8e1641b
* Create with content
* Working on e7146419dffadd8fcb7949181569383988610db7
* .gitrepo reference commit: 43d18ad678dabb14a191de24b885e16ba3e730aa
* is child: 63b6dae637fd970c9a63e93ed58c4183888465c3
* Check for rebase
* Find parents
* Create a new commit -p ab77c10620e6d68a4aa1a9f65ed0ef442a4b6189
* Create with content
* Working on 349e3001103d368e43a888daa683a55f067dfbc2
* .gitrepo reference commit: b6db2c1a6c1523fc6af5121e2ffa6bca0714c732
* is child: e7146419dffadd8fcb7949181569383988610db7
* Check for rebase
* Find parents
* Create a new commit -p 565c6a30275442b8fdc6f29a75dd5bef8b1a1e30 -p b6db2c1a6c1523fc6af5121e2ffa6bca0714c732
* Create with content
* Create branch 'subrepo/packages/shared-fvtt-bits' for this new commit set 7b032252582275bf2e9bb7727d37b94550a30a77.
* Remove the .gitrepo file from 43d18ad678dabb14a191de24b885e16ba3e730aa..subrepo/packages/shared-fvtt-bits
* Create ref 'refs/subrepo/packages/shared-fvtt-bits/branch'.
* Make sure that 'subrepo/packages/shared-fvtt-bits' exists.
* Check if we have something to push
* Make sure 'subrepo/packages/shared-fvtt-bits' contains the 'refs/subrepo/packages/shared-fvtt-bits/fetch' HEAD.
Closing this because it adds nothing compared to #602.
I'm aware that this class of error has been reported multiple times, but I keep running into it so I'm sure I'm doing something wrong. I have tried to create a minimal repro, but it works fine there, which is vexing. Luckily all my repos are public which might help with debugging.
I have a project repository, which is here: https://github.com/n3dst4/gumshoe-fvtt
Inside it, under
packages/shared-fvtt-bits
, is a subrepo clone of some stuff I reuse between projects: https://github.com/n3dst4/shared-fvtt-bitsThe
shared-fvtt-bits
repo/subrepo gets commited to directly and via my project repo (and potentially other projects using it as a subrepo). I believe that this is a reasonable use-case for subrepo, right? So Im expecting to see merge commits, and occasionally having to deal with conflicts.git subrepo pull packages/shared-fvtt-bits
usually seems to work fine.Every time I attempt to
git subrepo push packages/shared-fvtt-bits
I get theCan't commit: 'subrepo/xxxxxx' doesn't contain upstream HEAD: yyyyyy
error.I have not rewritten history on my main branch. I have also not rewritten history in the shared repo.
The
.gitrepo
file after a successful pull looks like:The
commit
hashb6db2c1a6c1523fc6af5121e2ffa6bca0714c732
is indeed the correct, real hash of the HEAD ofshared-fvtt-bits
.The
parent
hash2a49ef8d9fd8579b7cce16a1be14f1afd6c2de40
is the hash of the most recent commit on mymain
branch before the last time time I successfully pulled (that time, I was in a hurry so I just force-pushed the subrepo - this time I'm asking for help!)The exact error I'm seeing is:
Question: after a successful
git subrepo pull
, what shouldparent
andcommit
be pointing to?Edit: I also note that after the error, looking at the branch that
subrepo
has created, the hashes of the most recent commits from the shared repo are all wrong, as if they've been rebased. The HEAD commit of the shared repo (b6db2c...
) is now60956...
for example.