Fix logic for checking out branches in fixture repos

maxbrunsfeld · maxbrunsfeld · commit 9ecb20650bb8 · 2018-07-17T15:46:14.000-07:00
diff --git a/script/fetch-fixtures b/script/fetch-fixtures
@@ -15,9 +15,9 @@ fetch_grammar() {
   fi
 
   (
-    cd $grammar_dir;
+    cd $grammar_dir
     git fetch origin $ref --depth=1
-    git reset --hard origin/$ref;
+    git reset --hard FETCH_HEAD
   )
 }
 
diff --git a/script/fetch-fixtures.cmd b/script/fetch-fixtures.cmd
@@ -22,6 +22,6 @@ SET grammar_branch=%~2
 )
 pushd %grammar_dir%
 git fetch origin %2 --depth=1
-git reset --hard origin/%grammar_branch%
+git reset --hard FETCH_HEAD
 popd
 EXIT /B 0

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ SET grammar_branch=%~2`
`22`	`22`	`)`
`23`	`23`	`pushd %grammar_dir%`
`24`	`24`	`git fetch origin %2 --depth=1`
`25`		`-git reset --hard origin/%grammar_branch%`
	`25`	`+git reset --hard FETCH_HEAD`
`26`	`26`	`popd`
`27`	`27`	`EXIT /B 0`