microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
git/git-pull-script

26 строки
454 B
Plaintext
Исходник Обычный вид История

Add the simple scripts I used to do a merge with content conflicts. They sure as hell aren't perfect, but they allow you to do: ./git-pull-script {other-git-directory} to do the initial merge, and if that had content clashes, you do merge-cache ./git-merge-one-file-script -a which tries to auto-merge. When/if the auto-merge fails, it will leave the last file in your working directory, and you can edit it and then when you're happy you can do "update-cache filename" on it. Re-do the merge-cache thing until there are no files left to be merged, and now you can write the tree and commit: write-tree commit-tree .... -p $(cat .git/HEAD) -p $(cat .git/MERGE_HEAD) and you're done.
2005-04-18 23:15:10 +04:00
#!/bin/sh
#
Add "git-sh-setup-script" for common git shell script setup It sets up the normal git environment variables and a few helper functions (currently just "die()"), and returns ok if it all looks like a git archive. So use it something like . git-sh-setup-script || die "Not a git archive" to make the rest of the git scripts more careful and readable.
2005-07-08 21:57:21 +04:00
. git-sh-setup-script || die "Not a git archive"
Add the simple scripts I used to do a merge with content conflicts. They sure as hell aren't perfect, but they allow you to do: ./git-pull-script {other-git-directory} to do the initial merge, and if that had content clashes, you do merge-cache ./git-merge-one-file-script -a which tries to auto-merge. When/if the auto-merge fails, it will leave the last file in your working directory, and you can edit it and then when you're happy you can do "update-cache filename" on it. Re-do the merge-cache thing until there are no files left to be merged, and now you can write the tree and commit: write-tree commit-tree .... -p $(cat .git/HEAD) -p $(cat .git/MERGE_HEAD) and you're done.
2005-04-18 23:15:10 +04:00
merge_repo=$1
git-pull-script: pretty-print the merge head information This also drops the common ".git" part from the end of the repo name, and if a non-default head reference is given, makes a nicer commit message about it.
2005-05-26 01:05:13 +04:00
merge_name=$(echo "$1" | sed 's:\.git/*$::')
merge_head=HEAD
Teach git-pull-script about pulling tags
2005-06-28 07:10:32 +04:00
type=head
if [ "$2" = "tag" ]; then
type=tag
shift
fi
git-pull-script: pretty-print the merge head information This also drops the common ".git" part from the end of the repo name, and if a non-default head reference is given, makes a nicer commit message about it.
2005-05-26 01:05:13 +04:00
if [ "$2" ]
then
Teach git-pull-script about pulling tags
2005-06-28 07:10:32 +04:00
merge_name="$type '$2' of $merge_name"
Duh. Fix transposed characters in git-pull-script I'd stupidly only tested the non-branch-name version.
2005-06-28 21:15:10 +04:00
merge_head="refs/${type}s/$2"
git-pull-script: pretty-print the merge head information This also drops the common ".git" part from the end of the repo name, and if a non-default head reference is given, makes a nicer commit message about it.
2005-05-26 01:05:13 +04:00
fi
Add the simple scripts I used to do a merge with content conflicts. They sure as hell aren't perfect, but they allow you to do: ./git-pull-script {other-git-directory} to do the initial merge, and if that had content clashes, you do merge-cache ./git-merge-one-file-script -a which tries to auto-merge. When/if the auto-merge fails, it will leave the last file in your working directory, and you can edit it and then when you're happy you can do "update-cache filename" on it. Re-do the merge-cache thing until there are no files left to be merged, and now you can write the tree and commit: write-tree commit-tree .... -p $(cat .git/HEAD) -p $(cat .git/MERGE_HEAD) and you're done.
2005-04-18 23:15:10 +04:00
Make fetch/pull scripts terminate cleanly on errors Don't continue with a merge if the fetch failed.
2005-06-07 04:40:22 +04:00
git-fetch-script "$merge_repo" "$merge_head" || exit 1
Add the simple scripts I used to do a merge with content conflicts. They sure as hell aren't perfect, but they allow you to do: ./git-pull-script {other-git-directory} to do the initial merge, and if that had content clashes, you do merge-cache ./git-merge-one-file-script -a which tries to auto-merge. When/if the auto-merge fails, it will leave the last file in your working directory, and you can edit it and then when you're happy you can do "update-cache filename" on it. Re-do the merge-cache thing until there are no files left to be merged, and now you can write the tree and commit: write-tree commit-tree .... -p $(cat .git/HEAD) -p $(cat .git/MERGE_HEAD) and you're done.
2005-04-18 23:15:10 +04:00
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 09:57:58 +04:00
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
Clean up different special *HEAD handling We codify the following different heads (in addition to the main "HEAD", which points to the current branch, of course): - FETCH_HEAD Populated by "git fetch" - ORIG_HEAD The old HEAD before a "git pull/resolve" (successful or not) - LAST_MERGE The HEAD we're currently merging in "git pull/resolve" - MERGE_HEAD The previous head of a unresolved "git pull", which gets committed by a "git commit" after manually resolving the result We used to have "MERGE_HEAD" be populated directly by the fetch, and we removed ORIG_HEAD and LAST_MERGE too aggressively.
2005-06-22 01:04:13 +04:00
"$(cat "$GIT_DIR"/FETCH_HEAD)" \
Make "git resolve" take the merge message in $3 It used to do "Merge $3" as the message, but that ends up being inconvenient, and much more easily done inside git-pull-script instead. This makes the third argument to "git resolve" much easier to explain.
2005-07-09 04:38:44 +04:00
"Merge $merge_name"