development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
git/git-resolve-script

64 lines
1.7 KiB
Plaintext
Raw Normal View History

Split "git-pull-script" into two parts 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.
2005-05-05 18:43:30 +00:00
#!/bin/sh
#
Introduce GIT_DIR environment variable. During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-05-10 05:57:58 +00:00
# Copyright (c) 2005 Linus Torvalds
#
Split "git-pull-script" into two parts 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.
2005-05-05 18:43:30 +00:00
# Resolve two trees.
#
head="$1"
merge="$2"
merge_repo="$3"
Introduce GIT_DIR environment variable. During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-05-10 05:57:58 +00:00
: ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
rm -f "$GIT_DIR"/MERGE_HEAD "$GIT_DIR"/ORIG_HEAD
echo $head > "$GIT_DIR"/ORIG_HEAD
echo $merge > "$GIT_DIR"/MERGE_HEAD
Split "git-pull-script" into two parts 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.
2005-05-05 18:43:30 +00:00
#
# The remote name is just used for the message,
# but we do want it.
#
if [ "$merge_repo" == "" ]; then
echo "git-resolve-script <head> <remote> <merge-repo-name>"
exit 1
fi
common=$(git-merge-base $head $merge)
if [ -z "$common" ]; then
echo "Unable to find common commit between" $merge $head
exit 1
fi
if [ "$common" == "$merge" ]; then
echo "Already up-to-date. Yeeah!"
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges. Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..
2005-06-20 02:42:21 +00:00
rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"
Split "git-pull-script" into two parts 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.
2005-05-05 18:43:30 +00:00
exit 0
fi
if [ "$common" == "$head" ]; then
echo "Updating from $head to $merge."
More work on merging with git-read-tree.. Add a "-u" flag to update the tree as a result of a merge. Right now this code is way too anal about things, and fails merges it shouldn't, but let me fix up the different cases and this will allow for much smoother merging even in the presense of dirty data in the working tree.
2005-06-06 05:07:31 +00:00
git-read-tree -u -m $head $merge || exit 1
Introduce GIT_DIR environment variable. During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-05-10 05:57:58 +00:00
echo $merge > "$GIT_DIR"/HEAD
git-resolve-script: use "git-apply --stat" instead of diffstat Not everybody necessarily even has diffstat installed.
2005-05-31 00:45:41 +00:00
git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges. Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..
2005-06-20 02:42:21 +00:00
rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"
Split "git-pull-script" into two parts 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.
2005-05-05 18:43:30 +00:00
exit 0
fi
echo "Trying to merge $merge into $head"
More work on merging with git-read-tree.. Add a "-u" flag to update the tree as a result of a merge. Right now this code is way too anal about things, and fails merges it shouldn't, but let me fix up the different cases and this will allow for much smoother merging even in the presense of dirty data in the working tree.
2005-06-06 05:07:31 +00:00
git-read-tree -u -m $common $head $merge || exit 1
Make default merge messages denser. In particular, make them readable on one line since that's what all the tools like git-shortlog and gitk end up showing.
2005-06-08 17:09:41 +00:00
merge_msg="Merge $merge_repo"
Split "git-pull-script" into two parts 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.
2005-05-05 18:43:30 +00:00
result_tree=$(git-write-tree 2> /dev/null)
if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge"
git-resolve-script: stop when the automated merge fails No point in doing a tree write that will just throw confusing messages on the screen.
2005-06-07 02:37:25 +00:00
git-merge-cache -o git-merge-one-file-script -a
if [ $? -ne 0 ]; then
echo "Automatic merge failed, fix up by hand"
exit 1
fi
Split "git-pull-script" into two parts 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.
2005-05-05 18:43:30 +00:00
result_tree=$(git-write-tree) || exit 1
fi
Fix git-resolve-script. I'd stupidly forgotten one merge_head -> merge conversion, and all my tests were for the fast-forward case that never triggered the bug.
2005-05-05 23:07:56 +00:00
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
Split "git-pull-script" into two parts 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.
2005-05-05 18:43:30 +00:00
echo "Committed merge $result_commit"
Introduce GIT_DIR environment variable. During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-05-10 05:57:58 +00:00
echo $result_commit > "$GIT_DIR"/HEAD
Make "git commit" work correctly in the presense of a manual merge This has gotten only very light testing, but something like this is clearly necessary and did the right thing for the one case I threw at it.
2005-06-08 20:33:15 +00:00
git-diff-tree -p $head $result_commit | git-apply --stat
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges. Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..
2005-06-20 02:42:21 +00:00
rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD"
Reference in a new issue Copy permalink