Merge branch 'master' of https://github.com/Tarrasch/antigen

Conflicts: antigen.zsh

Merge branch 'master' of https://github.com/Tarrasch/antigen
Conflicts: antigen.zsh
Shrikant Sharat
2 parents cbdabb20c9 ccc3d14430
Showing 2 changed files Side-by-side Diff
antigen.zsh
tests/branch-bundle.t
@@ -197,7 +197,11 @@ antigen-update () {
  
     # If its a specific branch that we want, checkout that branch.
     if [[ $url == *\|* ]]; then
-        Git checkout "${url#*|}"
+        local current_branch=${$(Git symbolic-ref HEAD)##refs/heads/}
+        local requested_branch="${url#*|}"
+        # Only do the checkout when we are not already on the branch
+        [[ $requested_branch != $current_branch ]] &&
+        Git checkout $requested_branch
     fi
  
     if ! [[ -z $old_rev || $old_rev == $new_rev ]]; then
@@ -25,6 +25,10 @@ Load plugin from b1.
   $ hehe
   hehe from b1
  
+Does not say 'Already on b1' on each session startup.
+
+  $ antigen-bundle $PLUGIN_DIR --branch=b1
+
 Load plugin from master.
  
   $ antigen-bundle $PLUGIN_DIR
...	...	@@ -197,7 +197,11 @@ antigen-update () {
197	197
198	198	# If its a specific branch that we want, checkout that branch.
199	199	if [[ $url == \\| ]]; then
200		- Git checkout "${url#*\|}"
	200	+ local current_branch=${$(Git symbolic-ref HEAD)##refs/heads/}
	201	+ local requested_branch="${url#*\|}"
	202	+ # Only do the checkout when we are not already on the branch
	203	+ [[ $requested_branch != $current_branch ]] &&
	204	+ Git checkout $requested_branch
201	205	fi
202	206
203	207	if ! [[ -z $old_rev \|\| $old_rev == $new_rev ]]; then
...	...	@@ -25,6 +25,10 @@ Load plugin from b1.
25	25	$ hehe
26	26	hehe from b1
27	27
	28	+Does not say 'Already on b1' on each session startup.
	29	+
	30	+ $ antigen-bundle $PLUGIN_DIR --branch=b1
	31	+
28	32	Load plugin from master.
29	33
30	34	$ antigen-bundle $PLUGIN_DIR