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.
Avery Pennarun committed
Oct 2, 2009 at 18:23 UTC
e31d1e2f30c943473de7a23bbbcd2dcea698e312
1 file changed
+3
-2
git-subtree.sh
+3
-2
@@ -567,8 +567,9 @@ cmd_merge()
567
cmd_pull()
568
{
569
ensure_clean
570
- set -x
571
- git pull -s subtree "$@"
570
+ git fetch "$@" || exit $?
571
+ revs=FETCH_HEAD
572
+ cmd_merge
573
}
574
575
"cmd_$command" "$@"