diff options
| author | Petr Baudis <pasky@ucw.cz> | 2005-05-11 02:00:49 +0200 |
|---|---|---|
| committer | Petr Baudis <xpasky@machine.sinus.cz> | 2005-05-11 02:00:49 +0200 |
| commit | f1a7eb36b017c62d9a007b6b8660bdeec3f94f97 (patch) | |
| tree | 9d9c288e2db202401ffba37a1b921f4244a79b2b /git-resolve-script | |
| parent | 883550481f885ab2865ab71819167230d21d4c14 (diff) | |
| parent | b790abb874890926e4cfda552bfa89d1d4ff972b (diff) | |
| download | git-f1a7eb36b017c62d9a007b6b8660bdeec3f94f97.tar.gz | |
Merge with http://members.cox.net/junkio/git-jc.git
Diffstat (limited to 'git-resolve-script')
| -rw-r--r-- | git-resolve-script | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/git-resolve-script b/git-resolve-script index c2f7a6e240..ec646fbb91 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -1,14 +1,19 @@ #!/bin/sh # +# Copyright (c) 2005 Linus Torvalds +# # Resolve two trees. # head="$1" merge="$2" merge_repo="$3" -rm -f .git/MERGE_HEAD .git/ORIG_HEAD -echo $head > .git/ORIG_HEAD -echo $merge > .git/MERGE_HEAD +: ${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 # # The remote name is just used for the message, @@ -35,7 +40,7 @@ if [ "$common" == "$head" ]; then echo "Kill me within 3 seconds.." sleep 3 git-read-tree -m $merge && git-checkout-cache -f -a && git-update-cache --refresh - echo $merge > .git/HEAD + echo $merge > "$GIT_DIR"/HEAD git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1 exit 0 fi @@ -51,6 +56,6 @@ if [ $? -ne 0 ]; then fi result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge) echo "Committed merge $result_commit" -echo $result_commit > .git/HEAD +echo $result_commit > "$GIT_DIR"/HEAD git-checkout-cache -f -a && git-update-cache --refresh git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1 |