summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2008-02-1134-59/+255
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: (35 commits) config.c: guard config parser from value=NULL builtin-log.c: guard config parser from value=NULL imap-send.c: guard config parser from value=NULL wt-status.c: guard config parser from value=NULL setup.c: guard config parser from value=NULL remote.c: guard config parser from value=NULL merge-recursive.c: guard config parser from value=NULL http.c: guard config parser from value=NULL help.c: guard config parser from value=NULL git.c: guard config parser from value=NULL diff.c: guard config parser from value=NULL convert.c: guard config parser from value=NULL connect.c: guard config parser from value=NULL builtin-tag.c: guard config parser from value=NULL builtin-show-branch.c: guard config parser from value=NULL builtin-reflog.c: guard config parser from value=NULL builtin-log.c: guard config parser from value=NULL builtin-config.c: guard config parser from value=NULL builtin-commit.c: guard config parser from value=NULL builtin-branch.c: guard config parser from value=NULL ...
| * config.c: guard config parser from value=NULLJunio C Hamano2008-02-111-1/+15
| | | | | | | | | | | | | | user.{name,email}, core.{pager,editor,excludesfile,whitespace} and i18n.{commit,logoutput}encoding all expect string values. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-log.c: guard config parser from value=NULLJunio C Hamano2008-02-111-3/+2
| | | | | | | | | | | | format.suffix expects a string value. format.numbered is bool plus "auto" Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * imap-send.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+4
| | | | | | | | | | | | None of the configuration variables this expects is boolean. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * wt-status.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
| | | | | | | | | | | | status.color.* and color.status.* expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * setup.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
| | | | | | | | | | | | core.worktree expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * remote.c: guard config parser from value=NULLJunio C Hamano2008-02-111-3/+6
| | | | | | | | | | | | branch.*.{remote,merge} expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * merge-recursive.c: guard config parser from value=NULLJunio C Hamano2008-02-111-5/+6
| | | | | | | | | | | | merge.default, merge.*.{name,driver} expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * http.c: guard config parser from value=NULLJunio C Hamano2008-02-111-10/+15
| | | | | | | | | | | | http.sslcert and friends expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * help.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
| | | | | | | | | | | | help.format configuration expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * git.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
| | | | | | | | | | | | alias.* configuration expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * diff.c: guard config parser from value=NULLJunio C Hamano2008-02-111-2/+12
| | | | | | | | | | | | | | diff.external, diff.*.command, diff.color.*, color.diff.* and diff.*.funcname configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * convert.c: guard config parser from value=NULLJunio C Hamano2008-02-111-2/+2
| | | | | | | | | | | | | | filter.*.smudge and filter.*.clean configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * connect.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
| | | | | | | | | | | | core.gitproxy configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-tag.c: guard config parser from value=NULLJunio C Hamano2008-02-111-1/+1
| | | | | | | | | | | | user.signingkey configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-show-branch.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
| | | | | | | | | | | | showbranch.default configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-reflog.c: guard config parser from value=NULLJunio C Hamano2008-02-111-5/+11
| | | | | | | | | | | | | | gc.reflogexpire and gc.reflogexpireunreachable configuration expect a string value suitable for calling approxidate() with. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-log.c: guard config parser from value=NULLJunio C Hamano2008-02-111-1/+1
| | | | | | | | | | | | format.subjectprefix configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-config.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
| | | | | | | | | | | | color configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-commit.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
| | | | | | | | | | | | commit.template configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-branch.c: guard config parser from value=NULLJunio C Hamano2008-02-111-3/+6
| | | | | | | | | | | | color.branch.* configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-apply.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
| | | | | | | | | | | | apply.whitespace configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Add config_error_nonbool() helper functionJunio C Hamano2008-02-112-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used to report misconfigured configuration file that does not give any value to a non-boolean variable, e.g. [section] var It is perfectly fine to say it if the section.var is a boolean (it means true), but if a variable expects a string value it should be flagged as a configuration error. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-gc.c: guard config parser from value=NULLMiklos Vajna2008-02-111-1/+1
| | | | | | | | | | Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * archive-tar.c: guard config parser from value=NULLJunio C Hamano2008-02-111-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Work around curl-gnutls not liking to be reinitializedMike Hommey2008-02-111-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | curl versions 7.16.3 to 7.18.0 included had a regression in which https requests following curl_global_cleanup/init sequence would fail with ASN1 parser errors with curl-gnutls. Such sequences happen in some cases such as git fetch. We work around this by removing the http_init and http_cleanup calls from get_refs_via_curl, replacing them with a transport->data initialization with the http_walker (which does http_init). While the http_walker is not currently used in get_refs_via_curl, http and walker code refactor will make it use it. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * man pages are littered with .ft C and othersJonas Fonseca2008-02-112-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jakub Narebski <jnareb@gmail.com> wrote Sun, Feb 03, 2008: > Junio C Hamano wrote: > > Jakub Narebski <jnareb@gmail.com> writes: > > > > [From] http://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458 > Julian Phillips: > > Are you using docbook xsl 1.72? There are known problems building the > > manpages with that version. 1.71 works, and 1.73 should work when it get > > released. I was able to solve this problem with this patch, which adds a XSL file used specifically for DOCBOOK_XSL_172=YesPlease and where dots and backslashes are escaped properly so they won't be substituted to the wrong thing further down the "DocBook XSL pipeline". Doing the escaping in the existing callout.xsl breaks v1.70.1. Hopefully v1.73 will end this part of the manpage nightmare. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Add a BuildRequires for gettext in the spec file.James Bowes2008-02-111-1/+4
| | | | | | | | | | Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * pack-objects: only throw away data during memory pressureMartin Koegler2008-02-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | If pack-objects hit the memory limit, it deletes objects from the delta window. This patch make it only delete the data, which is recomputed, if needed again. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * builtin-commit: remove .git/SQUASH_MSG upon successful commitGerrit Pape2008-02-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | After doing a merge --squash, and commit afterwards, the commit message template SQUASH_MSG in the git directory is not removed, which means that the content of SQUASH_MSG is used as default commit message for all subsequent commits. So have git commit remove the file SQUASH_MSG from the git directory upon a successful commit. The problem was discovered by Frédéric Brière, reported through http://bugs.debian.org/464656 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Make git prune remove temporary packs that look like write failuresDavid Steven Tweed2008-02-112-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write errors when repacking (eg, due to out-of-space conditions) can leave temporary packs (and possibly other files beginning with "tmp_") lying around which no existing codepath removes and which aren't obvious to the casual user. These can also be multi-megabyte files wasting noticeable space. Unfortunately there's no way to definitely tell in builtin-prune that a tmp_ file is not being used by a concurrent process, such as a fetch. However, it is documented that pruning should only be done on a quiet repository and --expire is honoured (using code from Johannes Schindelin, along with a test case he wrote) so that its safety is the same as that of loose object pruning. Since they might be signs of a problem (unlike orphaned loose objects) the names of any removed files are printed. Signed-off-by: David Tweed (david.tweed@gmail.com) Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * rebase -i: accept -m as advertised in the man pageUwe Kleine-K,Av(Bnig2008-02-111-1/+1
| | | | | | | | | | Signed-off-by: Uwe Kleine-K,Av(Bnig <Uwe.Kleine-Koenig@digi.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * Document that the default of branch.autosetupmerge is trueJohannes Schindelin2008-02-113-11/+13
| | | | | | | | | | | | | | | | | | | | | | In 34a3e69 (git-branch: default to --track) the default was changed to true, to help new git users. But yours truly forgot to update the documentation. This fixes it. Noticed by Kalle Olavi Niemitalo. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * bisect: allow starting with a detached HEADJohannes Schindelin2008-02-112-2/+18
| | | | | | | | | | | | | | | | Instead of insisting on a symbolic ref, bisect now accepts detached HEADs, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * git-pull documentation: fix markupJunio C Hamano2008-02-111-5/+5
| | | | | | | | | | | | | | A note paragraph was mistakenly made into an indented monospace display. Noticed by Miklos Vajna. Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * config: Fix --unset for continuation linesFrank Lichtenheld2008-02-102-0/+24
| | | | | | | | | | | | | | | | | | | | find_beginning_of_line didn't take into account that the previous line might have ended with \ in which case it shouldn't stop but continue its search. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'maint'Junio C Hamano2008-02-101-1/+1
|\ \ | |/ | | | | | | * maint: Fix typo in 'blame' documentation.
| * Fix typo in 'blame' documentation.v1.5.4.1Tim Stoakes2008-02-091-1/+1
| | | | | | | | | | Signed-off-by: Tim Stoakes <tim@stoakes.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Work around curl-gnutls not liking to be reinitializedMike Hommey2008-02-091-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | curl versions 7.16.3 to 7.18.0 included had a regression in which https requests following curl_global_cleanup/init sequence would fail with ASN1 parser errors with curl-gnutls. Such sequences happen in some cases such as git fetch. We work around this by removing the http_init and http_cleanup calls from get_refs_via_curl, replacing them with a transport->data initialization with the http_walker (which does http_init). While the http_walker is not currently used in get_refs_via_curl, http and walker code refactor will make it use it. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Introduce the config variable pack.packSizeLimitJohannes Schindelin2008-02-094-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git pack-objects" has the option --max-pack-size to limit the file size of the packs to a certain amount of bytes. On platforms where the pack file size is limited by filesystem constraints, it is easy to forget this option, and this option does not exist for "git gc" to begin with. So introduce a config variable to set the default maximum, but make this overrideable by the command line. Suggested by Tor Arvid Lund. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | gitweb: Make use of the $git_dir variable at sub git_get_project_url_listBruno Ribas2008-02-081-1/+1
| | | | | | | | | | Signed-off-by: Bruno Ribas <ribas@c3sl.ufpr.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git.el: Better handling of subprocess errors.Alexandre Julliard2008-02-081-37/+51
| | | | | | | | | | | | | | | | Where possible, capture the output of the git command and display it if the command fails. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git.el: Check for existing buffers on revert.Alexandre Julliard2008-02-081-0/+8
| | | | | | | | | | | | | | | | | | Refuse to revert a file if it is modified in an existing buffer but not saved. On success, revert the buffers that contains the files that have been reverted. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git.el: Added a command to amend a commit.Alexandre Julliard2008-02-081-1/+73
| | | | | | | | | | | | | | | | It reverts the commit and sets up the status and edit log buffer to allow making changes and recommitting it. Bound to C-c C-a. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git.el: Support for showing unknown/ignored directories.Alexandre Julliard2008-02-081-9/+29
| | | | | | | | | | | | | | | | | | Instead of recursing into directories that only contain unknown files, display only the directory itself. Its contents can be expanded with git-find-file (bound to C-m). Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-p4: Fix indentation from tab to spacesToby Allsopp2008-02-071-1/+1
| | | | | | | | Signed-off-by: Toby Allsopp <toby.allsopp@navman.co.nz>
* | Merge branch 'maint'Junio C Hamano2008-02-072-3/+52
|\ \ | |/ | | | | | | * maint: gitattributes: fix relative path matching
| * gitattributes: fix relative path matchingJunio C Hamano2008-02-072-3/+52
| | | | | | | | | | | | | | | | | | | | There was an embarrassing pair of off-by-one miscounting that failed to match path "a/b/c" when "a/.gitattributes" tried to name it with relative path "b/c". This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | config: add test cases for empty value and no value config variables.Christian Couder2008-02-061-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests in 't1300-repo-config.sh' did not check what happens when an empty value like the following is used in the config file: [emptyvalue] variable = Also it was not checked that a variable with no value like the following: [novalue] variable gives a boolean "true" value, while an ampty value gives a boolean "false" value. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Improve bash prompt to detect various states like an unfinished mergeRobin Rosenberg2008-02-061-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the git prompt (when enabled) show if a merge or a rebase is unfinished. It also detects if a bisect is being done as well as detached checkouts. An uncompleted git-am cannot be distinguised from a rebase (the non-interactive version). Instead of having an even longer prompt we simply ignore that and hope the power users that use git-am knows the difference. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Acked-by: Shawn O. Pearce <spearce@spearce.org>
View Lorry Controller Status