aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Protect get_author_ident_from_commit() from filenames in work treeJunio C Hamano2008-02-13
| | | | | | | | | | | | | | | | | We used to use "cat-file commit $commit" to extract the original author information from existing commit, but an earlier commit 5ac2715 (Consistent message encoding while reusing log from an existing commit) changed it to use "git show -s $commit". If you have a file in your work tree that can be interpreted as a valid object name (e.g. "HEAD"), this conversion will not work. Disambiguate by marking the end of revision parameter on the comand line with an explicit "--" to fix this. This breakage is most visible with rebase when a file called "HEAD" exists in the worktree. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* upload-pack: Initialize the exec-path.Johannes Sixt2008-02-13
| | | | | | | | | | | Since git-upload-pack has to spawn git-pack-objects, it has to make sure that the latter can be found in the PATH. Without this patch an attempt to clone or pull via ssh from a server fails if the git tools are not in the standard PATH on the server even though git clone or git pull were invoked with --upload-pack=/path/to/git-upload-pack. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* bisect: use verbatim commit subject in the bisect logJohannes Schindelin2008-02-13
| | | | | | | | | | Due to a typo, the commit subject was shell expanded in the bisect log. That is, if you had some shell pattern in the commit subject, bisect would happily put all matching file names into the log. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Tested-by: Frans Pop <elendil@planet.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-cvsimport.txt: fix '-M' description.Sergei Organov2008-02-13
| | | | | | | | Fix '-M' description. Old one reads as if the user can somehow "see" the default regex when using -M along with -m. Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Revert "pack-objects: only throw away data during memory pressure"Junio C Hamano2008-02-12
| | | | | | | | | | | | | | | | | | | | This reverts commit 9c2174350cc0ae0f6bad126e15fe1f9f044117ab. Nico analyzed and found out that this does not really help, and I agree with it. By the time this gets into action and data is actively thrown away, performance simply goes down the drain due to the data constantly being reloaded over and over and over and over and over and over again, to the point of virtually making no relative progress at all. The previous behavior of enforcing the memory limit by dynamically shrinking the window size at least had the effect of allowing some kind of progress, even if the end result wouldn't be optimal. And that's the whole point behind this memory limiting feature: allowing some progress to be made when resources are too limited to let the repack go unbounded.
* config.c: guard config parser from value=NULLJunio C Hamano2008-02-11
| | | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | | 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-11
| | | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | 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-11
| | | | | | | | | | | | | | 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-11
| | | | | 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-11
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Work around curl-gnutls not liking to be reinitializedMike Hommey2008-02-11
| | | | | | | | | | | | | | | | | 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-11
| | | | | | | | | | | | | | | | | | | | | 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-11
| | | | | 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-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-11
| | | | | | | | | | | | | | 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-11
| | | | | | | | | | | | | | | | | | | | | | 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-11
| | | | | 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-11
| | | | | | | | | | | 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-11
| | | | | | | | 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-11
| | | | | | | 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-10
| | | | | | | | | | 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>
* Fix typo in 'blame' documentation.v1.5.4.1Tim Stoakes2008-02-09
| | | | | Signed-off-by: Tim Stoakes <tim@stoakes.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* gitattributes: fix relative path matchingJunio C Hamano2008-02-07
| | | | | | | | | | 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>
* Fix parsing numeric color valuesTimo Hirvonen2008-02-06
| | | | | | | | Numeric color only worked if it was at end of line. Noticed by Chris Larson <clarson@kergoth.com>. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* INSTALL: git-merge no longer uses cpioGerrit Pape2008-02-05
| | | | | | | | Since a64d7784e830b3140e7d0f2b45cb3d8fafb84cca git merge doesn't use cpio anymore, adapt the documentation. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-remote documentation: fix synopsis to match descriptionJörg Sommer2008-02-03
| | | | | | | | In the text, the argument of -m is <master> which should be used in the command synopsis, too. Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-am: fix type in its usage stringJörg Sommer2008-02-03
| | | | | Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix "git-commit -C $tag"Junio C Hamano2008-02-03
| | | | | | | | The scripted version might not have handled this correctly either, but the version rewritten in C definitely does not grok this and complains $tag is not a commit object. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)Jari Aalto2008-02-03
| | | | | | | | Adjust the command syntax to better reflect the call parameters: [save] [message...] => [save [<message>]]. Signed-off-by: Jari Aalto <jari.aalto AT cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Update stale documentation links from the main documentation.Junio C Hamano2008-02-01
| | | | | | This could have been part of the 1.5.4 commit, but it isn't. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4v1.5.4Junio C Hamano2008-02-01
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-05 02:56:48 +0000