summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgit-pull.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 5d97e97bd9..f323f56bcb 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -262,8 +262,8 @@ esac
if test -z "$orig_head"
then
- git update-ref -m "initial pull" HEAD $merge_head "$curr_head" &&
- git read-tree -m -u HEAD || exit 1
+ git read-tree -m -u $merge_head &&
+ git update-ref -m "initial pull" HEAD $merge_head "$curr_head"
exit
fi