summaryrefslogtreecommitdiff
path: root/git-pull-script
AgeCommit message (Collapse)Author
2005-07-09Make "git resolve" take the merge message in $3Linus Torvalds
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-08Add "git-sh-setup-script" for common git shell script setupLinus Torvalds
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-06-28Duh. Fix transposed characters in git-pull-scriptLinus Torvalds
I'd stupidly only tested the non-branch-name version.
2005-06-28Teach git-pull-script about pulling tagsLinus Torvalds
2005-06-21Clean up different special *HEAD handlingLinus Torvalds
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-08Make default merge messages denser.Linus Torvalds
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-07Make fetch/pull scripts terminate cleanly on errorsLinus Torvalds
Don't continue with a merge if the fetch failed.
2005-05-25git-pull-script: pretty-print the merge head informationLinus Torvalds
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-22Split up git-pull-script into separate "fetch" and "merge" phases.Linus Torvalds
This allows you to just fetch stuff first, inspect it, and then resolve the merge separately if everything looks good.
2005-05-10Introduce GIT_DIR environment variable.Junio C Hamano
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-06Add http and local transport support for git-pull-script.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-05-05Split "git-pull-script" into two partsLinus Torvalds
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-05git-pull-script: do the diffstat also for the fast-forward caseLinus Torvalds
This way you always see what the state change was.
2005-05-05Teach "git-pull-script" about alternate HEAD's to pull..Linus Torvalds
People are already starting to use a multi-head model.
2005-05-04git-pull-script: add a final "diffstat" to show the result of the merge.Linus Torvalds
This is useful to verify that you got the right thing.
2005-04-29Update the merge scripts for the big git rename.Linus Torvalds
Let's see what else I forgot..
2005-04-29[PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-scriptRene Scharfe
If you set SHA1_FILE_DIRECTORY to something else than .git/objects git-pull-script will store the fetched files in a location the rest of the tools does not expect. git-prune-script also ignores this setting, but I think this is good, because pruning a shared tree to fit a single project means throwing away a lot of useful data. :-) Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-26git-pull-script: do automatic mergesLinus Torvalds
When the trivial "read-tree" merge fails, fall back on the (equally trivial) automatic merge script instead of forcing the user to do it by hand. When _that_ fails, you get to do a manual merge.
2005-04-19Update "git-pull-script" to use "read-tree -m" forLinus Torvalds
reading a single tree too. That should speed up a trivial merge noticeably. Also, don't bother reading back the tree we just wrote when we committed a real merge. It had better be the same one we still have..
2005-04-19Make git-pull-script do the right thing for symlinked HEAD's.Linus Torvalds
Also exit gracefully if the HEAD pull failed, rather than use a possibly stale MERGE_HEAD.
2005-04-18[PATCH] Do not let rsync obliterate .git/object symbolic link.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-18Add "update-cache --refresh" to git-pull-script to make sureLinus Torvalds
out index is all ready to go after a pull. Noted by Russell King
2005-04-18Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds
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.