git-apply: when validating default names, check the final EOLN too
[gitweb.git] / git-pull-script
index 77d68d7dae4dca516974ba1d60c469f8f85ed2fb..49f42b5ab2896356952aee9eb2b771f422011f02 100755 (executable)
@@ -1,48 +1,23 @@
 #!/bin/sh
 #
-# use "$1" or something in a real script, this 
-# just hard-codes it.
-#
 merge_repo=$1
 
-rm -f .git/MERGE_HEAD
-
-echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/objects/. .git/objects/.
-
-echo "Getting remote head"
-rsync -L $merge_repo/HEAD .git/MERGE_HEAD || exit 1
+merge_name=$(echo "$1" | sed 's:\.git/*$::')
+merge_head=HEAD
+if [ "$2" ]
+then
+   merge_name="'$2' branch from
 
-head=$(cat .git/HEAD)
-merge_head=$(cat .git/MERGE_HEAD)
-common=$(merge-base $head $merge_head)
-if [ -z "$common" ]; then
-       echo "Unable to find common commit between" $merge_head $head
-       exit 1
+       $merge_name"
+   merge_head="refs/heads/$2"
 fi
 
-# Get the trees associated with those commits
-common_tree=$(cat-file commit $common | sed 's/tree //;q')
-head_tree=$(cat-file commit $head | sed 's/tree //;q')
-merge_tree=$(cat-file commit $merge_head | sed 's/tree //;q')
+: ${GIT_DIR=.git}
+: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
 
-if [ "$common" == "$merge_head" ]; then
-       echo "Already up-to-date. Yeeah!"
-       exit 0
-fi
-if [ "$common" == "$head" ]; then
-       echo "Updating from $head to $merge_head."
-       echo "Destroying all noncommitted data!"
-       echo "Kill me within 3 seconds.."
-       sleep 3
-       read-tree -m $merge_tree && checkout-cache -f -a && update-cache --refresh
-       echo $merge_head > .git/HEAD
-       exit 0
-fi
-echo "Trying to merge $merge_head into $head"
-read-tree -m $common_tree $head_tree $merge_tree
-result_tree=$(write-tree) || exit 1
-result_commit=$(echo "Merge $merge_repo" | commit-tree $result_tree -p $head -p $merge_head)
-echo "Committed merge $result_commit"
-echo $result_commit > .git/HEAD
-checkout-cache -f -a && update-cache --refresh
+git-fetch-script "$merge_repo" "$merge_head"
+
+git-resolve-script \
+       "$(cat "$GIT_DIR"/HEAD)" \
+       "$(cat "$GIT_DIR"/MERGE_HEAD)" \
+       "$merge_name"