summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* git push: add verbose flag and allow overriding of default target repositoryLinus Torvalds2006-10-301-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | This adds a command line flag "-v" to enable a more verbose mode, and "--repo=" to override the default target repository for "git push" (which otherwise always defaults to "origin"). This, together with the patch to allow dashes in config variable names, allows me to do [alias] push-all = push -v --repo=all in my user-global config file, and then I can (for any project I maintain) add to the project-local config file [remote "all"] url=one.target.repo:/directory url=another.target:/pub/somewhere/else and now "git push-all" just updates all the target repositories, and shows me what it does - regardless of which repo I am in. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Allow '-' in config variable namesLinus Torvalds2006-10-301-3/+8
| | | | | | | | | | | | | I need this in order to allow aliases of the same form as "ls-tree", "rev-parse" etc, so that I can use [alias] my-cat=--paginate cat-file -p to add a "git my-cat" command. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'maint'Junio C Hamano2006-10-305-11/+16
|\ | | | | | | | | | | | | | | | | * maint: revision traversal: --unpacked does not limit commit list anymore. Continue traversal when rev-list --unpacked finds a packed commit. Use memmove instead of memcpy for overlapping areas quote.c: ensure the same quoting across platforms. Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
| * revision traversal: --unpacked does not limit commit list anymore.Junio C Hamano2006-10-301-1/+1
| | | | | | | | | | | | This is needed to gain smaller latency back. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Continue traversal when rev-list --unpacked finds a packed commit.Jan Harkes2006-10-301-8/+6
| | | | | | | | | | | | | | | | | | | | | | When getting the list of all unpacked objects by walking the commit history, we would stop traversal whenever we hit a packed commit. However the fact that we found a packed commit does not guarantee that all previous commits are also packed. As a result the commit walkers did not show all reachable unpacked objects. Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Use memmove instead of memcpy for overlapping areasEdgar Toernig2006-10-301-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * quote.c: ensure the same quoting across platforms.Junio C Hamano2006-10-301-1/+1
| | | | | | | | | | | | | | | | We read a byte from "char *" and compared it with ' ' to decide if it needs quoting to protect textual output. With a platform where char is unsigned char that would give different result. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"Junio C Hamano2006-10-302-0/+7
| | | | | | | | | | | | Otherwise "make CFLAGS=-DDEBUG=1" is cumbersome to run. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Move deny_non_fast_forwards handling completely into receive-pack.Shawn Pearce2006-10-304-4/+16
| | | | | | | | | | | | | | | | | | | | | | The 'receive.denynonfastforwards' option has nothing to do with the repository format version. Since receive-pack already uses git_config to initialize itself before executing any updates we can use the normal configuration strategy and isolate the receive specific variables away from the core variables. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Use memmove instead of memcpy for overlapping areasEdgar Toernig2006-10-302-4/+4
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-send-email: Read the default SMTP server from the GIT config fileSergey Vlasov2006-10-292-3/+8
| | | | | | | | | | | | | | | | | | Make the default value for --smtp-server configurable through the 'sendemail.smtpserver' option in .git/config (or $HOME/.gitconfig). Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Acked-by: Ryan Anderson <rda@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-send-email: Document support for local sendmail instead of SMTP serverSergey Vlasov2006-10-291-2/+5
| | | | | | | | | | | | | | Fix the --smtp-server option description to match reality. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Swap the porcelain and plumbing commands in the git man pageRobin Rosenberg2006-10-291-182/+182
| | | | | | | | | | | | | | This makes the documentation less confusing to newcomers. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Mention that pull can work locally in the synopsisRobin Rosenberg2006-10-292-2/+2
| | | | | | | | | | Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | gitweb: Add "next" link to commitdiff viewJakub Narebski2006-10-281-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a kind of "next" view in the bottom part of navigation bar for "commitdiff" view. For commitdiff between two commits: (from: _commit_) For commitdiff for one single parent commit: (parent: _commit_) For commitdiff for one merge commit (merge: _commit_ _commit_ ...) For commitdiff for root (parentless) commit (initial) where _link_ denotes hyperlink. SHA1 is shortened to 7 characters on display, everything is perhaps unnecessary esc_html on display. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | gitweb: Move git_get_last_activity subroutine earlierJakub Narebski2006-10-281-18/+18
| | | | | | | | | | | | | | | | This is purely cosmetic. Having git_get_* between two parse_* subroutines violated a good convention to group related things together. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: fix git-format-patch mark-up and link it from git.txtJunio C Hamano2006-10-282-2/+5
| | | | | | | | | | | | | | | | Two asterisks the SYNOPSIS section were mistaken as emphasis, and the latter backtick in "`<key>`s" were not recognized as closing backtick. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: Update information about <format> in git-for-each-refJakub Narebski2006-10-281-1/+5
| | | | | | | | | | | | | | | | | | Update information about value of <format> used when it is left unspecified. Add information about `%%` and `%xx` interpolation (URL encoding). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Bash completion support for aliasesDennis Stosberg2006-10-281-2/+27
| | | | | | | | | | | | | | | | - Add aliases to the list of available git commands. - Make completion work for aliased commands. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | gitweb: Fix up bogus $stylesheet declarationsPetr Baudis2006-10-271-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | This seems to be a pre-++ residual declaration and it wasn't good for anything at all besides flooding the webserver errorlog with "omg, our in the same scope!!" warnings. [jc: the patch was bogus by defining the variable which defeated a later test that checked it with "defined", which I fixed up.] Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | tests: merge-recursive is usable without PythonJunio C Hamano2006-10-275-28/+1
| | | | | | | | | | | | | | Many tests still protected themselves with $no_python; there is no need to do so anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2006-10-275-5/+41
|\ \ | |/ | | | | | | | | | | | | | | * maint: gitweb: Check git base URLs before generating URL from it Documentation: add git in /etc/services. Documentation: add upload-archive service to git-daemon. git-cherry: document limit and add diagram diff-format.txt: Correct information about pathnames quoting in patch format
| * gitweb: Check git base URLs before generating URL from itJakub Narebski2006-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Check if each of git base URLs in @git_base_url_list is true before appending "/$project" to it to generate project URL. This fixes the error that for default configuration for gitweb in Makefile, with GITWEB_BASE_URL empty (and "++GITWEB_BASE_URL++" being "" in gitweb.cgi), we had URL of "/$project" in the summary view. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: add git in /etc/services.Christian Couder2006-10-272-0/+14
| | | | | | | | | | Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: add upload-archive service to git-daemon.Christian Couder2006-10-271-0/+5
| | | | | | | | | | | | | | | | This patch minimaly documents the upload-archive service, hoping that someone with better knowledge will improve upon. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-cherry: document limit and add diagramRene Scharfe2006-10-261-2/+17
| | | | | | | | | | | | | | | | | | | | This patch adds the diagram from the long usage string of git-cherry to its documentation, and documents the third option. I changed some of the + to - in order to save the reader from wondering where they might fit into the picture. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Merge branch 'jc/combined' into maintJunio C Hamano2006-10-262-11/+53
| |\ | | | | | | | | | | | | | | | | | | * jc/combined: combine-diff: honour --no-commit-id combine-diff: fix hunk_comment_line logic. combine-diff: a few more finishing touches.
| * | diff-format.txt: Correct information about pathnames quoting in patch formatJakub Narebski2006-10-261-2/+4
| | | | | | | | | | | | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Make filenames line up in git-status outputAndy Parkins2006-10-261-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | When all the filenames line up it's much easier to copy and paste them somewhere else, or to remove the "modified:", "copied:", etc prefix. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Use --no-commit-id in git_commit and git_commitdiffJakub Narebski2006-10-261-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use --no-commit-id option to git-diff-tree command in git_commit and git_commitdiff to filter out commit ID output that git-diff-tree adds when called with only one <tree-ish> (not only for --stdin). Remove filtering commit IDs from git-diff-tree output. This option is in git since at least v1.0.0, so make use of it. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/combined'Junio C Hamano2006-10-261-4/+8
|\ \ \ | | |/ | |/| | | | | | | | | | * jc/combined: combine-diff: honour --no-commit-id combine-diff: fix hunk_comment_line logic.
| * | combine-diff: honour --no-commit-idJunio C Hamano2006-10-261-3/+3
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | combine-diff: fix hunk_comment_line logic.Junio C Hamano2006-10-261-1/+5
| | | | | | | | | | | | | | | | | | | | | We forgot that the last element of sline[] is a sentinel without the actual line. *BLUSH* Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/combined'Junio C Hamano2006-10-265-54/+148
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * jc/combined: combine-diff: a few more finishing touches. Documentation: clarify refname disambiguation rules. diff-format.txt: Combined diff format documentation supplement Remove --syslog in git-daemon inetd documentation examples. Documentation: updates to "Everyday GIT"
| * | combine-diff: a few more finishing touches.Junio C Hamano2006-10-262-8/+46
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "new file" and "deleted file" were already reported in the original code, but the logic was not as transparent as it could have. This uses a few variables and more comments to clarify the flow. The rule is: (1) if a path exists in the merge result when no parent had it, we report "new" (otherwise it came from the parents, as opposed to have added by the evil merge). (2) if the path does not exist in the merge result, it is "deleted". Since we can say "new" and "deleted", there is no reason not to follow the /dev/null convention. This fixes it. Appending function name after @@@ ... @@@ is trivial, so implement it. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: clarify refname disambiguation rules.Junio C Hamano2006-10-261-4/+21
| | | | | | | | | | | | | | | | Nobody should create ambiguous refs (i.e. have tag "foobar" and branch "foobar" at the same time) that need to be disambiguated with these rules to keep sanity, but the rules are there so document them. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * diff-format.txt: Combined diff format documentation supplementJakub Narebski2006-10-261-8/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update example combined diff format to the current version $ git diff-tree -p -c fec9ebf16c948bcb4a8b88d0173ee63584bcde76 and provide complete first chunk in example. Document combined diff format headers: how "diff header" look like, which of "extended diff headers" are used with combined diff and how they look like, differences in two-line from-file/to-file header from non-combined diff format, chunk header format. It should be noted that combined diff format was designed for quick _content_ inspection and renames would work correctly to pick which blobs from each tree to compare but otherwise not reflected in the output (the pathnames are not shown). [jc: with minimum copyediting] Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove --syslog in git-daemon inetd documentation examples.Christian Couder2006-10-252-6/+4
| | | | | | | | | | | | | | It is useless because --inetd implies --syslog. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: updates to "Everyday GIT"J. Bruce Fields2006-10-251-31/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove the introduction: I think it should be obvious why we have this. (And if it isn't obvious then we've got other problems.) Replace reference to git whatchanged by git log. Miscellaneous style and grammar fixes. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2006-10-251-1/+1
|\ \ | |/ | | | | | | * maint: Documentation/SubmittingPatches: 3+1 != 6
| * Documentation/SubmittingPatches: 3+1 != 6v1.4.3.3Junio C Hamano2006-10-251-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'aw/cvsimport'Junio C Hamano2006-10-251-15/+10
|\ \ | | | | | | | | | | | | * aw/cvsimport: cvsimport: move over to using git-for-each-ref to read refs.
| * | cvsimport: move over to using git-for-each-ref to read refs.Andy Whitcroft2006-09-201-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cvsimport opens all of the files in $GIT_DIR/refs/heads and reads out the sha1's in order to work out what time the last commit on that branch was made (in CVS) thus allowing incremental updates. However, this takes no account of hierachical refs naming producing the following error for each directory in $GIT_DIR/refs: Use of uninitialized value in chomp at /usr/bin/git-cvsimport line 503. Use of uninitialized value in concatenation (.) or string at /usr/bin/git-cvsimport line 505. usage: git-cat-file [-t|-s|-e|-p|<type>] <sha1> Take advantage of the new packed refs work to use the new for-each-ref iterator to get this information. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/web'Junio C Hamano2006-10-252-50/+117
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/web: gitweb: Print commit message without title in commitdiff only if there is any gitweb: Filter out commit ID from @difftree in git_commit and git_commitdiff gitweb: Get rid of git_print_simplified_log gitweb: Show project's README.html if available gitweb: Do not automatically append " git" to custom site name gitweb: Make search type a popup menu gitweb: Restore object-named links in item lists gitweb: use for-each-ref to show the latest activity across branches
| * | | gitweb: Print commit message without title in commitdiff only if there is anyJakub Narebski2006-10-241-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print the rest of commit message (title, i.e. first line of commit message, is printed separately) only if there is any. In repository which uses signoffs this shouldn't happen, because commit message should consist of at least title and signoff. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | gitweb: Filter out commit ID from @difftree in git_commit and git_commitdiffJakub Narebski2006-10-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter out commit ID output that git-diff-tree adds when called with only one <tree-ish> (not only for --stdin) in git_commit and git_commitdiff. This also works with older git versions, which doesn't have --no-commit-id option to git-diff-tree. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | gitweb: Get rid of git_print_simplified_logJakub Narebski2006-10-241-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace calls to git_print_simplified_log with its expansion, i.e. with calling git_print_log with appropriate options. Remove no longer used git_print_simplified_log subroutine. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | gitweb: Show project's README.html if availablePetr Baudis2006-10-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the repository includes a README.html file, show it in the summary page. The usual "this should be in the config file" argument does not apply here since this can be larger and having such a big string in the config file would be impractical. I don't know if this is suitable upstream, but it's one of the repo.or.cz custom modifications that I've thought could be interesting for others as well. Compared to the previous patch, this adds the '.html' extension to the filename, so that it's clear it is, well, HTML. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | gitweb: Do not automatically append " git" to custom site namePetr Baudis2006-10-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you customized the site name, you probably do not want the " git" appended so that the page title is not bastardized; I want repo.or.cz pages titled "Public Git Hosting", not "Public Git Hosting git" (what's hosting what?). This slightly changes the $site_name semantics but only very insignificantly. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | gitweb: Make search type a popup menuPetr Baudis2006-10-232-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the multiple search types actually usable by the user; if you don't read the gitweb source, you don't even have an idea that you can write things like that there. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status