| e5fc9a0 | Junio C Hamano | 17 February 2008, 06:44:31 UTC | GIT 1.5.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2008, 08:20:38 UTC |
| 965053b | Pieter de Bie | 16 February 2008, 16:48:46 UTC | Documentation/git-reset: Add an example of resetting selected paths Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 18:57:05 UTC |
| ceb4cac | Pieter de Bie | 16 February 2008, 16:48:45 UTC | Documentation/git-reset: don't mention --mixed for selected-paths reset The option is accepted, but that is the only form selected-paths variant of the reset command takes, so there is no point mentioning it. And while we're at it, use the dashless git call. Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 18:56:24 UTC |
| 3983caa | Junio C Hamano | 16 February 2008, 18:38:12 UTC | Documentation/git-reset: Since 3368d11 (Remove unnecessary git-rm --cached reference from status output), the status output marks the "Added but not yet committed" section as "Changes to be committed". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 18:51:46 UTC |
| 959ba67 | Jeff King | 14 February 2008, 17:18:23 UTC | commit: discard index after setting up partial commit There may still be some entries from the original index that should be discarded before we show the status. In particular, if a file was added in the index but not included in the partial commit, it would still show up in the status listing as staged for commit. Ultimately the correct fix is to keep the two states in separate index_state variables. Then we can avoid having to reload the cache from the temporary file altogether, and just point wt_status_print at the correct index. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 08:12:56 UTC |
| 1fe32cb | Junio C Hamano | 16 February 2008, 07:57:26 UTC | filter-branch: handle filenames that need quoting The command used a very old fashioned construct to extract filenames out of diff-index and ended up corrupting the output. We can simply use --name-only and pipe into --stdin mode of update-index. It's been like that for the past 2 years or so since a94d994 (update-index: work with c-quoted name). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 07:57:26 UTC |
| 0ef617f | Junio C Hamano | 16 February 2008, 04:30:05 UTC | diff: Fix miscounting of --check output c1795bb (Unify whitespace checking) incorrectly made the checking function return without incrementing the line numbers when there is no whitespace problem is found on a '+' line. This resurrects the earlier behaviour. Noticed and reported by Jay Soffian. The test script was stolen from Jay's independent fix. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 07:06:57 UTC |
| 13bf1a9 | Stelian Pop | 15 February 2008, 21:20:44 UTC | hg-to-git: fix parent analysis Fix a bug in the hg-to-git convertor introduced by commit 1bc7c13af9f936aa80893100120b542338a10bf4: when searching the changeset parents, 'hg log' returns an extra space at the end of the line, which confuses the .split(' ') based tokenizer: Traceback (most recent call last): File "hg-to-git.py", line 123, in <module> hgchildren[mparent] += ( str(cset), ) KeyError: '' Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 07:01:49 UTC |
| 87f1b88 | Jay Soffian | 15 February 2008, 21:53:36 UTC | mailinfo: feed only one line to handle_filter() for QP input The function is intended to be fed one logical line at a time to inspect, but a QP encoded raw input line can have more than one lines, just like BASE64 encoded one. Quoting LF as =0A may be unusual but RFC2045 allows it. The issue was noticed and fixed by Jay Soffian. JC added a test to protect the fix from regressing later. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 06:16:34 UTC |
| b20a60d | Christian Couder | 16 February 2008, 05:02:17 UTC | diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver" Also use "git_config_string" to simplify code where "cmd" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:54 UTC |
| dfb068b | Christian Couder | 16 February 2008, 05:01:59 UTC | Add "const" qualifier to "char *excludes_file". Also use "git_config_string" to simplify "config.c" code where "excludes_file" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:54 UTC |
| ee9601e | Christian Couder | 16 February 2008, 05:01:41 UTC | Add "const" qualifier to "char *editor_program". Also use "git_config_string" to simplify "config.c" code where "editor_program" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:53 UTC |
| 872da32 | Christian Couder | 16 February 2008, 05:01:11 UTC | Add "const" qualifier to "char *pager_program". Also use "git_config_string" to simplify "config.c" code where "pager_program" is set. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:53 UTC |
| ea5105a | Christian Couder | 16 February 2008, 05:00:24 UTC | config: add 'git_config_string' to refactor string config variables. In many places we just check if a value from the config file is not NULL, then we duplicate it and return 0. This patch introduces the new 'git_config_string' function to do that. This function is also used to refactor some code in 'config.c'. Refactoring other files is left for other patches. Also not all the code in "config.c" is refactored, because the function takes a "const char **" as its first parameter, but in many places a "char *" is used instead of a "const char *". (And C does not allow using a "char **" instead of a "const char **" without a warning.) Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:53 UTC |
| 2c77821 | Christian Couder | 16 February 2008, 04:59:53 UTC | diff.c: remove useless check for value != NULL It is not necessary to check if value != NULL before calling 'parse_lldiff_command' as there is already a check inside this function. By the way this patch also improves the existing check inside 'parse_lldiff_command' by using: return config_error_nonbool(var); instead of: return error("%s: lacks value", var); Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 05:24:53 UTC |
| e8b32e0 | Shawn O. Pearce | 14 February 2008, 06:34:34 UTC | fast-import: check return value from unpack_entry() If the tree object we have asked for is deltafied in the packfile and the delta did not apply correctly or was not able to be decompressed from the packfile then we can get back NULL instead of the tree data. This is (part of) the reason why read_sha1_file() can return NULL, so we need to also handle it the same way. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2008, 04:11:51 UTC |
| df93e33 | Daniel Barkalow | 15 February 2008, 19:14:18 UTC | Validate nicknames of remote branches to prohibit confusing ones The original problem was that the parsers for configuration files were getting confused by seeing as nicknames remotes that involved directory-changing characters. In particular, the branches config file for ".." was particularly mystifying on platforms that can open directories and read odd data from them. The validation function was written by Junio Hamano (with a typo corrected). Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2008, 22:23:22 UTC |
| 8ca496e | Christian Couder | 14 February 2008, 05:50:00 UTC | diff.c: replace a 'strdup' with 'xstrdup'. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2008, 22:11:28 UTC |
| 5880711 | Junio C Hamano | 15 February 2008, 17:37:54 UTC | diff.c: fixup garding of config parser from value=NULL Christian Couder noticed that there still were a handcrafted error() call that we should have converted to config_error_nonbool() where parse_lldiff_command() parses the configuration file. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2008, 17:37:54 UTC |
| d8e8757 | Christian Couder | 07 February 2008, 05:23:46 UTC | config: add test cases for empty value and no value config variables. 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> | 13 February 2008, 22:23:32 UTC |
| 9386ecb | Gerrit Pape | 07 February 2008, 09:36:10 UTC | cvsimport: have default merge regex also match beginning of commit message The default value of @mergerx uses \W, which matches a non-word character; this means that commit messages like "Merging FOO" are not matched by default; using \b, which matches a word boundary, instead of \W fixes that. This change was suggested by Frédéric Brière through http://bugs.debian.org/463468 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 22:22:54 UTC |
| 8466887 | Miklos Vajna | 12 February 2008, 00:12:57 UTC | git clone -s documentation: force a new paragraph for the NOTE It should be loud and clear. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 22:15:44 UTC |
| ff58b9a | Jeff King | 12 February 2008, 05:45:18 UTC | status: suggest "git rm --cached" to unstage for initial commit It makes no sense to suggest "git reset HEAD" since we have no HEAD commit. This actually used to work but regressed in f26a0012. wt_status_print_cached_header was updated to take the whole wt_status struct rather than just the reference field. Previously the various code paths were sometimes sending in s->reference and sometimes sending in NULL, making the decision on whether this was an initial commit before we even got to this function. Now we must check the initial flag here. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2008, 21:54:58 UTC |
| 077b725 | Junio C Hamano | 13 February 2008, 21:13:21 UTC | Protect get_author_ident_from_commit() from filenames in work tree 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> | 13 February 2008, 21:43:02 UTC |
| 04b3305 | Johannes Sixt | 12 February 2008, 11:28:01 UTC | upload-pack: Initialize the exec-path. 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> | 13 February 2008, 20:04:01 UTC |
| f454cdc | Johannes Schindelin | 12 February 2008, 19:50:57 UTC | bisect: use verbatim commit subject in the bisect log 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> | 13 February 2008, 20:03:49 UTC |
| 8608b33 | Sergei Organov | 13 February 2008, 14:31:17 UTC | git-cvsimport.txt: fix '-M' description. 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> | 13 February 2008, 19:08:41 UTC |
| 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 |
| 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 |
