summaryrefslogtreecommitdiff
path: root/git-fetch-script
AgeCommit message (Collapse)Author
2005-08-12fetch-pack: start multi-head pulling.Junio C Hamano
This is a beginning of resurrecting the multi-head pulling support for git-fetch-pack command. The git-fetch-script wrapper still only knows about fetching a single head, without renaming, so it is not very useful unless you directly call git-fetch-pack itself yet. It also fixes a longstanding obsolete description of how the command discovers the list of local commits.
2005-08-09[PATCH] Make curl fail on server errorCatalin Marinas
Some http servers return an HTML error page and git reads it as normal data. Adding -f option makes curl fail silently. Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-01Retire git-fetch-dumb-http and missing-revsJunio C Hamano
Now git-http-pull knows how to do packed repo, retire scripted hacks I placed as a stop-gap measure. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-31Fetch from a packed repository on dumb servers.Junio C Hamano
Implement fetching from a packed repository over http/https using the dumb server support files. I consider some parts of the logic should be in a separate C program, but it appears to work with my simple tests. I have backburnered it for a bit too long for my liking, so let's throw it out in the open and see what happens. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-07-23[PATCH] Support more http features: https no cert, .netrc -> authDarrin Thompson
Cause setting environment variable GIT_SSL_NO_VERIFY to turn off curl's ssl peer verification. Only use curl for http transfers, instead of curl and wget. Make curl check ~/.netrc for credentials. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-16git-fetch-script: fix http:// breakageLinus Torvalds
We were trying to fetch using the merge-head name rather than the merge-head SHA1 that we just got. Now, http:// is broken anyway right now for packing, but this should make it work for nonpacked repositories again.
2005-07-16Fix git-fetch-script breakageLinus Torvalds
It had the test for the destination reversed.
2005-07-16[PATCH] fetch/pull: short-hand notation for remote repositories.Junio C Hamano
Since pull and fetch are done often against the same remote repository repeatedly, keeping the URL to pull from along with the name of the head to use in $GIT_DIR/branches/$name makes a lot of sense. Adopt that convention from Cogito, and try to be compatible when possible; storing a partial URL and completing it with a trailing path may not be understood by Cogito. While we are at it, fix pulling a tag. Earlier, we updated only refs/tags/$tag without updating FETCH_HEAD, and called resolve-script using a stale (or absent) FETCH_HEAD. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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-07-05Work around git-http-pull breakage in git-fetch-scriptLinus Torvalds
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.
2005-07-05git-fetch-script: use git-fetch-pack for local and ssh fetches.Linus Torvalds
Also, clean it up a lot.
2005-06-23Make "git fetch" able to fetch a named tagLinus Torvalds
Use "git fetch <repo> tag <tagname>" to get the named tag and everything it points to.
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-07Make fetch/pull scripts terminate cleanly on errorsLinus Torvalds
Don't continue with a merge if the fetch failed.
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.