From f605276bd3e244860196b579f52a4922828798ff Mon Sep 17 00:00:00 2001 From: Shawn Kim Date: Mon, 11 Nov 2019 18:30:57 -0600 Subject: [PATCH] Fetch the last ref before pulling --- bin/git-vendor | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/git-vendor b/bin/git-vendor index 566aa59..33ecf24 100755 --- a/bin/git-vendor +++ b/bin/git-vendor @@ -148,6 +148,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 @@ -164,6 +165,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