git/git-fetch-script, branch v0.99

Add "git-sh-setup-script" for common git shell script setup

2005-07-08T17:57:21Z

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.

Work around git-http-pull breakage in git-fetch-script

2005-07-05T19:02:10Z

Need to add a final slash. And make it verbose by default, since it's so slow that otherwise people will think it's died.

git-fetch-script: use git-fetch-pack for local and ssh fetches.

2005-07-05T18:38:37Z

Also, clean it up a lot.

Make "git fetch" able to fetch a named tag

2005-06-23T15:59:00Z

Use "git fetch tag " to get the named tag and everything it points to.

Clean up different special *HEAD handling

2005-06-21T21:04:13Z

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.

Make fetch/pull scripts terminate cleanly on errors

2005-06-07T00:40:22Z

Don't continue with a merge if the fetch failed.

Split up git-pull-script into separate "fetch" and "merge" phases.

2005-05-22T18:03:24Z

This allows you to just fetch stuff first, inspect it, and then resolve the merge separately if everything looks good.