| 75ad235 | Junio C Hamano | 13 February 2008, 07:39:03 UTC | Revert "pack-objects: only throw away data during memory pressure" 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. | 13 February 2008, 07:39:03 UTC |
| 20a87ec | Jay Soffian | 12 February 2008, 02:33:52 UTC | git-gui: support Git Gui.app under OS X 10.5 The Tk Framework moved its location in 10.5 compared to 10.4 Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Tested-by: Seth Falcon <seth@userprimary.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 February 2008, 07:34:45 UTC |
| 6c47d0e | Junio C Hamano | 11 February 2008, 21:10:27 UTC | config.c: guard config parser from value=NULL 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> | 11 February 2008, 21:14:25 UTC |
| 90f5c18 | Junio C Hamano | 11 February 2008, 21:09:16 UTC | builtin-log.c: guard config parser from value=NULL format.suffix expects a string value. format.numbered is bool plus "auto" Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:14:25 UTC |
| 3c17c34 | Junio C Hamano | 11 February 2008, 20:04:00 UTC | imap-send.c: guard config parser from value=NULL None of the configuration variables this expects is boolean. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:14:25 UTC |
| 451d36b | Junio C Hamano | 11 February 2008, 19:00:57 UTC | wt-status.c: guard config parser from value=NULL status.color.* and color.status.* expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:37 UTC |
| 180483c | Junio C Hamano | 11 February 2008, 19:00:32 UTC | setup.c: guard config parser from value=NULL core.worktree expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:37 UTC |
| d2370cc | Junio C Hamano | 11 February 2008, 19:00:10 UTC | remote.c: guard config parser from value=NULL branch.*.{remote,merge} expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:37 UTC |
| e098368 | Junio C Hamano | 11 February 2008, 18:59:17 UTC | merge-recursive.c: guard config parser from value=NULL merge.default, merge.*.{name,driver} expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:37 UTC |
| 111dd25 | Junio C Hamano | 11 February 2008, 18:57:22 UTC | http.c: guard config parser from value=NULL http.sslcert and friends expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:37 UTC |
| b51b2bb | Junio C Hamano | 11 February 2008, 18:56:26 UTC | help.c: guard config parser from value=NULL help.format configuration expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:37 UTC |
| e08404a | Junio C Hamano | 11 February 2008, 18:56:06 UTC | git.c: guard config parser from value=NULL alias.* configuration expects a string value Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:37 UTC |
| 64f30e9 | Junio C Hamano | 11 February 2008, 18:53:56 UTC | diff.c: guard config parser from value=NULL 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> | 11 February 2008, 21:11:36 UTC |
| a7269e5 | Junio C Hamano | 11 February 2008, 18:53:36 UTC | convert.c: guard config parser from value=NULL filter.*.smudge and filter.*.clean configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| c64b9ad | Junio C Hamano | 11 February 2008, 18:52:15 UTC | connect.c: guard config parser from value=NULL core.gitproxy configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| 406d95f | Junio C Hamano | 11 February 2008, 18:51:31 UTC | builtin-tag.c: guard config parser from value=NULL user.signingkey configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| 4f9c412 | Junio C Hamano | 11 February 2008, 18:51:03 UTC | builtin-show-branch.c: guard config parser from value=NULL showbranch.default configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| 4f342b9 | Junio C Hamano | 11 February 2008, 18:50:06 UTC | builtin-reflog.c: guard config parser from value=NULL gc.reflogexpire and gc.reflogexpireunreachable configuration expect a string value suitable for calling approxidate() with. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| 995c452 | Junio C Hamano | 11 February 2008, 18:48:55 UTC | builtin-log.c: guard config parser from value=NULL format.subjectprefix configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| f769982 | Junio C Hamano | 11 February 2008, 18:48:12 UTC | builtin-config.c: guard config parser from value=NULL color configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| d865eb2 | Junio C Hamano | 11 February 2008, 18:46:39 UTC | builtin-commit.c: guard config parser from value=NULL commit.template configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| 5768c98 | Junio C Hamano | 11 February 2008, 18:45:50 UTC | builtin-branch.c: guard config parser from value=NULL color.branch.* configuration variables expect a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| a0ed3e6 | Junio C Hamano | 11 February 2008, 18:44:49 UTC | builtin-apply.c: guard config parser from value=NULL apply.whitespace configuration expects a string value. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| 40ea4ed | Junio C Hamano | 11 February 2008, 18:41:18 UTC | Add config_error_nonbool() helper function 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> | 11 February 2008, 21:11:36 UTC |
| c5e5a2c | Miklos Vajna | 08 February 2008, 14:26:18 UTC | builtin-gc.c: guard config parser from value=NULL Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| cc1816b | Junio C Hamano | 09 February 2008, 04:38:22 UTC | archive-tar.c: guard config parser from value=NULL Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 21:11:36 UTC |
| b26768e | Mike Hommey | 09 February 2008, 09:41:36 UTC | Work around curl-gnutls not liking to be reinitialized 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> | 11 February 2008, 20:51:55 UTC |
| ac3593d | Jonas Fonseca | 04 February 2008, 22:01:20 UTC | man pages are littered with .ft C and others 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> | 11 February 2008, 20:51:55 UTC |
| e94a45d | James Bowes | 04 February 2008, 13:13:07 UTC | Add a BuildRequires for gettext in the spec file. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 20:51:55 UTC |
| 9c21743 | Martin Koegler | 11 February 2008, 07:26:25 UTC | pack-objects: only throw away data during memory pressure 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> | 11 February 2008, 20:24:33 UTC |
| 5a95b85 | Gerrit Pape | 08 February 2008, 09:53:58 UTC | builtin-commit: remove .git/SQUASH_MSG upon successful commit 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> | 11 February 2008, 20:24:27 UTC |
| 8464010 | David Steven Tweed | 07 February 2008, 02:55:14 UTC | Make git prune remove temporary packs that look like write failures 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> | 11 February 2008, 20:22:58 UTC |
| 65ae89b | Uwe Kleine-K,Av(Bnig | 11 February 2008, 13:45:26 UTC | rebase -i: accept -m as advertised in the man page Signed-off-by: Uwe Kleine-K,Av(Bnig <Uwe.Kleine-Koenig@digi.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 20:18:53 UTC |
| 0ed50ce | Johannes Schindelin | 11 February 2008, 11:27:20 UTC | Document that the default of branch.autosetupmerge is true 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> | 11 February 2008, 20:14:03 UTC |
| ce32660 | Johannes Schindelin | 10 February 2008, 13:59:50 UTC | bisect: allow starting with a detached HEAD 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> | 11 February 2008, 20:04:17 UTC |
| 473d331 | Junio C Hamano | 11 February 2008, 19:22:01 UTC | git-pull documentation: fix markup A note paragraph was mistakenly made into an indented monospace display. Noticed by Miklos Vajna. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2008, 19:22:01 UTC |
| 7a31cc0 | Frank Lichtenheld | 11 February 2008, 00:23:03 UTC | config: Fix --unset for continuation lines 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> | 11 February 2008, 02:42:06 UTC |
| 5272706 | Tim Stoakes | 10 February 2008, 04:19:08 UTC | Fix typo in 'blame' documentation. Signed-off-by: Tim Stoakes <tim@stoakes.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2008, 04:22:23 UTC |
| cf94ccd | Junio C Hamano | 07 February 2008, 08:02:08 UTC | gitattributes: fix relative path matching 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> | 07 February 2008, 08:04:50 UTC |
| a0cf49c | Timo Hirvonen | 06 February 2008, 12:16:08 UTC | Fix parsing numeric color values 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> | 06 February 2008, 22:02:41 UTC |
| f1c3239 | Gerrit Pape | 06 February 2008, 07:03:53 UTC | INSTALL: git-merge no longer uses cpio 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> | 06 February 2008, 07:31:17 UTC |
| 5ea55ed | Jörg Sommer | 02 February 2008, 23:58:07 UTC | git-remote documentation: fix synopsis to match description 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> | 04 February 2008, 00:02:12 UTC |
| fe1fa94 | Jörg Sommer | 02 February 2008, 23:58:06 UTC | git-am: fix type in its usage string Signed-off-by: Jörg Sommer <joerg@alea.gnuu.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2008, 00:01:27 UTC |
| 8a2f873 | Junio C Hamano | 03 February 2008, 08:00:09 UTC | Fix "git-commit -C $tag" 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> | 03 February 2008, 08:56:35 UTC |
| 71bda8b | Jari Aalto | 02 February 2008, 14:03:48 UTC | Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2) 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> | 03 February 2008, 08:56:35 UTC |
| 6ce8e44 | Junio C Hamano | 02 February 2008, 04:40:30 UTC | Update stale documentation links from the main documentation. This could have been part of the 1.5.4 commit, but it isn't. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2008, 04:40:30 UTC |
| c3c1352 | Junio C Hamano | 02 February 2008, 03:10:10 UTC | GIT 1.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2008, 03:10:10 UTC |
| 7dc4642 | Junio C Hamano | 02 February 2008, 03:06:56 UTC | Fix "git checkout -b foo ':/substring'" Because ':/substring' extended SHA1 expression cannot take postfix modifiers such as ^{tree} and ^{commit}, we would need to do it in multiple steps. With the patch, you can start a new branch from a randomly-picked commit whose message has the named string in it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2008, 03:08:14 UTC |
| 0509eb2 | Michele Ballabio | 31 January 2008, 21:59:11 UTC | Fix typo in a comment in t/test-lib.sh Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2008, 22:43:54 UTC |
| da101b8 | Miklos Vajna | 31 January 2008, 19:55:57 UTC | git rev-parse manpage: spelling fix Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2008, 21:59:00 UTC |
| bb8eebb | Junio C Hamano | 31 January 2008, 21:51:42 UTC | Revert "filter-branch docs: remove brackets so not to imply revision arg is optional" This reverts commit c41b439244c51b30c60953192816afc91e552578, as we decided to default to HEAD when revision parameters are missing and they are no longer mandatory. | 31 January 2008, 21:51:42 UTC |
| c02792e | Jean-Luc Herren | 31 January 2008, 02:06:04 UTC | Documentation/git-cvsserver: Fix typo Signed-off-by: Jean-Luc Herren <jlh@gmx.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2008, 02:50:41 UTC |
| 0f047f3 | Brandon Casey | 30 January 2008, 19:33:04 UTC | filter-branch: assume HEAD if no revision supplied filter-branch previously took the first non-option argument as the name for a new branch. Since dfd05e38, it now takes a revision or a revision range and modifies the current branch. Update to operate on HEAD by default to conform with standard git interface practice. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2008, 02:50:25 UTC |
| c41b439 | Brandon Casey | 31 January 2008, 00:41:25 UTC | filter-branch docs: remove brackets so not to imply revision arg is optional Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2008, 01:21:02 UTC |
| 733f181 | Shawn O. Pearce | 30 January 2008, 06:21:56 UTC | Use 'printf %s $x' notation in t5401 We only care about getting what should be an empty string and sending it to a file, without a trailing LF, so the empty string translates into a 0 byte file. Earlier when I originally wrote these lines Mac OS X allowed the format string of printf to be the empty string, but more recent versions appear to have been 'improved' with error messages if the format is not given. This may cause problems if we ever wind up with changes to the hook tests. A minor cleanup makes the test more safe on all systems, by conforming to accepted printf conventions. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2008, 01:17:39 UTC |
| def16e7 | Brandon Casey | 28 January 2008, 21:16:02 UTC | filter-branch.sh: remove temporary directory on failure One of the first things filter-branch does is to create a temporary directory. This directory is eventually removed by the script during normal operation, but is not removed if the script encounters an error. Set a trap to remove it when the script terminates for any reason. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2008, 19:56:12 UTC |
| 0eab8ca | Brandon Casey | 29 January 2008, 22:41:30 UTC | git-relink: avoid hard linking in objects/info directory git-relink is intended to search for packs and loose objects in common between two repositories and to replace the one set with hard links to the other. Files other than packs and loose objects should not be touched, so add the "info" sub-directory to the pattern of directory excludes. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2008, 08:01:27 UTC |
| c1dcf7e | Bruno Ribas | 30 January 2008, 05:37:56 UTC | gitweb: Make use of the $git_dir variable at sub git_get_project_description Signed-off-by: Bruno Ribas <ribas@c3sl.ufpr.br> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2008, 07:55:18 UTC |
| d661146 | Jakub Narebski | 29 January 2008, 19:52:32 UTC | gitweb: Add info about $projectroot and $projects_list to gitweb/README Those two configuration variables are important enough that it is worth to explicitely write about them in the "Gitweb config file variables" section even if they are usually set during build by GITWEB_PROJECTROOT and GITWEB_LIST build (Makefile) configuration variables. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2008, 06:01:20 UTC |
| a5d86f7 | Jim Meyering | 29 January 2008, 19:38:55 UTC | fix doc typos Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2008, 06:00:34 UTC |
| bda3a31 | Junio C Hamano | 26 January 2008, 07:53:05 UTC | reflog-expire: Avoid creating new files in a directory inside readdir(3) loop "git reflog expire --all" opened a directory in $GIT_DIR/logs/, read reflog files in there readdir(3), and rewrote the file by creating a new file and renaming it back inside the loop. This code structure can cause the newly created file to be returned by subsequent call to readdir(3), and fall into an infinite loop in the worst case. This separates the processing to two phase. Running for_each_reflog() to find out and collect all refs, and then iterate over them, calling expire_reflog(). This way, the program would behave exactly the same way as if all the refs were given by the user from the command line. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2008, 05:48:57 UTC |
| 7720224 | Yasushi SHOJI | 29 January 2008, 12:16:02 UTC | gitweb: Convert generated contents to utf8 in commitdiff_plain If the commit message, or commit author contains non-ascii, it must be converted from Perl internal representation to utf-8, to follow what got declared in HTTP header. Use to_utf8() to do the conversion. This necessarily replaces here-doc with "print" statements. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Acked-by: İsmail Dönmez <ismail@pardus.org.tr> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2008, 05:23:57 UTC |
| ab989ad | Christian Couder | 29 January 2008, 06:08:44 UTC | instaweb: use 'browser.<tool>.path' config option if it's set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2008, 08:49:28 UTC |
| f7ff09d | Christian Couder | 29 January 2008, 06:08:29 UTC | Documentation: help: specify supported html browsers. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2008, 08:49:27 UTC |
| 584627b | Christian Couder | 29 January 2008, 06:08:22 UTC | Documentation: config: add "browser.<tool>.path". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2008, 08:49:23 UTC |
| 752527f | Johannes Schindelin | 28 January 2008, 16:33:28 UTC | Add test for rebase -i with commits that do not pass pre-commit This accompanies c5b09feb786f6a2456ec3d8203d0f4d67f09f043 (Avoid update hook during git-rebase --interactive) to make sure that any regression to make Debian's Bug#458782 (git-core: git-rebase doesn't work when trying to squash changes into commits created with --no-verify) resurface will be caught. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2008, 19:04:00 UTC |
| c0d4528 | Jeff King | 22 January 2008, 03:23:53 UTC | t9001: add missing && operators The exit value of some commands was not being used for the test output. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2008, 19:02:59 UTC |
| bf5aeb1 | Junio C Hamano | 27 January 2008, 02:39:41 UTC | GIT 1.5.4-rc5 Hopefully the last rc before the final... Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2008, 06:48:03 UTC |
| c85c792 | Johannes Schindelin | 26 January 2008, 18:04:37 UTC | pull --rebase: be cleverer with rebased upstream branches When the upstream branch is tracked, we can detect if that branch was rebased since it was last fetched. Teach git to use that information to rebase from the old remote head onto the new remote head. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2008, 02:24:24 UTC |
| e509db9 | Steffen Prohaska | 26 January 2008, 09:54:06 UTC | cvsserver: Fix for histories with multiple roots Git histories may have multiple roots, which can cause git merge-base to fail and this caused git cvsserver to die. This commit teaches git cvsserver to handle a failing git merge-base gracefully, and modifies the test case to verify this. All the test cases now use a history with two roots. Signed-off-by: Steffen Prohaska <prohaska@zib.de> git-cvsserver.perl | 9 ++++++++- t/t9400-git-cvsserver-server.sh | 10 +++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2008, 01:58:18 UTC |
| 7549376 | Steffen Prohaska | 26 January 2008, 09:54:05 UTC | t9400-git-cvsserver-server: Wrap setup into test case It is preferable to have the test setup in a test case. The setup itself may fail and having it as a test case handles this situation more gracefully. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2008, 01:44:05 UTC |
| ab8daa1 | Mike Hommey | 26 January 2008, 11:04:30 UTC | Documentation: add a bit about sendemail.to configuration While there is information about this in the configuration section, it was missing in the options section. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2008, 18:59:07 UTC |
| 3a9f0f4 | Pierre Habouzit | 26 January 2008, 11:26:57 UTC | parse-options: catch likely typo in presense of aggregated options. If options are aggregated, and that the whole token is an exact prefix of a long option that is longer than 2 letters, reject it. This is to prevent a common typo: $ git commit -amend to get interpreted as "commit all with message 'end'". The typo check isn't performed if there is no aggregation, because the stuck form is the recommended one. If we have `-o` being a valid short option that takes an argument, and --option a long one, then we _MUST_ accept -option as "'o' option with argument 'ption'", which is our official recommended form. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2008, 18:53:31 UTC |
| 923e3ec | Mike Hommey | 26 January 2008, 12:19:02 UTC | Add a missing dependency on http.h Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2008, 18:52:40 UTC |
| 10eb64f | Miklos Vajna | 25 January 2008, 10:17:38 UTC | git pull manpage: don't include -n from fetch-options.txt The -n option stands for --no-summary in git pull [jes: reworded the description to avoid mentioning 'git-fetch'; also exclude '-n' conditional on git-pull -- ugly because of the missing "else" statement in asciidoc] Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2008, 06:42:36 UTC |
| 2b0d103 | Sam Vilain | 24 January 2008, 23:10:02 UTC | git-svn(1): update instructions for resuming a git-svn clone git-svn expects its references under refs/remotes/*; but these will not be copied or set by "git clone"; put in this man page the manual fiddling that is required with current git-svn to get this to work. Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2008, 06:31:52 UTC |
| 3cf3237 | Jakub Narebski | 25 January 2008, 11:19:41 UTC | autoconf: define NO_SYS_SELECT_H on systems without <sys/select.h>. Pre-POSIX.1-2001 systems don't have <sys/select.h>, but select(2) is declared in <sys/time.h>, which git-compat-util.h includes. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 January 2008, 06:26:08 UTC |
| 81cc66a | Robert Schiele | 24 January 2008, 18:35:20 UTC | Makefile: customization for supporting HP-UX Signed-off-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 January 2008, 05:58:53 UTC |
| 2600973 | Robert Schiele | 24 January 2008, 18:34:46 UTC | pre-POSIX.1-2001 systems do not have <sys/select.h> POSIX.1-2001 has declaration of select(2) in <sys/select.h>, but in the previous version of SUS, it was declared in <sys/time.h> (which is already included in git-compat-util.h). This introduces NO_SYS_SELECT_H macro in the Makefile to be set on older systems, to skip inclusion of <sys/select.h> that does not exist on them. We could check _POSIX_VERSION with 200112L and do this automatically, but earlier it was reported that the approach does not work well on some vintage of HP-UX. Other systems may get _POSIX_VERSION itself wrong. At least for now, this manual configuration is safer. Signed-off-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 January 2008, 22:01:28 UTC |
| cab31fa | Junio C Hamano | 24 January 2008, 05:37:12 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Correctly cleanup msgfmt '1 message untranslated' output git-gui: Make the statistics of po2msg match those of msgfmt git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available git-gui: Work around random missing scrollbar in revision list | 24 January 2008, 05:37:12 UTC |
| 5a9dd39 | Brandon Casey | 23 January 2008, 17:21:22 UTC | git-commit: exit non-zero if we fail to commit the index In certain rare cases, the creation of the commit object and update of HEAD can succeed, but then installing the updated index will fail. This is most likely caused by a full disk or exceeded disk quota. When this happens the new index file will be removed, and the repository will be left with the original now-out-of-sync index. The user can recover with a "git reset HEAD" once the disk space issue is resolved. We should detect this failure and offer the user some helpful guidance. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2008, 18:10:11 UTC |
| 28678b4 | Miklos Vajna | 22 January 2008, 22:12:25 UTC | git-clone -s: document problems with git gc --prune There is a scenario when using git clone -s and git gc --prune togother is dangerous. Document this. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2008, 18:09:54 UTC |
| 3b8f19a | Shawn O. Pearce | 23 January 2008, 04:56:15 UTC | git-gui: Correctly cleanup msgfmt '1 message untranslated' output In the multiple message case we remove the word "messages" from the statistics output of msgfmt as it looks cleaner on the tty when you are watching the build process. However we failed to strip the word "message" when only 1 message was found to be untranslated or fuzzy, as msgfmt does not produce the 's' suffix. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2008, 04:56:15 UTC |
| 2cd9ad2 | Shawn O. Pearce | 23 January 2008, 04:52:07 UTC | git-gui: Make the statistics of po2msg match those of msgfmt The strings we were showing from po2msg didn't exactly match those of msgfmt's --statistics output so we didn't show quite the same results when building git-gui's message files. Now we're closer to what msgfmt shows (at least for an en_US locale) so the make output matches. I noticed that the fuzzy translation count is off by one for the current po/zh_cn.po file. Not sure why and I'm not going to try and debug it at this time as the po2msg is strictly a fallback, users building from source really should prefer msgfmt. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2008, 04:52:07 UTC |
| 3470ada | Shawn O. Pearce | 23 January 2008, 04:44:36 UTC | git-gui: Fallback to Tcl based po2msg.sh if msgfmt isn't available If msgfmt fails with exit code 127 that typically means the program is not found in the user's PATH and thus cannot be executed by make. In such a case we can try to fallback to the Tcl based po2msg program that we distributed with git-gui, as it does a "good enough" job. We still don't default to po2msg.sh however as it does not perform a lot of the sanity checks that msgfmt does, and quite a few of those are too useful to give up. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2008, 04:44:36 UTC |
| 3ddff72 | Shawn O. Pearce | 22 January 2008, 15:40:13 UTC | git-gui: Work around random missing scrollbar in revision list If the horizontal scrollbar isn't currently visible (because it has not been needed) but we get an update to the scroll port we may find the scrollbar window exists but the Tcl command doesn't. Apparently it is possible for Tk to have partially destroyed the scrollbar by removing the Tcl procedure name but still leaving the widget name in the window registry. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 23 January 2008, 04:37:15 UTC |
| 3b839fd | Eric Wong | 21 January 2008, 22:37:41 UTC | git-svn: default to repacking every 1000 commits This should reduce disk space usage when doing large imports. We'll be switching to "gc --auto" post-1.5.4 to handle repacking for us. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2008, 09:45:40 UTC |
| 4f5f998 | Junio C Hamano | 22 January 2008, 01:34:43 UTC | Clarify that http-push being temporarily disabled with older cURL Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2008, 08:48:29 UTC |
| 6fc7470 | Nicolas Pitre | 21 January 2008, 16:07:15 UTC | pack-objects: Fix segfault when object count is less than thread count When partitioning the work amongst threads, dividing the number of objects by the number of threads may return 0 when there are less objects than threads; this will cause the subsequent code to segfault when accessing list[sub_size-1]. Allow some threads to have zero objects to work on instead of barfing, while letting others to have more. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2008, 01:24:12 UTC |
| 9288bed | Alex Riesen | 21 January 2008, 20:53:25 UTC | Make t5710 more strict when creating nested repos The test 'creating too deep nesting' can fail even when cloning the repos, but is not its main purpose (it has to prepare nested repos and ensure the last one is invalid). So split the test into the creation and invalidity checking parts. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2008, 01:24:12 UTC |
| 97394ee | Gustaf Hendeby | 21 January 2008, 19:57:46 UTC | send-email, fix breakage in combination with --compose This fixes the subtile bug in git send-email that was introduced into git send-email with aa54892f5ada8282643dc7387b33261c7135d784 (send-email: detect invocation errors earlier), which caused no patches to be sent out if the --compose flag was used. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Tested-by: Seth Falcon <seth@userprimary.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2008, 01:24:12 UTC |
| 7422bac | Shawn O. Pearce | 21 January 2008, 04:37:01 UTC | Document the hairy gfi_unpack_entry part of fast-import Junio pointed out this part of fast-import wasn't very clear on initial read, and it took some time for someone who was new to fast-import's "dirty little tricks" to understand how this was even working. So a little bit of commentary in the proper place may help future readers. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2008, 09:04:12 UTC |
| bb23fdf | Shawn O. Pearce | 21 January 2008, 04:36:54 UTC | Teach fast-import to honor pack.compression and pack.depth We now use the configured pack.compression and pack.depth values within fast-import, as like builtin-pack-objects fast-import is generating a packfile for consumption by the Git tools. We use the same behavior as builtin-pack-objects does for these options, allowing core.compression to supply the default value for pack.compression. The default setting for pack.depth within fast-import is still 10 as users will generally repack fast-import generated packfiles by `repack -f`. A large delta depth within the fast-import packfile can significantly slow down such a later repack. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2008, 09:04:10 UTC |
| c4a95c9 | Steffen Prohaska | 21 January 2008, 06:41:27 UTC | submodule: Document the details of the command line syntax Only "status" accepts "--cached" and the preferred way of passing sub-command specific options is after the sub-command. The documentation is adapted to reflect this. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2008, 08:57:51 UTC |
| a2d93ae | Junio C Hamano | 15 January 2008, 11:13:55 UTC | git-submodule: add test for the subcommand parser fix This modifies the existing t7400 test to use 'init' as the pathname that a submodule is bound to. Without the earlier subcommand parser fix, this fails. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2008, 04:57:42 UTC |
| 5c08dbb | Junio C Hamano | 15 January 2008, 10:48:45 UTC | git-submodule: fix subcommand parser The subcommand parser of "git submodule" made its subcommand names reserved words. As a consequence, a command like this: $ git submodule add init update which is meant to add a submodule called 'init' at path 'update' was misinterpreted as a request to invoke more than one mutually incompatible subcommands and incorrectly rejected. This patch fixes the issue by stopping the subcommand parsing at the first subcommand word, to allow the sample command line above to work as expected. It also introduces the usual -- option disambiguator, so that a submodule at path '-foo' can be updated with $ git submodule update -- -foo without triggering an "unrecognized option -foo" error. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2008, 04:57:42 UTC |
| 23a485e | Junio C Hamano | 15 January 2008, 10:35:49 UTC | git-submodule: rename shell functions for consistency This renames the shell functions used in git-submodule that implement top-level subcommands. The rule is that the subcommand $foo is implemented by cmd_$foo function. A noteworthy change is that modules_list() is now known as cmd_status(). There is no "submodule list" command. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2008, 04:57:42 UTC |
| 36a189c | Junio C Hamano | 21 January 2008, 04:36:16 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Correct encoding of glossary/fr.po to UTF-8 git-gui: Consolidate hook execution code into a single function git-gui: Correct window title for hook failure dialogs git-gui: Honor the standard commit-msg hook | 21 January 2008, 04:36:16 UTC |
| 6caaf2d | Shawn O. Pearce | 21 January 2008, 04:03:23 UTC | git-gui: Correct encoding of glossary/fr.po to UTF-8 Junio noticed this was incorrectly added in ISO-8859-1 but it should be in UTF-8 (as the headers claim UTF-8, and our convention is to use only UTF-8). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 January 2008, 04:03:23 UTC |
| ed76cb7 | Shawn O. Pearce | 20 January 2008, 19:46:59 UTC | git-gui: Consolidate hook execution code into a single function The code we use to test if a hook is executable or not differs on Cygwin from the normal POSIX case. Rather then repeating that for all three hooks we call in our commit code path we can place the common logic into a global procedure and invoke it when necessary. This also lets us get rid of the ugly "|& cat" we were using before as we can now rely on the Tcl 8.4 feature of "2>@1" or fallback to the "|& cat" when necessary. The post-commit hook is now run through the same API, but its outcome does not influence the commit status. As a result we now show any of the errors from the post-commit hook in a dialog window, instead of on the user's tty that was used to launch git-gui. This resolves a long standing bug related to not getting errors out of the post-commit hook when launched under git-gui. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 January 2008, 03:45:38 UTC |
