Skip to content

Commit 678c8dc

Browse files
committed
Fix edge case with subrepo push
ingydotnet#485
1 parent 05f43df commit 678c8dc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/git-subrepo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -764,8 +764,8 @@ subrepo:branch() {
764764
[[ $prev_commit ]] && first_parent=(-p "$prev_commit")
765765
second_parent=()
766766
if [[ -z $first_gitrepo_commit ]]; then
767-
first_gitrepo_commit=$gitrepo_commit
768-
second_parent=(-p "$gitrepo_commit")
767+
first_gitrepo_commit=$subrepo_commit
768+
second_parent=(-p "$subrepo_commit")
769769
fi
770770

771771
if [[ $join_method != rebase ]]; then

0 commit comments

Comments
 (0)