need to 'reset_illumos_branch' before checking out

omniosorg · Sep 13, 2017 · c6ac2b8 · c6ac2b8
1 parent dca5c31
commit c6ac2b8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/bin/omni b/bin/omni
@@ -136,7 +136,7 @@ update_illumos_stable()
 {
 	(
 		cd $illumos_clone
-		git checkout closed/README.ON-BINARIES.i386
+		reset_illumos_branch
 		git pull upstream $branch
 		echo
 		anything_to_push && ask "Push updates to github/$gituser?" \
@@ -193,6 +193,7 @@ upstream_diff()
 		echo "JOYENT ($hash..):"
 		echo
 
+		reset_illumos_branch
 		git checkout -q upstream_joyent
 		git whatchanged --reverse --no-merges --abbrev-commit $hash.. \
 		    | nawk '