On Mon, Apr 18, 2005 at 08:23:16AM -0700, Linus Torvalds wrote:
> NOTE NOTE NOTE! This is untested! I'm writing this within the email
> editor, so do _not_ do this on a tree that you care about.
It did the right thing for me at least!
> #!/bin/sh
> #
> # use "$1" or something in a real script, this
> # just hard-codes it.
> #
>
> merge_repo=master.kernel.org:/pub/linux/kernel/people/torvalds/linux-2.6.git
>
> echo "Getting object database"
> rsync -avz --ignore-existing $merge_repo/ .git/
>
> echo "Getting remote head"
> rsync -avz $merge_repo/HEAD .git/MERGE_HEAD
>
> 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=tree=$(cat-file commit $common | sed 's/tree //;q')
> head_tree=tree=$(cat-file commit $head | sed 's/tree //;q')
> merge_tree=tree=$(cat-file commit $merge | sed 's/tree //;q')
This wants to be:
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 $merge_tree && checkout-cache -f -a
Don't we want to do an update-cache --refresh here?
> 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
> read-tree $result_tree && checkout-cache -f -a
>
> The above looks like it might work, but I also warn you: it's not only
> untested, but it's pretty fragile in that if something breaks, you are
> probably left with a mess. I _tried_ to do the right thing, but... So it
> obviously will need testing, tweaking and just general tender loving care.
Maybe Petr can improve the error handling, and incorporate it (or at
least some of it) into git-pasky
> You shouldn't hit the "merge" case at all right now, you should hit the
> "Updating from $head to $merge_head" thing.
Exactly what happened. Thanks.
--
Russell King
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
