From: Avery Pennarun <apenwarr@gmail.com>
Date: Fri, 2 Oct 2009 22:23:54 +0000 (-0400)
Subject: cmd_pull didn't support --squash correctly.
X-Git-Tag: v1.7.11-rc0~176^2~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e31d1e2f30c943473de7a23bbbcd2dcea698e312;p=git.git

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.
---

diff --git a/git-subtree.sh b/git-subtree.sh
index cccc3400f..8baa376fe 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" "$@"