Skip to content

Commit f98012a

Browse files
committed
#307, update version requirement.
1 parent ba19aa7 commit f98012a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/git-subrepo

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,8 @@ subrepo:push() {
646646
if ! $force_wanted; then
647647
o "Make sure '$branch_name' contains the '$refs_subrepo_fetch' HEAD."
648648
if ! git:commit-in-rev-list "$upstream_head_commit" "$branch_name"; then
649-
error "Can't commit: '$branch_name' doesn't contain upstream HEAD."
649+
error "Can't commit: '$branch_name' doesn't contain upstream HEAD: " \
650+
"$upstream_head_commit"
650651
fi
651652
fi
652653

@@ -1392,7 +1393,7 @@ assert-environment-ok() {
13921393
error "Can't find your 'git' command in '$PATH'."
13931394
local git_version=$(git --version)
13941395
if ! git worktree list &> /dev/null; then
1395-
error "Requires git version 2.5 or higher; you have '$git_version'."
1396+
error "Requires git version 2.7 or higher; you have '$git_version'."
13961397
fi
13971398
}
13981399

0 commit comments

Comments
 (0)