aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* [PATCH] Make git-sh-setup-script do what it was supposed to doLinus Torvalds2005-08-06
| | | | | | | | | | | Duh. A missing && meant that half the tests that git-sh-setup-script were _meant_ to do were actually totally ignored. In particular, the git sanity checking ended up only testing that the GIT_OBJECT_DIRECTORY was sane, not that GIT_DIR itself was.. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge with gitk.Junio C Hamano2005-08-06
|\ | | | | | | | | | | | | | | | | | | This merges commit d698206c12a4680a92c5f4894f0345dc7dcfe62a from gitk into our head commit 2c6e4771959dbe8116f39587d912f1215c06cd0d Sincerely, jit-merge command.
| * Add forward and back buttons and make SHA1 IDs clickable links.Paul Mackerras2005-08-06
| | | | | | | | | | | | | | | | | | | | When we display the commit message in the details pane, any string of 40 [0-9a-f] characters that corresponds to a SHA1 ID that we know about gets turned into a clickable link, and displayed in blue and underlined. We now keep a history of commits that we have looked at, and we have forward and back buttons for moving within the history list.
* | [PATCH] Assorted documentation patchesJohannes Schindelin2005-08-05
| | | | | | | | | | | | | | | | | | | | [jc: Johannes spent time and effort to see how consistent our use of terminilogy is, and as a byproduct made these corrections not related to the terminology unification. I really appreciate it.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] git-commit-script fix for degenerated mergeJohannes Schindelin2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If merging results in an unchanged tree, git-commit-script should not complain that there's nothing to commit. Also, add "[--all]" to usage(). [jc: usually there is no reason to record an unchanging merge, but this code path is triggered only when there is a nontrivial merge that needed to be resolved by hand, and we should be able to record the fact that these two tree heads are dealt with as a regular two-parent commit in order to help later merges.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] git: use git_mkstemp() instead of mkstemp() for diff generation.Holger Eitzenberger2005-08-05
| | | | | | | | | | | | | | This lets you run git diff in a repository otherwise read-only to you. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] git: add git_mkstemp()Holger Eitzenberger2005-08-05
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix ref_newer() in send-pack.Junio C Hamano2005-08-05
| | | | | | | | | | | | | | | | | | | | When more than two references need to be checked with ref_newer() function, the second and later calls did not work correctly. This was because the later calls found commits retained by the "struct object" layer that still had smudges made by earlier calls. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix refname termination.Junio C Hamano2005-08-05
| | | | | | | | | | | | | | When a new ref is being pushed, the name of it was not terminated properly. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Fix git-merge-cache -qPetr Baudis2005-08-05
| | | | | | | | | | | | | | | | | | I'm totally stupid and got it backwards, sorry about that. git-merge-cache -q would mean it's noisy and quiet without any parameters. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-applymbox: allow retrying after fixing up.Junio C Hamano2005-08-05
| | | | | | | | | | | | | | | | After failing to apply a patch, when operating under -q (query) flag, give the user an opportunity to fix up the patch in a separate window and retry. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge with gitk.Junio C Hamano2005-08-05
|\ \ | |/
| * Compress the graph horizontally if it gets too wide.Paul Mackerras2005-08-05
| | | | | | | | | | | | | | | | | | If the graph gets to use more than a certain percentage (default 50%) of the width of the top-left pane, we now reduce the amount of space allowed for each graph line. This means it doesn't look quite as nice but you can still see the headline for the commit. (Currently the only way to customize the percentage is to edit your ~/.gitk file manually.)
* | daemon.c: squelch error message from EINTRJunio C Hamano2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every time after servicing the connection, select() first fails with EINTR and ends up waiting for one second before serving the next client. The sleep() was placed by the original author per suggestion from the list to avoid spinning on failing select, but at least this EINTR situation should not result in "at most one client per second" service limit. I am not sure if this is the right fix, but WTH. The king penguin says that serious people would run the daemon under inetd anyway, and I agree with that. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Teach rev-list since..til notation.Junio C Hamano2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | The King Penguin says: Now, for extra bonus points, maybe you should make "git-rev-list" also understand the "rev..rev" format (which you can't do with just the get_sha1() interface, since it expands into more). The faithful servant makes it so. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update get_sha1() to grok extended format.Junio C Hamano2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | Everybody envies rev-parse, who is the only one that can grok the extended sha1 format. Move the get_extended_sha1() out of rev-parse, rename it to get_sha1() and make it available to everybody else. The one I posted earlier to the list had one bug where it did not handle a name that ends with a digit correctly (it incorrectly tried the "Nth parent" path). This commit fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix send-pack for non-commitish tags.Junio C Hamano2005-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Again I left the v2.6.11-tree tag behind. My bad. This commit makes sure that we do not barf when pushing a ref that is a non-commitish tag. You can update a remote ref under the following conditions: * You can always use --force. * Creating a brand new ref is OK. * If the remote ref is exactly the same as what you are pushing, it is OK (nothing is pushed). * You can replace a commitish with another commitish which is a descendant of it, if you can verify the ancestry between them; this and the above means you have to have what you are replacing. * Otherwise you cannot update; you need to use --force. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-init-db: brown paper bag bugfix.Junio C Hamano2005-08-04
| | | | | | | | | | | | | | OK, I admit I am an idiot. I ended up creating bunch of garbage directories like .git/HEADbranch/ .git/HEADrefs/... Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-bisect termination condition fix.Junio C Hamano2005-08-04
| | | | | | | | | | | | | | | | | | | | | | When I munged the original from Linus, which did not terminate when the last bisect to check happened to be a bad one, to terminate, I seem to have botched the end result to pick. Thanks for Sanjoy Mahajan for a good reproduction recipe to diagnose this. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Retire git-check-files documentation too.Junio C Hamano2005-08-04
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Fix sparse warningsAlecs King2005-08-03
| | | | | | | | | | | | | | | | fix one 'should it be static?' warning and two 'mixing declarations and code' warnings. Signed-off-by: Alecs King <alecsk@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Retire check-files.Junio C Hamano2005-08-03
| | | | | | | | | | | | | | | | | | | | | | | | The king penguin said: It has no point any more, all the tools check the file status on their own, and yes, the thing should probably be removed. and the faithful servant makes it so. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Fix debian doc-baseKalle Valo2005-08-03
| | | | | | | | | | | | | | | | | | | | | | | | Fixed location of HTML documents in debian doc-base file. Without this fix debian package won't install properly (complains about missing /usr/share/doc/git-core/html directory). jc: thanks, Kalle. I think debian/rules is still broken around etcdir area, though. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-send-pack: documentationJunio C Hamano2005-08-03
| | | | | | | | | | | | | | Describe the renaming push. The wording is horrible and I would appreciate a rewrite, but it is better than nothing ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Renaming push.Junio C Hamano2005-08-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03
| | | | | | | | | | | | | | | | | | 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-03
| | | | | | | | | | | | | | | | - 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-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | 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-02
| | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | 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-02
| | | | | | | | | | | | | | (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-02
| | | | | | | | | | 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-02
| | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 0.99.3v0.99.3Junio C Hamano2005-08-01
| | | | | | | | | | | | | | | | | | | | 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-01
| | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-24 01:27:40 +0000