diff --git a/lib/git-subrepo b/lib/git-subrepo index a6d5d96a..85d64570 100755 --- a/lib/git-subrepo +++ b/lib/git-subrepo @@ -64,7 +64,7 @@ Options: h Show the command summary help Help overview version Print the git-subrepo version number - + a,all Perform command on all current subrepos A,ALL Perform command on all subrepos and subsubrepos b,branch= Specify the upstream branch to push/pull/fetch @@ -77,7 +77,7 @@ file= Specify a commit message file r,remote= Specify the upstream remote to push/pull/fetch s,squash Squash commits on push u,update Add the --branch and/or --remote overrides to .gitrepo - + q,quiet Show minimal output v,verbose Show verbose output d,debug Show the actual commands used @@ -788,8 +788,8 @@ subrepo:branch() { [[ $prev_commit ]] && first_parent=(-p "$prev_commit") second_parent=() if [[ -z $first_gitrepo_commit ]]; then - first_gitrepo_commit=$gitrepo_commit - second_parent=(-p "$gitrepo_commit") + first_gitrepo_commit=$subrepo_commit + second_parent=(-p "$subrepo_commit") fi if [[ $join_method != rebase ]]; then