| a41e45e | Shawn O. Pearce | 16 January 2008, 06:29:39 UTC | git-gui: Refresh file status description after hunk application If we apply a hunk in either direction this may change the file's status. For example if a file is completely unstaged, and has at least two hunks in it and the user stages one hunk the file will change from "Modified, not staged" to "Portions staged for commit". Resetting the file path causes our trace on this variable to fire; that trace is used to update the file header in the diff viewer to the file's current status. Noticed by Johannes Sixt. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 06:29:39 UTC |
| d36a8f7 | Shawn O. Pearce | 16 January 2008, 06:14:42 UTC | git-gui: Allow 'Create New Repository' on existing directories Often users setup a few source files and get a project rolling before they create a Git repository for it. In such cases the core Git tools allow users to initialize a new repository by simply running `git init` at the desired root level directory. We need to allow the same situation in git-gui; if the user is trying to make a new repository we should let them do that to any location they chose. If the directory already exists and already has files contained within it we still should allow the user to create a repository there. However we still need to disallow creating a repository on top of an existing repository. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 06:14:42 UTC |
| daaa958 | Christian Couder | 16 January 2008, 05:51:40 UTC | git-gui: Initial french translation Here are some of the choices made to translate Git Gui to french: - commit -> "commit" (noun) or "commiter" (verb) - stage (index) -> "pré-commit" (noun) or "pré-commiter" (verb) - (re)scan -> "(re)synchroniser" - reset -> "réinitialiser" - checkout -> "emprunt" (noun) or "emprunter" (verb) - revision expression -> "expression de révison" I am not completely happy with these, but it's a start... [sp: Inserted a missing LF in message on line 466] Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 06:01:19 UTC |
| d71b565 | Christian Stimming | 15 January 2008, 19:41:39 UTC | git-gui: Improve German translation. Change translation of "clone" back to "klonen" because "kopieren" is a much broader term than this particular git action. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 05:50:20 UTC |
| 10899a8 | Peter Karlsson | 12 January 2008, 08:28:57 UTC | git-gui: Updated Swedish translation after mailing list review. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 05:50:10 UTC |
| d454460 | Christian Stimming | 08 January 2008, 20:21:15 UTC | git-gui: Fix broken revert confirmation. I broke this extremely cool feature in 1ac17950, but it is rather easy to fix this. Sorry for that. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 05:44:14 UTC |
| 898ff9e | Christian Stimming | 07 January 2008, 21:00:25 UTC | git-gui: Update German translation "revert" translated as "verwerfen". "hunk" translated as "Kontext". Several menu items reworded to be shorter. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 05:42:41 UTC |
| b3125ad | Christian Stimming | 07 January 2008, 20:48:55 UTC | git-gui: Update glossary: add term "hunk" Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 16 January 2008, 05:42:37 UTC |
| 4439751 | Kristian Høgsberg | 15 January 2008, 20:00:02 UTC | git-commit: fix double close(2) that can close a wrong file descriptor The codepath to prepare index files for the temporary and next index file was closing file descriptor it obtained from the lockfile API by hand, without letting the API know that the fd should not be doubly closed. This is not usually a problem (except it may get EBADFD) but if we opened another fd for an entirely unrelated purpose (say, an fd used to mmap a packfile) between the time we close the fd to the index file and the time we commit or rollback the lockfile (causing it to also try closing the recorded fd), the lockfile API will close an incorrect file descriptor that is still used for an entirely unrelated purpose. There's four close(fd) calls in prepare_index() and they're all incorrect. The open fd's are cleaned up in rollback_index_files() and shouldn't be closed manually. The patch below gets rid of the extra close() calls and should fix the problem. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 January 2008, 01:33:53 UTC |
| 1bc7c13 | Mark Drago | 15 January 2008, 01:11:19 UTC | hg-to-git: improve popen calls This patch improves all of the popen calls in hg-to-git.py by specifying the template 'hg log' should use instead of calling 'hg log' and grepping for the desired data. Signed-off-by: Mark Drago <markdrago@gmail.com> Acked-by: Stelian Pop <stelian@popies.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 January 2008, 01:24:29 UTC |
| 3e34526 | Miklos Vajna | 15 January 2008, 20:34:54 UTC | ls-remote: add -t and -h options. These options are listed in the manpage (aliases for --tags/--heads) but they were not handled. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 January 2008, 01:04:21 UTC |
| 4e67387 | Junio C Hamano | 15 January 2008, 04:01:21 UTC | Squelch bogus progress output from git-rebase--interactive The command repeats "Rebasing (1/1)" many times even when there is only one task remaining, because mark_action_done() is called to skip comment and empty lines in the TODO file. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2008, 04:04:02 UTC |
| 471a5ce | Miklos Vajna | 15 January 2008, 00:35:02 UTC | Add using merge subtree How-To Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2008, 02:04:51 UTC |
| 11c57e6 | Junio C Hamano | 14 January 2008, 23:10:38 UTC | Fix git-rerere documentation rerere.enabled is _not_ on by default. The command is enabled if rr-cache exists even when rerere.enabled is missing, and enabled or disabled by explicitly setting the rerere.enabled variable. | 15 January 2008, 00:14:29 UTC |
| e87e22d | Junio C Hamano | 14 January 2008, 21:54:24 UTC | Revert "builtin-commit.c: remove useless check added by faulty cut and paste" This reverts commit 16335fdd7ace78a8285ba25fd7a81177a48e7c9b. We are calling overlay_tree_on_cache() which does use CE_UPDATE flag to mark duplicated entries, which is the same as the codepath in git-ls-files with its --with-tree option. Because the pathname ce->name is given to path_list_insert() which does not allow duplicates, there is no breakage either way from the correctness point of view in this codepath, unlike the one in ls-files. But avoiding unnecessary processing with a single bit check is certainly better. | 14 January 2008, 21:54:24 UTC |
| c60b528 | Jean-Luc Herren | 14 January 2008, 21:47:42 UTC | Make default pre-commit hook less noisy This hook thought to have found a conflict marker any time it saw a 7-character combination of any of the characters '<>=' at the beginning of a line, whereas it should only look for the *same* character to appear repeatedly. Also, restrict it to match exactly 7 times, to avoid matching the underlining with '='-characters often used in documentation. Signed-off-by: Jean-Luc Herren <jlh@gmx.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2008, 21:52:27 UTC |
| cfc44a1 | Dan McGee | 14 January 2008, 04:51:10 UTC | cvsimport: remove last use of repo-config from git standard tools git cvsimport was the last tool to use repo-config instead of config. Update it to use plain git config. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2008, 05:48:22 UTC |
| 22fa97d | Dan McGee | 14 January 2008, 04:51:01 UTC | Remove usage of git- (dash) commands from email hook Switch all git command calls to use the git (space) command format, and remove the use of git-repo-config in place of git config. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 January 2008, 05:48:20 UTC |
| 16335fd | Junio C Hamano | 13 January 2008, 10:38:46 UTC | builtin-commit.c: remove useless check added by faulty cut and paste 2888605c649ccd423232161186d72c0e6c458a48 (builtin-commit: fix partial-commit support) mindlessly cut and pasted from builtin-ls-files.c, and included a part that was meant to exclude redundant path after "ls-files --with-tree" overlayed the HEAD commit on top of the index. This logic does not apply to what git-commit does and should not have been copied, even though it would not hurt. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2008, 23:20:31 UTC |
| 646f3a1 | Johannes Schindelin | 11 January 2008, 12:39:33 UTC | [PATCH] gitk: make Ctrl "+" really increase the font size Only Ctrl "=" was bound to increase the font size, probably because English keyboards have the plus on the same key as the equal sign. However, not the whole world is English, and at least with some other keyboard layouts, Ctrl "+" did not work as documented. Noticed by Stephan Hennig. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 13 January 2008, 21:55:04 UTC |
| fa9dcf8 | Linus Torvalds | 13 January 2008, 08:30:56 UTC | Fix performance regression for partial commits When running "git commit paths" to create a partial commit, we used to carefully build the temporary index so that we do not lose the cached stat information. The rewrite of the command in C lost it by carelessly using read_tree(). This resurrects the earlier behaviour to keep the cached stat information as much as possible by using one-tree merge logic. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2008, 08:30:56 UTC |
| a8db80c | Jeff King | 12 January 2008, 09:04:32 UTC | git-clean: fix off-by-one memory access when given no arguments The "seen" variable is used by match_pathspec, and must have as many elements as there are in the given pathspec. We create the pathspec either from the command line arguments _or_ from just the current prefix. Thus allocating "seen" based upon just argc is wrong, since if argc == 0, then we still have one pathspec, the prefix, but we don't allocate any space in "seen". Signed-off-by: Jeff King <peff@peff.net> Tested-by: İsmail Dönmez <ismail@pardus.org.tr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2008, 19:10:09 UTC |
| 98fa5b6 | Eric Wong | 12 January 2008, 07:13:55 UTC | git-svn: handle leading/trailing whitespace from svnsync revprops Repositories generated by svnsync cannot be relied on to have properly set revprops without newlines in UUIDs and URLs. There may be broken versions of svnsync out there that append extra newlines to UUIDs, or the revprops could've been changed by repository administrators at any time, too. At least one repository we've come across has an embedded newline erroneously set in the svnsync-uuid prop. This is bad because the trailing newline is taken as another record by the Git.pm library, and the wantarray detection causes tmp_config() to return an array with an empty-but-existing second element. We will now strip leading and trailing whitespace both before setting and after reading the uuid and url for svnsync values. We will also force tmp_config to return a single scalar when reading existing values. SVN UUIDs should never have whitespace in them, and SVN repository URLs should be URI-escaped, so neither of those values we ever see in git-svn should actually have whitespace in them. Thanks to Dennis Schridde for the bug report and Junio for helping diagnose this. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2008, 18:58:06 UTC |
| 145d082 | Junio C Hamano | 12 January 2008, 05:14:39 UTC | GIT 1.5.4-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2008, 05:40:55 UTC |
| a5d7e3a | Junio C Hamano | 12 January 2008, 05:40:15 UTC | RPM spec: include gitk message files. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2008, 05:40:25 UTC |
| d3c2d9e | Brandon Casey | 11 January 2008, 18:14:19 UTC | git-relink.txt: describe more clearly how hard linking occurs Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2008, 02:06:55 UTC |
| 80cd9cf | Michele Ballabio | 11 January 2008, 21:11:13 UTC | Document some default values in config.txt This documents the default values of gc.auto, gc.autopacklimit fetch.unpacklimit, receive.unpacklimit and transfer.unpacklimit. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2008, 00:06:43 UTC |
| 887ad79 | Junio C Hamano | 11 January 2008, 08:51:30 UTC | Merge ../gitk * ../gitk: gitk: Update German translation. gitk: Fix typo in user message. gitk: Fix the Makefile to cope with systems lacking msgfmt | 11 January 2008, 08:51:30 UTC |
| 7d8856d | Christian Stimming | 09 January 2008, 21:21:58 UTC | gitk: Update German translation. Now 100% complete (163 strings). Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2008, 08:51:13 UTC |
| 55e3443 | Christian Stimming | 09 January 2008, 21:23:18 UTC | gitk: Fix typo in user message. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2008, 08:51:13 UTC |
| 66e15a6 | Charles Bailey | 09 January 2008, 14:31:09 UTC | gitk: Fix the Makefile to cope with systems lacking msgfmt The po2msg.sh script and the .gitignore in the po directory have been shamelessly copied from the current git-gui. This enables the top level "make NO_MSGFMT" to work consistently for git across the git-gui and gitk sub-projects. This is the same effective patch that has previously been posted as a git.git patch which more succinctly described the copying of po/.gitignore and po/po2msg.sh from git-gui. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2008, 08:51:08 UTC |
| 8c3c7b2 | Junio C Hamano | 11 January 2008, 07:26:09 UTC | pack-objects: remove redundant and wrong call to deflateEnd() We somehow called deflateEnd() on a stream that we have called deflateEnd() on already. In fact, the second deflateEnd() has always been returning Z_STREAM_ERROR. We just never checked the error return from that particular deflateEnd(). The first one returns 0 for success. We might want to tighten the check even more to check that. Noticed by Marco. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2008, 07:27:39 UTC |
| 95693d4 | Jim Meyering | 10 January 2008, 08:54:25 UTC | bundle, fast-import: detect write failure I noticed some unchecked writes. This fixes them. * bundle.c (create_bundle): Die upon write failure. * fast-import.c (keep_pack): Die upon write or close failure. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2008, 09:08:11 UTC |
| 35cda06 | Kevin Ballard | 09 January 2008, 06:37:20 UTC | Trim leading / off of paths in git-svn prop_walk prop_walk adds a leading / to all subdirectory paths. Unfortunately this causes a problem when the remote repo lives in a subdirectory itself, as the leading / causes subsequent PROPFIND calls to be executed on the wrong path. Trimming the / before calling the PROPFIND fixes this problem. Signed-off-by: Kevin Ballard <kevin@sb.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2008, 22:56:49 UTC |
| 08359b0 | Johannes Schindelin | 09 January 2008, 11:39:54 UTC | shortlog: mention the "-e" option in the usage Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2008, 20:25:27 UTC |
| fe2128a | Florian La Roche | 09 January 2008, 16:05:16 UTC | Change git-gc documentation to reflect gc.packrefs implementation. 56752391a8c0c591853b276e4fa0b45c34ced181 (Make "git gc" pack all refs by default) changed the default of gc.packrefs to true, to pack all refs by default in any repository. IOW, the users need to disable it explicitly if they want to by setting the config variable, since 1.5.3. However, we forgot to update the documentation. This fixes it. Signed-off-by: Florian La Roche <laroche@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2008, 20:25:24 UTC |
| 13e4760 | Johannes Sixt | 08 January 2008, 16:24:53 UTC | recv_sideband: Do not use ANSI escape sequence on dumb terminals. The "clear to end of line" sequence is used to nicely output the progress indicator without leaving garbage on the terminal. However, this works only on ANSI capable terminals. We use the same check as in color.c to find out whether the terminal supports this feature and use a workaround (a few spaces in a row) if it does not. [jc: as an old fashoned git myself, and given the fact that the possible prefix and suffix are small number of short constant strings, I actually prefer a simpler-and-more-stupid approach. This is with Nico's clean-up.] Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2008, 20:23:59 UTC |
| f85fd3f | Junio C Hamano | 09 January 2008, 06:41:15 UTC | Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk * 'master' of git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: use user-configured background in view definition dialog [PATCH] gitk: Update German translation [PATCH] gitk: Update and fix Makefile gitk: Restore some widget options whose defaults changed in Tk 8.5 gitk: Recode de.po to UTF-8 [PATCH] gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8. [PATCH] gitk i18n: More markup -- various options menus [PATCH] gitk i18n: Initial German translation [PATCH] gitk i18n: Markup several strings for translation [PATCH] gitk i18n: Import msgcat for message string translation; load translation catalogs [PATCH] gitk i18n: Add Makefile with rules for po file creation and installation | 09 January 2008, 06:41:15 UTC |
| f0c8426 | Gerrit Pape | 09 January 2008, 03:19:47 UTC | [PATCH] gitk: use user-configured background in view definition dialog Have the text fields in the view definition dialog (View->New view...) use the background color as configured through the preferences, instead of hard-coded 'white'. This was suggested by Paul Wise through http://bugs.debian.org/457124 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 09 January 2008, 03:19:47 UTC |
| 9e8ad09 | Christian Stimming | 09 January 2008, 03:13:22 UTC | [PATCH] gitk: Update German translation Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 09 January 2008, 03:13:22 UTC |
| 73c4f22 | Christian Stimming | 09 January 2008, 03:12:18 UTC | [PATCH] gitk: Update and fix Makefile This Makefile uses the template provided at git.git/gitk-git/Makefile by Junio and adds the rules for the i18n files. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 09 January 2008, 03:12:18 UTC |
| ef40b3e | Alexandre Julliard | 08 January 2008, 13:49:09 UTC | git.el: Make status refresh faster. Don't set the needs-refresh flag when inserting a new file info, since ewoc refreshes it upon insert already; this makes a full refresh twice as fast. Also make git-fileinfo-prettyprint a little faster by not retrieving permission values twice. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2008, 00:17:44 UTC |
| 58152a0 | Alexandre Julliard | 08 January 2008, 13:46:22 UTC | git.el: Refresh files from their real state upon commit. Instead of just setting the state to up-to-date, retrieve the full state again, so that the file type can be displayed properly. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2008, 00:17:44 UTC |
| 87e3d81 | Alexandre Julliard | 08 January 2008, 13:45:46 UTC | git.el: Make sure we never insert the same file twice. Skip non-zero stage files during git-ls-files -c, they are handled later. Also fix git-insert-info-list to merge duplicate file names. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2008, 00:17:44 UTC |
| d8c3794 | Junio C Hamano | 08 January 2008, 23:46:18 UTC | "git-apply --check" should not report "fixed" When running "git apply --check" while --whitespace=fix is enabled (either from the command line or via the configuration), we reported that "N line(s) applied after _fixing_", but --check by itself does not apply and this message was alarming. We could even reword the message to say "N line(s) would have been applied after fixing...", but this patch does not go that far. Instead, we just make it use the "N lines add whitespace errors" warning, which happens to be a good diagnostic message a user would expect from the --check option. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2008, 00:15:01 UTC |
| e708af6 | Junio C Hamano | 08 January 2008, 07:39:02 UTC | Merge in GIT 1.5.3.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2008, 08:58:33 UTC |
| aadd4ef | Junio C Hamano | 08 January 2008, 06:41:43 UTC | GIT 1.5.3.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2008, 06:41:43 UTC |
| 983a9ee | Christian Couder | 08 January 2008, 03:55:14 UTC | Documentation: config: add 'help.*' and 'instaweb.*' variables. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2008, 06:23:58 UTC |
| 2e8fd78 | Rogan Dawes | 07 January 2008, 07:37:38 UTC | Allow git-mergetool to handle paths with a leading space Signed-off-by: Rogan Dawes <rogan@dawes.za.net> | 08 January 2008, 05:00:54 UTC |
| eee8a17 | Eric Wong | 07 January 2008, 10:40:40 UTC | git-svn: clarify the "Ignoring error from SVN" piece I've heard of several users puzzled by this, and it sometimes it appears as if git-svn is doing nothing on slower connections and larger repositories. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2008, 00:25:31 UTC |
| f5530b8 | Eric Wong | 12 November 2007, 07:37:42 UTC | git-svn: support for funky branch and project names over HTTP(S) SVN requires that paths be URI-escaped for HTTP(S) repositories. file:// and svn:// repositories do not need these rules. Additionally, accessing individual paths inside repositories (check_path() and get_log() do NOT require escapes to function and in fact it breaks things). Noticed-by: Michael J. Cohen <mjc@cruiseplanners.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 23:18:37 UTC |
| 7ec4395 | Nicolas Pitre | 07 January 2008, 21:05:22 UTC | slightly better auto gc message Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 22:02:25 UTC |
| f1cdcc7 | Ralf Wildenhues | 07 January 2008, 21:43:27 UTC | Documentation: typofix Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 22:02:00 UTC |
| b2e62a7 | Junio C Hamano | 07 January 2008, 06:20:40 UTC | Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 06:46:13 UTC |
| 2370781 | Junio C Hamano | 02 January 2008, 09:50:11 UTC | diff: do not chomp hunk-header in the middle of a character We truncate hunk-header line at 80 bytes, but that 80th byte could be in the middle of a character, which is bad. This uses pick_one_utf8_char() function to make sure we do not cut a character in the middle. This assumes that the internal representation of the text is UTF-8. This needs to be extended in the future but the optimal direction has not been decided yet. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 06:44:44 UTC |
| 44b25b8 | Junio C Hamano | 02 January 2008, 09:49:58 UTC | utf8_width(): allow non NUL-terminated input The original interface assumed that the input string is always terminated with a NUL, but that wasn't too useful. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 04:53:46 UTC |
| 396ccf1 | Junio C Hamano | 07 January 2008, 03:02:22 UTC | utf8: pick_one_utf8_char() utf8_width() function was doing two different things. To pick a valid character from UTF-8 stream, and compute the display width of that character. This splits the former to a separate function pick_one_utf8_char(). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 04:27:35 UTC |
| 40f162b | Alexandre Julliard | 06 January 2008, 11:13:36 UTC | git.el: Display file types and type changes. Handle the T status from git-diff-index to display type changes between file/symlink/subproject. Also always show the file type for symlink and subprojects to indicate that they are not normal files. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| 5e3cb7e | Alexandre Julliard | 06 January 2008, 11:13:01 UTC | git.el: Retrieve the permissions for up-to-date files. This allows displaying correctly the executable flag for the initial commit, and will make it possible to show the file type for up-to-date symlinks and subprojects. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| 8b30aa5 | Alexandre Julliard | 06 January 2008, 11:12:24 UTC | git.el: Support for getting diffs from inside the log-edit buffer. Take advantage of the new log-edit feature that allows to show a diff with C-c C-d while editing the log message. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| 4261633 | James Bowes | 06 January 2008, 17:35:02 UTC | Make the git metapackage require the same version of the subpackages. Without explicit version deps in the rpm spec file, 'yum update git' effectively does nothing. Require explicit versions of the subpackages, so that they get pulled in on an update. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| 64cc1c0 | Martin Koegler | 06 January 2008, 17:21:10 UTC | tree-walk: don't parse incorrect entries The current code can access memory outside of the tree buffer in the case of malformed tree entries. This patch prevents this by: * The rest of the buffer must be at least 24 bytes (at least 1 byte mode, 1 blank, at least one byte path name, 1 NUL, 20 bytes sha1). * Check that the last NUL (21 bytes before the end) is present. This ensures that strlen() and get_mode() calls stay within the buffer. * The mode may not be empty. We have only to reject a blank at the begin, as the rest is handled by if (c < '0' || c > '7'). * The blank is ensured by get_mode(). * The path must contain at least one character. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| 47ee06f | Jeff King | 05 January 2008, 09:57:44 UTC | Document the color.interactive semantics There are two possible confusions with the color.interactive description: 1. the short name "interactive" implies that it covers all interactive commands; let's explicitly make it so, even though there are no other interactive commands which currently use it 2. Not all parts of "git add --interactive" are controlled by color.interactive (specifically, the diffs require tweaking color.diff). So let's clarify that it applies only to displays and prompts. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| f87e310 | Jeff King | 04 January 2008, 08:35:21 UTC | add--interactive: allow diff colors without interactive colors Users with color.diff set to true/auto will not see color in "git add -i" unless they also set color.interactive. This changes the semantics of color.interactive to control only the coloring of the interaction aspect of the command and let color.diff to control the color of hunk picker, which would arguably be more convenient. Old $use_color variable is now renamed to $menu_use_color to make it clear that it is about coloring the interaction. The "colored" subroutine now checks if the passed color is defined, instead of checking $use_color variable, to decide if the lines should be colored. The various variables that define colors for different parts of the output are set or unset depending on the setting of color.interactive and color.diff configuration variables. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| 50e3d1e | Jeff King | 06 January 2008, 04:24:09 UTC | add--interactive: remove unused diff colors When color support was added, we colored the diffs ourselves. However, 4af756f3 changed this to simply run "git diff-files" twice, keeping the colored output separately. This makes the internal diff color variables obsolete with one exception: when splitting hunks, we have to manually recreate the fragment for each part of the split. Thus we keep $fraginfo_color around to do that correctly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| a0393ef | Martin Koegler | 06 January 2008, 19:03:10 UTC | parse_tag_buffer: don't parse invalid tags The current tag parsing code can access memory outside the tag buffer, if \n are missing. This patch prevent this behaviour. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| 5162e69 | Dan McGee | 29 December 2007, 06:20:38 UTC | Documentation: rename gitlink macro to linkgit Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case gitlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:44 UTC |
| 5f8bee5 | Junio C Hamano | 06 January 2008, 03:10:35 UTC | Documentation: fix "gitlink::foobar[s]" They should be spelled with a single colon. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:43 UTC |
| 4c785e5 | Junio C Hamano | 06 January 2008, 03:09:09 UTC | Documentation: remove gitman.info with "make clean" Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:43 UTC |
| f7ab5c7 | Junio C Hamano | 06 January 2008, 12:21:07 UTC | custom pretty format: tolerate empty e-mail address When e-mail address is empty (e.g. "A U Thor <>"), --pretty=format misparsed the commit header and did not pick up the date field correctly. Noticed by Marco, fixed slightly differently with additional sanity check and with a test. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:43 UTC |
| 5682694 | Mark Levedahl | 05 January 2008, 22:32:21 UTC | Documentation/Makefile - honor $DESTDIR for quick-install target Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:43 UTC |
| 418fa3a | Junio C Hamano | 05 January 2008, 20:18:43 UTC | filter-branch: work correctly with ambiguous refnames 'git-filter-branch branch' could fail producing the error: "Which ref do you want to rewrite?" if existed another branch or tag, which name was 'branch-something' or 'something/branch'. [jc: original report and fix were done between Dmitry Potapov and Dscho; I rewrote it using "rev-parse --symbolic-full-name"] Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:43 UTC |
| a6d97d4 | Junio C Hamano | 05 January 2008, 20:09:55 UTC | git-rev-parse --symbolic-full-name The plumbing level can understand that the user meant "refs/heads/master" when the user says "master" or "heads/master", but there is no easy way for the scripts to figure it out without duplicating the dwim_ref() logic. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:43 UTC |
| 3023dc6 | Junio C Hamano | 05 January 2008, 09:35:54 UTC | git-stash clear: refuse to work with extra parameter for now Because it is so tempting to expect "git stash clear stash@{4}" to remove the fourth element in the stash while leaving other elements intact, we should not blindly throw away everything upon seeing such a command. This may change when we start using "git reflog delete" to selectively nuke a single (or multiple, for that matter) stash entries with such a command line. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2008, 02:41:36 UTC |
| b039f0a | Paul Mackerras | 06 January 2008, 04:54:46 UTC | gitk: Restore some widget options whose defaults changed in Tk 8.5 The default options for panedwindows in Tk 8.5 make the sash virtually invisible -- the handle is not shown and the relief is flat. This puts the defaults back to showing the handle and a raised relief on the sash, as in Tk 8.4. This uses the option command to do this, and also uses the option command to set the default font for various UI elements to the UI font ("uifont"). Signed-off-by: Paul Mackerras <paulus@samba.org> | 06 January 2008, 04:55:39 UTC |
| 7c390d9 | Marco Costalba | 05 January 2008, 08:57:24 UTC | git-stash: use stdout instead of stderr for non error messages Some scripts and libraries check stderr to detect a failing command, instead of checking the exit code. Because the output from git-status is not primarily for machine consumption, it would not hurt to send these messages to stdout instead and it will make it easier to drive the command for such callers. Signed-off-by: Marco Costalba <mcostalba@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 19:52:17 UTC |
| d6da3cd | Junio C Hamano | 05 January 2008, 07:13:47 UTC | Update draft release notes for 1.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 08:08:49 UTC |
| e0cd252 | Michael Stefaniuc | 04 January 2008, 18:59:26 UTC | git-am: Run git gc only once and not for every patch. With "too many unreachable loose objects" git gc --auto will always trigger. This clutters the output of git am and thus git rebase. Signed-off-by: Michael Stefaniuc <mstefani@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 08:07:57 UTC |
| e9b2094 | Junio C Hamano | 05 January 2008, 06:45:08 UTC | t/t3800: do not use a temporary file to hold expected result. It is a good practice to write program output to a temporary file during the test, as it would allow easier postmortem when the tested program does break. But there is no benefit in writing the expected output out to the temporary. This actually fixes a bug in check_verify_failure() routine. The intention of the test seems to make sure the "git mktag" command fails, and it spits out the expected error message. But if the command did not fail as expected, the shell function as originally written would not have detected the failure. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 08:07:57 UTC |
| 0feb4d1 | Junio C Hamano | 05 January 2008, 06:28:13 UTC | t/t{3600,3800,5401}: do not use egrep when grep would do There is nothing _wrong_ with egrep per se, but this way we would have less dependency on external tools. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 08:07:57 UTC |
| 90ed6c0 | Miklos Vajna | 05 January 2008, 04:06:48 UTC | t/t7001: avoid unnecessary ERE when using grep As pointed out by Junio, it's unnecessary to use "grep -E" and ".+" when we can just use "grep" and "..*". Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 08:07:57 UTC |
| 7ee9066 | Junio C Hamano | 05 January 2008, 06:22:55 UTC | t/t7600: avoid GNUism in grep Using \+ to mean "one or more" in grep without -E is a GNU extension outside POSIX. Avoid it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 08:07:51 UTC |
| 144126a | Junio C Hamano | 05 January 2008, 06:03:42 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Make commit log messages end with a newline Added Swedish translation. git-gui: Unconditionally use absolute paths with Cygwin git-gui: Handle file mode changes (644->755) in diff viewer git-gui: Move frequently used commands to the top of the context menu. | 05 January 2008, 06:03:42 UTC |
| cf9d58e | Marco Costalba | 04 January 2008, 09:53:32 UTC | Document git-reset defaults to HEAD if no commit is given Signed-off by: Marco Costalba <mcostalba@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 06:01:28 UTC |
| cae6c25 | Jeff King | 04 January 2008, 09:45:31 UTC | diff: remove lazy config loading There is no point to this. Either: 1. The program has already loaded git_diff_ui_config, in which case this is a noop. 2. The program didn't, which means it is plumbing that does not _want_ git_diff_ui_config to be loaded. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 00:22:07 UTC |
| e467193 | Jeff King | 04 January 2008, 09:16:14 UTC | diff: load funcname patterns in "basic" config The funcname patterns influence the "comment" on @@ lines of the diff. They are safe to use with plumbing since they don't fundamentally change the meaning of the diff in any way. Since all diff users call either diff_ui_config or diff_basic_config, we can get rid of the lazy reading of the config. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 00:22:01 UTC |
| 9a1805a | Jeff King | 04 January 2008, 08:59:34 UTC | add a "basic" diff config callback The diff porcelain uses git_diff_ui_config to set porcelain-ish config options, like automatically turning on color. The plumbing specifically avoids calling this function, since it doesn't want things like automatic color or rename detection. However, some diff options should be set for both plumbing and porcelain. For example, one can still turn on color in git-diff-files using the --color command line option. This means we want the color config from color.diff.* (so that once color is on, we use the user's preferred scheme), but _not_ the color.diff variable. We split the diff config into "ui" and "basic", where "basic" is suitable for use by plumbing (so _most_ things affecting the output should still go into the "ui" part). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2008, 00:05:23 UTC |
| 061d6b9 | Martin Koegler | 04 January 2008, 19:37:17 UTC | receive-pack: reject invalid refnames Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2008, 23:59:43 UTC |
| 872c930 | Jim Meyering | 04 January 2008, 17:37:41 UTC | Don't access line[-1] for a zero-length "line" from fgets. A NUL byte at beginning of file, or just after a newline would provoke an invalid buf[-1] access in a few places. * builtin-grep.c (cmd_grep): Don't access buf[-1]. * builtin-pack-objects.c (get_object_list): Likewise. * builtin-rev-list.c (read_revisions_from_stdin): Likewise. * bundle.c (read_bundle_header): Likewise. * server-info.c (read_pack_info_file): Likewise. * transport.c (insert_packed_refs): Likewise. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2008, 20:28:58 UTC |
| 95bf4bd | Junio C Hamano | 04 January 2008, 03:04:37 UTC | git-clean: make "Would remove ..." path relative to cwd again The rewrite changed the output to use the path relative to the top of the work tree without a good reason. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2008, 03:04:37 UTC |
| 790296f | Jim Meyering | 03 January 2008, 14:18:07 UTC | Fix grammar nits in documentation and in code comments. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2008, 17:15:17 UTC |
| 698a68b | Junio C Hamano | 03 January 2008, 09:23:12 UTC | Uninline prefixcmp() Now the routine is an open-coded loop that avoids an extra strlen() in the previous implementation, it got a bit too big to be inlined. Uninlining it makes code footprint smaller but the result still retains the avoidance of strlen() cost. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2008, 09:23:12 UTC |
| 257f302 | Junio C Hamano | 02 January 2008, 19:14:40 UTC | Update callers of check_ref_format() This updates send-pack and fast-import to use symbolic constants for checking the return values from check_ref_format(), and also futureproof the logic in lock_any_ref_for_update() to explicitly name the case that is usually considered an error but is Ok for this particular use. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2008, 19:20:09 UTC |
| 321b184 | Eric Wong | 02 January 2008, 18:10:03 UTC | git-svn: unlink index files that were globbed, too commit 3157dd9e89a71e80673d0bc21b5c0630f3b1fe68 (git-svn: unlink internal index files after operations) introduced unlinking index files after fetching. However, this missed indices for refs that were created by globbing branches and tags. This will track all refs we ever touch during a fetch and unlink them at exit time. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2008, 18:44:22 UTC |
| 7dfa16b | Eric Wong | 02 January 2008, 18:09:49 UTC | git-svn: allow dcommit --no-rebase to commit multiple, dependent changes Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2008, 18:43:54 UTC |
| eab8270 | Martin Koegler | 02 January 2008, 07:39:21 UTC | receive-pack: check object type of sha1 before using them as commits Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2008, 10:28:54 UTC |
| 99a6a97 | Johannes Schindelin | 29 December 2007, 19:22:14 UTC | Optimize prefixcmp() Certain codepaths (notably "git log --pretty=format...") use prefixcmp() extensively, with very short prefixes. In those cases, calling strlen() is a wasteful operation, so avoid it. Initial patch by Marco Costalba. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2008, 10:28:54 UTC |
| 5f7b202 | Junio C Hamano | 02 January 2008, 06:33:20 UTC | lock_any_ref_for_update(): reject wildcard return from check_ref_format Recent check_ref_format() returns -3 as well as -1 (general error) and -2 (less than two levels). The caller was explicitly checking for -1, to allow "HEAD" but still needed to disallow bogus refs. This introduces symbolic constants for the return values from check_ref_format() to make them read better and more meaningful. Normal ref creation codepath can still treat non-zero return values as errors. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2008, 10:28:54 UTC |
| 49b9362 | Jeff King | 31 December 2007, 07:13:52 UTC | git-reset: refuse to do hard reset in a bare repository It makes no sense since there is no working tree. A soft reset should be fine, though. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2008, 10:28:54 UTC |
| 02e5ba4 | Jeff King | 01 January 2008, 06:17:34 UTC | config: handle lack of newline at end of file better The config parsing routines use the static global 'config_file' to store the FILE* pointing to the current config file being parsed. The function get_next_char() automatically converts an EOF on this file to a newline for the convenience of its callers, and it sets config_file to NULL to indicate that EOF was reached. This throws away useful information, though, since some routines want to call ftell on 'config_file' to find out exactly _where_ the routine ended. In the case of a key ending at EOF boundary, we ended up segfaulting in some cases (changing that key or adding another key in its section), or failing to provide the necessary newline (adding a new section). This patch adds a new flag to indicate EOF and uses that instead of setting config_file to NULL. It also makes sure to add newlines where necessary for truncated input. All three included tests fail without the patch. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2008, 10:28:54 UTC |
