@@ -708,6 +708,17 @@ subrepo:branch() {
708
708
for commit in $commit_list ; do
709
709
o " Working on $commit "
710
710
711
+ FAIL=false OUT=true RUN git config --blob \
712
+ " $commit " :" $subdir /.gitrepo" " subrepo.commit"
713
+ if [[ -z " $output " ]]; then
714
+ o " Ignore commit, no .gitrepo file"
715
+ continue
716
+ fi
717
+
718
+ local gitrepo_commit=" $output "
719
+ o " .gitrepo reference commit: $gitrepo_commit "
720
+
721
+
711
722
# Only include the commit if it's a child of the previous commit
712
723
# This way we create a single path between $subrepo_parent..HEAD
713
724
if [[ -n " $ancestor " ]]; then
@@ -722,11 +733,6 @@ subrepo:branch() {
722
733
# Remember the previous commit from the parent repo path
723
734
ancestor=" $commit "
724
735
725
- o " Find out the .gitrepo reference"
726
- FAIL=false OUT=true RUN git config --blob \
727
- " $commit " :" $subdir /.gitrepo" " subrepo.commit"
728
- local gitrepo_commit=" $output "
729
-
730
736
o " Check for rebase"
731
737
if git:rev-exists " $refs_subrepo_fetch " ; then
732
738
if ! git:commit-in-rev-list " $gitrepo_commit " " $refs_subrepo_fetch " ; then
@@ -1738,7 +1744,7 @@ git:create-worktree() {
1738
1744
}
1739
1745
1740
1746
git:remove-worktree () {
1741
- o " Remove $worktree "
1747
+ o " Remove worktree: $worktree "
1742
1748
if [[ -d " $worktree " ]]; then
1743
1749
o " Check worktree for unsaved changes"
1744
1750
cd " $worktree "
0 commit comments