You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.7 KiB
56 lines
1.7 KiB
#!/bin/sh |
|
# |
|
# use "$1" or something in a real script, this |
|
# just hard-codes it. |
|
# |
|
merge_repo=$1 |
|
|
|
rm -f .git/MERGE_HEAD .git/ORIG_HEAD |
|
cp .git/HEAD .git/ORIG_HEAD |
|
|
|
echo "Getting object database" |
|
rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/. |
|
|
|
echo "Getting remote head" |
|
rsync -L $merge_repo/HEAD .git/MERGE_HEAD || exit 1 |
|
|
|
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 |
|
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') |
|
|
|
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 |
|
merge_msg="Merge of $merge_repo" |
|
result_tree=$(write-tree 2> /dev/null) |
|
if [ $? -ne 0 ]; then |
|
echo "Simple merge failed, trying Automatic merge" |
|
merge-cache git-merge-one-file-script -a |
|
merge_msg="Automatic merge of $merge_repo" |
|
result_tree=$(write-tree) || exit 1 |
|
fi |
|
result_commit=$(echo "$merge_msg" | 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
|
|
|