From e31d1e2f30c943473de7a23bbbcd2dcea698e312 Mon Sep 17 00:00:00 2001
From: Avery Pennarun <apenwarr@gmail.com>
Date: Fri, 2 Oct 2009 18:23:54 -0400
Subject: [PATCH] cmd_pull didn't support --squash correctly.

We should implement it as
	git fetch ...
	git subtree merge ...

But we were instead just calling
	git pull -s subtree ...

because 'git subtree merge' used to be just an alias for 'git merge -s
subtree', but it no longer is.
---
 git-subtree.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/git-subtree.sh b/git-subtree.sh
index cccc3400fd..8baa376fe5 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -567,8 +567,9 @@ cmd_merge()
 cmd_pull()
 {
 	ensure_clean
-	set -x
-	git pull -s subtree "$@"
+	git fetch "$@" || exit $?
+	revs=FETCH_HEAD
+	cmd_merge
 }
 
 "cmd_$command" "$@"