summaryrefslogtreecommitdiff
path: root/git-fetch-script
AgeCommit message (Collapse)AuthorFilesLines
2005-07-22[PATCH] Support more http features: https no cert, .netrc -> authLibravatar Darrin Thompson1-2/+5
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:// breakageLibravatar Linus Torvalds1-1/+1
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 breakageLibravatar Linus Torvalds1-0/+2
It had the test for the destination reversed.
2005-07-16[PATCH] fetch/pull: short-hand notation for remote repositories.Libravatar Junio C Hamano1-15/+21
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 setupLibravatar Linus Torvalds1-2/+2
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-scriptLibravatar Linus Torvalds1-1/+2
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.Libravatar Linus Torvalds1-33/+18
Also, clean it up a lot.
2005-06-23Make "git fetch" able to fetch a named tagLibravatar Linus Torvalds1-2/+8
Use "git fetch <repo> tag <tagname>" to get the named tag and everything it points to.
2005-06-21Clean up different special *HEAD handlingLibravatar Linus Torvalds1-2/+2
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-06Make fetch/pull scripts terminate cleanly on errorsLibravatar Linus Torvalds1-2/+2
Don't continue with a merge if the fetch failed.
2005-05-22Split up git-pull-script into separate "fetch" and "merge" phases.Libravatar Linus Torvalds1-0/+41
This allows you to just fetch stuff first, inspect it, and then resolve the merge separately if everything looks good.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 11:56:23 +0000