| 31e0b2c | Junio C Hamano | 23 February 2008, 19:31:04 UTC | GIT 1.5.4.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2008, 19:31:04 UTC |
| e98d6df | Junio C Hamano | 23 February 2008, 19:23:59 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Focus insertion point at end of strings in repository chooser git-gui: Avoid hardcoded Windows paths in Cygwin package files git-gui: Default TCL_PATH to same location as TCLTK_PATH git-gui: Paper bag fix error dialogs opening over the main window git-gui: Ensure error dialogs always appear over all other windows git-gui: relax "dirty" version detection git-gui: support Git Gui.app under OS X 10.5 | 23 February 2008, 19:23:59 UTC |
| 9ea0980 | Jeff King | 22 February 2008, 19:47:27 UTC | hash: fix lookup_hash semantics We were returning the _address of_ the stored item (or NULL) instead of the item itself. While this sort of indirection is useful for insertion (since you can lookup and then modify), it is unnecessary for read-only lookup. Since the hash code splits these functions between the internal lookup_hash_entry function and the public lookup_hash function, it makes sense for the latter to provide what users of the library expect. The result of this was that the index caching returned bogus results on lookup. We unfortunately didn't catch this because we were returning a "struct cache_entry **" as a "void *", and accidentally assigning it to a "struct cache_entry *". As it happens, this actually _worked_ most of the time, because the entries were defined as: struct cache_entry { struct cache_entry *next; ... }; meaning that interpreting a "struct cache_entry **" as a "struct cache_entry *" would yield an entry where all fields were totally bogus _except_ for the next pointer, which pointed to the actual cache entry. When walking the list, we would look at the bogus "name" field, which was unlikely to match our lookup, and then proceed to the "real" entry. The reading of bogus data was silently ignored most of the time, but could cause a segfault for some data (which seems to be more common on OS X). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2008, 21:39:20 UTC |
| 3baee1f | Shawn O. Pearce | 11 February 2008, 05:53:52 UTC | git-gui: Focus insertion point at end of strings in repository chooser When selecting a local working directory for a new repository or a location to clone an existing repository into we now set the insert point at the end of the selected path, allowing the user to type in any additional parts of the path if they so desire. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:39:36 UTC |
| df4ec4c | Shawn O. Pearce | 22 February 2008, 00:27:46 UTC | git-gui: Avoid hardcoded Windows paths in Cygwin package files When we are being built by the Cygwin package maintainers we need to embed the POSIX path to our library files and not the Windows path. Embedding the Windows path means all end-users who install our Cygwin package would be required to install Cygwin at the same Windows path as the package maintainer had Cygwin installed to. This requirement is simply not user-friendly and may be infeasible for a large number of our users. We now try to auto-detect if the Tcl/Tk binary we will use at runtime is capable of translating POSIX paths into Windows paths the same way that cygpath does the translations. If the Tcl/Tk binary gives us the same results then it understands the Cygwin path translation process and should be able to read our library files from a POSIX path name. If it does not give us the same answer as cygpath then the Tcl/Tk binary might actually be a native Win32 build (one that is not linked against Cygwin) and thus requires the native Windows path to our library files. We can assume this is not a Cygwin package as the Cygwin maintainers do not currently ship a pure Win32 build of Tcl/Tk. Reported on the git mailing list by Jurko Gospodnetić. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:38:32 UTC |
| 651fbba | Shawn O. Pearce | 22 February 2008, 00:17:27 UTC | git-gui: Default TCL_PATH to same location as TCLTK_PATH Most users set TCLTK_PATH to tell git-gui where to find wish, but they fail to set TCL_PATH to the same Tcl installation. We use the non-GUI tclsh during builds so headless systems are still able to create an index file and create message files without GNU msgfmt. So it matters to us that we find a working TCL_PATH at build time. If TCL_PATH hasn't been set yet we can take a better guess about what tclsh executable to use by replacing 'wish' in the executable path with 'tclsh'. We only do this replacement on the filename part of the path, just in case the string "wish" appears in the directory paths. Most of the time the tclsh will be installed alongside wish so this replacement is a sensible and safe default. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:35:44 UTC |
| 85ec3e7 | Shawn O. Pearce | 21 February 2008, 17:22:08 UTC | git-gui: Paper bag fix error dialogs opening over the main window If the main window is the only toplevel we have open then we don't have a valid grab right now, so we need to assume the best toplevel to use for the parent is ".". Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 22 February 2008, 06:35:23 UTC |
| aba15f7 | Shawn O. Pearce | 21 February 2008, 04:37:07 UTC | git-gui: Ensure error dialogs always appear over all other windows If we are opening an error dialog we want it to appear above all of the other windows, even those that we may have opened with a grab to make the window modal. Failure to do so may allow an error dialog to open up (and grab focus!) under an existing toplevel, making the user think git-gui has frozen up and is unresponsive, as they cannot get to the dialog. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 21 February 2008, 04:39:32 UTC |
| 0ca15e7 | Pekka Kaitaniemi | 20 February 2008, 22:29:39 UTC | Clarified the meaning of git-add -u in the documentation The git-add documentation did not state clearly that the -u switch updates only the tracked files that are in the current directory and its subdirectories. Signed-off-by: Pekka Kaitaniemi <kaitanie@cc.helsinki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2008, 00:08:48 UTC |
| 5274ba6 | Gerrit Pape | 20 February 2008, 15:10:17 UTC | git-clone.sh: properly configure remote even if remote's head is dangling When cloning a remote repository which's HEAD refers to a nonexistent ref, git-clone cloned all existing refs, but failed to write the configuration for 'remote'. Now it detects the dangling remote HEAD, refuses to checkout any local branch since HEAD refers to nowhere, but properly writes the configuration for 'remote', so that subsequent 'git fetch's don't fail. The problem was reported by Daniel Jacobowitz through http://bugs.debian.org/466581 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 19:31:17 UTC |
| fbd538c | Miklos Vajna | 20 February 2008, 11:31:35 UTC | Documentation/git-stash: document options for git stash list Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 19:23:58 UTC |
| 1ca3d6e | Jay Soffian | 20 February 2008, 05:55:07 UTC | send-email: squelch warning due to comparing undefined $_ to "" The check to see if initial_reply_to is defined was also comparing $_ to "" for a reason I cannot ascertain (looking at the commit which made the change didn't provide enlightenment), but if $_ is undefined, perl generates a warning. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 10:47:54 UTC |
| 7c33d3a | Kristian Høgsberg | 18 February 2008, 23:11:21 UTC | Rename git-core rpm to just git and rename the meta-pacakge to git-all. This fixes my favorite annoyance with the git rpm packaging: don't pull in tla when I say yum install git! You wouldn't expect yum install gcc to pull in gcc-gfortran, right? With this change, and blanket 'yum update' will automatically pull in the new 'git' package and push out the old 'git-core', and if the old 'git' package was installed 'git-all' will be pulled in instead. A couple of things do break though: 'yum update git-core', because yum behaves differently when given a specific package name - it doesn't follow obsoletes. Instead, 'yum install git' will pull in the new git rpm, which will then push out the old 'git-core'. Similarly, to get the newest version of the meta package, 'yum install git-all' will install git-all, which then pushes out the old 'git' meta package. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 06:17:22 UTC |
| 066a526 | Jeff King | 19 February 2008, 16:26:45 UTC | push: document the status output The output was meant to be a balance of self-explanatory and terse. In case we have erred too far on the terse side, it doesn't hurt to explain in more detail what each line means. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 04:46:15 UTC |
| 68d06c5 | Jeff King | 19 February 2008, 16:25:22 UTC | Documentation/push: clarify matching refspec behavior The previous text was correct, but it was easy to miss the fact that we are talking about "matching" refs. That is, the text can be parsed as "we push the union of the sets of remote and local heads" and not "we push the intersection of the sets of remote and local heads". (The former actually doesn't make sense if you think about it, since we don't even _have_ some of those heads). A careful reading would reveal the correct meaning, but it makes sense to be as explicit as possible in documentation. We also explicitly use and introduce the term "matching"; this is a term discussed on the list, and it seems useful to for users to be able to refer to this behavior by name. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 04:46:10 UTC |
| 2b8130c | Jeff King | 19 February 2008, 16:25:01 UTC | push: indicate partialness of error message The existing message indicates that an error occured during push, but it is unclear whether _any_ refs were actually pushed (even though the status table above shows which were pushed successfully and which were not, the message "failed to push" implies a total failure). By indicating that "some refs" failed, we hopefully indicate to the user that the table above contains the details. We could also put in an explicit "see above for details" message, but it seemed to clutter the output quite a bit (both on a line of its own, or at the end of the error line, which inevitably wraps). This could also be made more fancy if the transport mechanism passed back more details on how many refs succeeded and failed: error: failed to push %d out of %d refs to '%s' Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2008, 04:44:47 UTC |
| 2c2a378 | Wincent Colaiuta | 18 February 2008, 08:36:33 UTC | git-gui: relax "dirty" version detection "git gui" would complain at launch if the local version of Git was "1.5.4.2.dirty". Loosen the regular expression to look for either "-dirty" or ".dirty", thus eliminating spurious warnings. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 20 February 2008, 01:50:29 UTC |
| 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 |
| 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 |
