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

Fetch the last rev before pulling
brettlangdon · Jul 12, 2021 · 18da26d · 18da26d
2 parents c58c212 + f605276
commit 18da26d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/bin/git-vendor b/bin/git-vendor
@@ -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