hide push/popd message. make git pull working with older git version

Xavier Garrido
1 parent 65520d3c6c
Showing 1 changed file with 9 additions and 2 deletions Side-by-side Diff
antigen.zsh
@@ -210,11 +210,18 @@ antigen-revert () {
         local old_rev="$(--plugin-git rev-parse HEAD)"
         # Pull changes if update requested.
         --plugin-git pull
+        # If pull failed then try to pull directly from the clone directory
+        # In older version (1.8) of git the previous command seems not to work
+        if [ $? -ne 0 ]; then
+            pushd > /dev/null
+            git pull
+            popd > /dev/null
+        fi
         # Update submodules.
-        pushd
+        pushd > /dev/null
         cd "$clone_dir"
         git submodule update --recursive
-        popd
+        popd > /dev/null
         # Get the new revision.
         local new_rev="$(--plugin-git rev-parse HEAD)"
     fi
...	...	@@ -210,11 +210,18 @@ antigen-revert () {
210	210	local old_rev="$(--plugin-git rev-parse HEAD)"
211	211	# Pull changes if update requested.
212	212	--plugin-git pull
	213	+ # If pull failed then try to pull directly from the clone directory
	214	+ # In older version (1.8) of git the previous command seems not to work
	215	+ if [ $? -ne 0 ]; then
	216	+ pushd > /dev/null
	217	+ git pull
	218	+ popd > /dev/null
	219	+ fi
213	220	# Update submodules.
214		- pushd
	221	+ pushd > /dev/null
215	222	cd "$clone_dir"
216	223	git submodule update --recursive
217		- popd
	224	+ popd > /dev/null
218	225	# Get the new revision.
219	226	local new_rev="$(--plugin-git rev-parse HEAD)"
220	227	fi