summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Renaming push.Junio C Hamano2005-08-033-94/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows git-send-pack to push local refs to a destination repository under different names. Here is the name mapping rules for refs. * If there is no ref mapping on the command line: - if '--all' is specified, it is equivalent to specifying <local> ":" <local> for all the existing local refs on the command line - otherwise, it is equivalent to specifying <ref> ":" <ref> for all the refs that exist on both sides. * <name> is just a shorthand for <name> ":" <name> * <src> ":" <dst> push ref that matches <src> to ref that matches <dst>. - It is an error if <src> does not match exactly one of local refs. - It is an error if <dst> matches more than one remote refs. - If <dst> does not match any remote refs, either - it has to start with "refs/"; <dst> is used as the destination literally in this case. - <src> == <dst> and the ref that matched the <src> must not exist in the set of remote refs; the ref matched <src> locally is used as the name of the destination. For example, - "git-send-pack --all <remote>" works exactly as before; - "git-send-pack <remote> master:upstream" pushes local master to remote ref that matches "upstream". If there is no such ref, it is an error. - "git-send-pack <remote> master:refs/heads/upstream" pushes local master to remote refs/heads/upstream, even when refs/heads/upstream does not exist. - "git-send-pack <remote> master" into an empty remote repository pushes the local ref/heads/master to the remote ref/heads/master. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Install sample hooksJunio C Hamano2005-08-036-0/+199
| | | | | | | | | A template mechanism to populate newly initialized repository with default set of files is introduced. Use it to ship example hooks that can be used for update and post update checks, as Josef Weidendorfer suggests. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Plug memory leaks in git-unpack-objectsSergey Vlasov2005-08-031-1/+5
| | | | | | | | - Call inflateEnd to release zlib state after use. - After resolving delta, free base object data. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* send-pack: handle partial pushes correctly.Junio C Hamano2005-08-031-1/+8
| | | | | | | | | | | | | | | | | When pushing into multi-user repository, or when pushing to a repository from a local repository that has rebased branches that has been pruned, the destination repository can have head commits that are missing from the local repository. This should not matter as long as the local head of the branch being pushed is a proper superset of the destination branch, but we ended up trying to run rev-list telling it to exclude objects reachable from those heads missing from the local repository, causing it to barf. Prune those heads from the rev-list parameter list, and make sure we do not try to push a branch whose remote head is something we lack. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-send-email-script: minimum whitespace cleanup.Junio C Hamano2005-08-021-16/+12
| | | | | | | Now it is ready to hit the "master" branch, clean up the script for trailing whitespace and mixture of tabs and spaces. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Doc: update git-send-email-script documentation.Ryan Anderson2005-08-021-0/+13
| | | | | Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git-send-email-script - Fix loops that limit emails to unique values ↵Ryan Anderson2005-08-021-11/+24
| | | | | | | | | | | | to be pedantically correct. Email addresses aren't generally case sensitive in the real world, but technically, they *can* be. So, let's do the right thing. Additionally, fix the generated message-id to have the right template used. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git-send-email-script - fix 2 small bugs that snuck through an ↵Ryan Anderson2005-08-021-2/+2
| | | | | | | untested bout of editing. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Make the SMTP server used by git-sendm-email-script configurable on ↵Ryan Anderson2005-08-021-2/+9
| | | | | | | | | | the command line with "--smtp-server" git-send-email-script | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) a21efe6d21d9f1aca09453ed2a4e2a2ff2d98ce6 Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git-send-email-script: Reformat readline interface and generate a ↵Ryan Anderson2005-08-021-14/+28
| | | | | | | better message-id. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Add "--chain-reply-to" to git-send-email-script, to control whether ↵Ryan Anderson2005-08-021-1/+10
| | | | | | | | | | or not the Note, using --no-chain-reply-to means you probably want to put a special message into the first email you send, i.e, a 0/N patch cover sheet. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Cleanup initial comments, add copyright notices.Ryan Anderson2005-08-021-10/+8
| | | | | Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Convert from using quoted-printable to just 8bit encoding on all emails.Ryan Anderson2005-08-021-13/+3
| | | | | | | (Deleted some spurious comments) Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Add new dependencies caused by git-send-email-script to debian/controlRyan Anderson2005-08-021-1/+1
| | | | | Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Add documentation for git-send-email-scriptRyan Anderson2005-08-021-0/+61
| | | | | Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Add git-send-email-script - tool to send emails from ↵Ryan Anderson2005-08-022-0/+266
| | | | | | | | | | | | | | | | | | git-format-patch-script This is based off of GregKH's script, send-lots-of-email.pl, and strives to do all the nice things a good subsystem maintainer does when forwarding a patch or 50 upstream: All the prior handlers of the patch, as determined by the Signed-off-by: lines, and/or the author of the commit, are cc:ed on the email. All emails are sent as a reply to the previous email, making it easy to skip a collection of emails that are uninteresting. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Parallelize pulling by sshbarkalow@iabervon.org2005-08-023-24/+57
| | | | | | | | | | | | | | This causes ssh-pull to request objects in prefetch() and read then in fetch(), such that it reduces the unpipelined round-trip time. This also makes sha1_write_from_fd() support having a buffer of data which it accidentally read from the fd after the object; this was formerly not a problem, because it would always get a short read at the end of an object, because the next object had not been requested. This is no longer true. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Parallelize the pull algorithmbarkalow@iabervon.org2005-08-025-54/+97
| | | | | | | | | | | This processes objects in two simultaneous passes. Each object will first be given to prefetch(), as soon as it is possible to tell that it will be needed, and then will be given to fetch(), when it is the next object that needs to be parsed. Unless an implementation does something with prefetch(), this should have no effect. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Object library enhancementsbarkalow@iabervon.org2005-08-023-1/+65
| | | | | | | | | Add function to look up an object which is entirely unknown, so that it can be put in a list. Various other functions related to lists of objects. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make sure leading directories exist when pushing refs.Junio C Hamano2005-08-021-0/+2
| | | | | | | | | It does not matter if the only refs you push are directly underneath heads and tags, but we forgot to make sure we have leading directories so pushing tags/v0.99/1 would not have worked. Signed-off-by: Junio C Hamano <junkio@cox.net>
* receive-pack hooks updates.Junio C Hamano2005-08-024-37/+71
| | | | | | | | The earlier one conflated update and post-update hooks for no good reason. Correct that ugly hack. Now post-update hooks will take the list of successfully updated refs. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make send-pack --all and explicit ref mutually exclusive.Junio C Hamano2005-08-021-2/+5
| | | | | | | | | send-pack had a confusing misfeature that "send-pack --all master" updated all refs, while "send-pack --all" did not do anything. Make --all and explicit refs mutually exclusive, and make sure "send-pack --all" updates all refs. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] list shortlog items in commit orderNicolas Pitre2005-08-021-1/+1
| | | | | | | | | | | The current shortlog list is backward making it look odd. This reverses it so things appear more logically. [jc: Nico says that this restores the short-log behaviour from the BK days.] Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Clean t/trash upon "make clean" as well.Junio C Hamano2005-08-021-0/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 0.99.3v0.99.3Junio C Hamano2005-08-011-1/+1
| | | | | | | | | | Things have slowly but surely started to settle down, and the http transport finally can natively grok packed repositories. To give Pasky a good anchor point, hoping that he can start split off the core part from Cogito, here is the 0.99.3, which will be accompanied with its own tag. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git-merge-cache -q doesn't complain about failing merge programPetr Baudis2005-08-012-10/+22
| | | | | | | | | | git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Fix sparse warningsLinus Torvalds2005-08-013-4/+4
| | | | | | | | | | A few sparse warnings have crept in again since I checked last time: undeclared variables with global scope. Fix them by marking the private variables properly "static". Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Do not rely on a sane wcJohannes Schindelin2005-08-011-1/+1
| | | | | | | | Some implementations of wc pad the line number with white space, which expr does not grok as a number. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Updates to tutorial.txtJohannes Schindelin2005-08-011-19/+17
| | | | | | | | Fix a few typos. Adapt to git-http-pull not borking on packed repositories. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* CVS-like push-pull description update.Junio C Hamano2005-08-011-6/+4
| | | | | | | | | | - Yes, push does not lock, but that does not mean it is not meant for multi-user repository. It just ought to perform correctly without using locks. - Let's not pretend we know _the_ right way. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Updates for cvs-migration.txtJohannes Schindelin2005-08-011-6/+22
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Fix warning about non-void return in a void function.A Large Angry SCM2005-08-011-1/+1
| | | | | Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Retire git-fetch-dumb-http and missing-revsJunio C Hamano2005-08-014-181/+3
| | | | | | | 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>
* [PATCH] Support downloading packs by HTTP (whitespace fixed)barkalow@iabervon.org2005-07-311-6/+175
| | | | | | | | | | | | This adds support to http-pull for finding the list of pack files available on the server, downloading the index files for those pack files, and downloading pack files when they contain needed objects not available individually. It retains the index files even if the pack files were not needed, but downloads the list of pack files once per run if an object is not found separately. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Functions for managing the set of packs the library is using ↵barkalow@iabervon.org2005-07-312-1/+135
| | | | | | | | | | | (whitespace fixed) This adds support for reading an uninstalled index, and installing a pack file that was added while the program was running, as well as functions for determining where to put the file. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Added hook in git-receive-packJosef Weidendorfer2005-07-315-30/+186
| | | | | | | | | | | | | | | | | | | | | | | | | Just before updating a ref, $GIT_DIR/hooks/update refname old-sha1 new-sha1 is called if executable. The hook can decline the ref to be updated by exiting with a non-zero status, or allow it to be updated by exiting with a zero status. The mechanism also allows e.g sending of a mail with pushed commits on the remote repository. Documentation update with an example hook is included. jc: The credits of the basic idea and initial implementation go to Josef, but I ended up rewriting major parts of his patch, so bugs are all mine. Also I changed the semantics for the hook from his original version (which were post-update hook) so that the hook can optionally decline to update the ref, and also can be used to implement the overall cleanups. The latter was primarily to implement a suggestion from Linus that calling update-server-info should be made optional. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Fix support for old libcurlbarkalow@iabervon.org2005-07-311-3/+2
| | | | | | | | Old libcurl has curl_easy_setopt(), and http-pull requires it; it just doesn't have one of the options. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix typo in recent Makefile cleanup (again).Junio C Hamano2005-07-311-3/+3
| | | | | | | Another instance of $(bin) was missed when it was renamed to $(bindir). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Teach parse_commit_buffer about grafting.Junio C Hamano2005-07-313-2/+127
| | | | | | | | | | | | | Introduce a new file $GIT_DIR/info/grafts (or $GIT_GRAFT_FILE) which is a list of "fake commit parent records". Each line of this file is a commit ID, followed by parent commit IDs, all 40-byte hex SHA1 separated by a single SP in between. The records override the parent information we would normally read from the commit objects, allowing both adding "fake" parents (i.e. grafting), and pretending as if a commit is not a child of some of its real parents (i.e. cauterizing). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add a stupid "count objects" script.Junio C Hamano2005-07-312-0/+15
| | | | | | | | This counts the number of unpacked object files and disk space consumed by them, to help you decide when it is a good time to repack. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fetch from a packed repository on dumb servers.Junio C Hamano2005-07-314-4/+188
| | | | | | | | | | | | 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>
* Merge with gitk.Junio C Hamano2005-07-311-5/+9
|\
| * Fix some bugs causing application error popups.Paul Mackerras2005-07-311-5/+9
| | | | | | | | | | | | | | | | Specifically this should fix the following errors: wrong # args: should be "startdiff ids" (fix from Junio Hamano) can't read "filelines(....)": no such element in array can't unset "treepending": no such variable
* | [PATCH] add NO_CURL option to the MakefileJohannes Schindelin2005-07-301-1/+8
| | | | | | | | | | | | | | | | | | | | | | This patch implements Linus' idea that if you are not interested in pulling by HTTP, you can now say NO_CURL=1 make to compile everything except git-http-pull (thus not needing curl at all). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix merge-base from getting confused.Linus Torvalds2005-07-301-38/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Sat, 30 Jul 2005, Linus Torvalds wrote: > > Yup, it's git-merge-base, and it is confused by the same thing that > confused git-rev-list. Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe somebody else can come up with a better one. I think this one ends up being quite a bit more expensive than the old one (it will look up _all_ common parents that have a child that isn't common, and then select the newest one of the bunch), but I haven't really thought it through very much. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Making it easier to find which change introduced a bugLinus Torvalds2005-07-302-1/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new "git bisect" command. - "git bisect start" start bisection search. - "git bisect bad <rev>" mark some version known-bad (if no arguments, then current HEAD) - "git bisect good <revs>..." mark some versions known-good (if no arguments, then current HEAD) - "git bisect reset <branch>" done with bisection search and go back to your work (if no arguments, then "master"). The way you use it is: git bisect start git bisect bad # Current version is bad git bisect good v2.6.13-rc2 # v2.6.13-rc2 was the last version # tested that was good When you give at least one bad and one good versions, it will bisect the revision tree and say something like: Bisecting: 675 revisions left to test after this and check out the state in the middle. Now, compile that kernel, and boot it. Now, let's say that this booted kernel works fine, then just do git bisect good # this one is good which will now say Bisecting: 337 revisions left to test after this and you continue along, compiling that one, testing it, and depending on whether it is good or bad, you say "git bisect good" or "git bisect bad", and ask for the next bisection. Until you have no more left, and you'll have been left with the first bad kernel rev in "refs/bisect/bad". Oh, and then after you want to reset to the original head, do a git bisect reset to get back to the master branch, instead of being in one of the bisection branches ("git bisect start" will do that for you too, actually: it will reset the bisection state, and before it does that it checks that you're not using some old bisection branch). Not really any harder than doing series of "quilt push" and "quilt pop", now is it? [jc: This patch is a rework based on what Linus posted to the list. The changes are: - The original introduced four separate commands, which was three too many, so I merged them into one with subcommands. - Since the next thing you would want to do after telling it "bad" and "good" is always to bisect, this version does it automatically for you. - I think the termination condition was wrong. The original version checked if the set of revisions reachable from next bisection but not rechable from any of the known good ones is empty, but if the current bisection was a bad one, this would not terminate, so I changed it to terminate it when the set becomes a singleton or empty. - Removed the use of shell array variable. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | NO_OPENSSL should really mean no openssl.Junio C Hamano2005-07-301-1/+3
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix typo in recent Makefile cleanup.Junio C Hamano2005-07-291-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] document git-rev-list betterMatthias Urlichs2005-07-291-2/+23
| | | | | | | | | | | | | | Document new (and not-so-new) flags of git-rev-list. Signed-off-By: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Build commands through object filesPetr Baudis2005-07-291-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Separate the process of building the commands to compilation and linkage. This makes it more consistent with the library objects, is the traditional thing to do, and significantly speeds up the subsequent rebuilds, especially for us the people who develop git on 300MHz notebooks. Ported from Cogito. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status