mirror of
https://github.com/git/git.git
synced 2024-11-02 07:17:58 +01:00
67cc5c4ef8
Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days.
15 lines
414 B
Bash
Executable file
15 lines
414 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# use "$1" or something in a real script, this
|
|
# just hard-codes it.
|
|
#
|
|
merge_repo=$1
|
|
merge_name=${2:-HEAD}
|
|
|
|
echo "Getting object database"
|
|
rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/.
|
|
|
|
echo "Getting remote $merge_name"
|
|
rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1
|
|
|
|
git-resolve-script "$(cat .git/HEAD)" "$(cat .git/MERGE_HEAD)" "$merge_repo"
|