Browse Source

Merge pull request #12 from shawnjk/bug/fetch.before.update

Fetch the last rev before pulling
master v1.2.2
Brett Langdon 4 years ago
committed by GitHub
parent
commit
18da26d3fe
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      bin/git-vendor

+ 2
- 0
bin/git-vendor View File

@ -175,6 +175,7 @@ cmd_update()
START) ;;
git-vendor-dir:) dir="$b" ;;
git-vendor-repository:) repository="$b" ;;
git-vendor-ref:) curr_ref="$b" ;;
END)
# Make sure the dependency exists on disk
if [ ! -d "$dir" ]; then
@ -197,6 +198,7 @@ git-vendor-dir: $dir
git-vendor-repository: $repository
git-vendor-ref: $ref
"
git fetch "$repository" "$curr_ref"
git subtree pull --prefix "$dir" --message "$message" "$repository" "$ref" --squash
break
fi


Loading…
Cancel
Save