| 779e3a8 | Junio C Hamano | 22 December 2008, 03:20:21 UTC | GIT 1.6.1-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 03:20:21 UTC |
| f66bc5f | Richard Hartmann | 21 December 2008, 23:17:32 UTC | Always show which directory is not a git repository Unify all fatal: Not a git repository error messages so they include path information. Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:46:41 UTC |
| 5fdb709 | Richard Hartmann | 21 December 2008, 22:28:25 UTC | Make help entries alphabetical Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:45:05 UTC |
| 71cbf77 | Junio C Hamano | 22 December 2008, 02:35:54 UTC | Merge branch 'maint' * maint: doc/git-fsck: change the way for getting heads' SHA1s | 22 December 2008, 02:35:54 UTC |
| b80b5d6 | Boyd Stephen Smith Jr | 22 December 2008, 00:26:03 UTC | git-revert documentation: refer to new HOWTO on reverting faulty merges Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:34:49 UTC |
| d5be89d | Robin Rosenberg | 21 December 2008, 22:17:12 UTC | git-revert: record the parent against which a revert was made As described in Documentation/howto/revert-a-faulty-merge.txt, re-merging from a previously reverted a merge of a side branch may need a revert of the revert beforehand. Record against which parent the revert was made in the commit, so that later the user can figure out what went on. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2008, 02:32:04 UTC |
| 834caf9 | Junio C Hamano | 22 December 2008, 02:31:12 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Force the focus to the main window on Windows gitk: Allow unbalanced quotes/braces in commit headers gitk: Update German translation gitk: Mark forgotten strings (header sentence parts in color chooser) for translation gitk: Ensure that "Reset branch" menu entry is enabled gitk: Use check-buttons' -text property instead of separate labels gitk: Map / to focus the search box gitk: Fix bugs in blaming code | 22 December 2008, 02:31:12 UTC |
| e4df519 | Johannes Sixt | 18 December 2008, 07:30:49 UTC | gitk: Force the focus to the main window on Windows On msysGit, the focus is first on the (Tk) console. This console is then hidden, but keeps the focus. Work around that by forcing the focus onto the gitk window. This fixes msysGit issue 14. Diagnosed and originally fixed by Johannes Schindelin. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:18 UTC |
| 61f57cb | Kevin Ballard | 18 December 2008, 09:26:48 UTC | gitk: Allow unbalanced quotes/braces in commit headers When parsing commits, gitk treats the headers of the commit as tcl lists. This causes errors if the header contains an unbalanced quote or open brace. Splitting the line on spaces allows us to treat it as a set of words instead of as a tcl list, which prevents errors. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:18 UTC |
| 48027a9 | Christian Stimming | 06 December 2008, 19:49:24 UTC | gitk: Update German translation Attached to avoid whitespace problems. Regards, Christian From 282060ac531fee722142f9d39c4ff29570723cbb Mon Sep 17 00:00:00 2001 From: Christian Stimming <stimming@tuhh.de> Date: Sat, 6 Dec 2008 20:47:15 +0100 Subject: [PATCH 2/2] gitk: Update German translation Merged with most recent "make update-po" result. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:18 UTC |
| 968b016 | Christian Stimming | 06 December 2008, 19:48:30 UTC | gitk: Mark forgotten strings (header sentence parts in color chooser) for translation Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:18 UTC |
| da12e59 | Johannes Sixt | 03 December 2008, 12:43:20 UTC | gitk: Ensure that "Reset branch" menu entry is enabled Consider this sequence of events: 1. Detach HEAD and fire up gitk 2. Call the context menu on some commit. Notice that the last menu entry says "Detached HEAD: can't reset" and it is disabled. 3. Now checkout some regular branch (e.g. 'master') using the context menu. 4. Call the context menu again on some commit. Previously, at this point the last menu entry said "Reset master branch to here", but it was still disabled. With this fix it is now enabled again. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:17 UTC |
| adcbec1 | Johannes Sixt | 02 December 2008, 20:42:16 UTC | gitk: Use check-buttons' -text property instead of separate labels Previously the check-buttons' labels in the Preferences were separate widgets. This had the disadvantage that in order to toggle the check-button with the mouse the check-box had to be clicked. With this change the check-box can also be toggled by clicking the label. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:17 UTC |
| 97bed03 | Giuseppe Bilotta | 02 December 2008, 01:19:22 UTC | gitk: Map / to focus the search box The / key is often used to initiate searches (less, vim, some web browsers). This changes the binding for the / (slash) key from 'find next' to 'focus the search box' to follow this convention. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 21 December 2008, 23:16:17 UTC |
| 27c03aa | Markus Heidelberg | 21 December 2008, 16:30:22 UTC | doc/git-fsck: change the way for getting heads' SHA1s The straightforward way with using 'cat .git/refs/heads/*' doesn't work with packed refs as well as branches of the form topic/topic1. So let's use git-for-each-ref for getting the heads' SHA1s in this example. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 20:04:12 UTC |
| b3eae84 | Markus Heidelberg | 21 December 2008, 10:00:31 UTC | Documentation/git-show-branch: work around "single quote" typesetting glitch The displayed example is typeset with acute accents around the string that should be surrounded by a pair of single quotes in manpage. Replace them with double quotes (the semantics of the example does not change). Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 10:00:31 UTC |
| 2f0e7cb | Junio C Hamano | 21 December 2008, 09:57:59 UTC | send-email: futureproof split_addrs() sub Matt Kraai points out that calling parse_line() assuming that the caller ever passes only one argument is a bug waiting to happen, and he is right. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:57:59 UTC |
| 0693f9d | Junio C Hamano | 19 December 2008, 01:31:57 UTC | Make sure lockfiles are unlocked when dying on SIGPIPE We cleaned up lockfiles upon receiving the usual suspects HUP, TERM, QUIT but a wicked user could kill us of asphyxiation by piping our output to a pipe that does not read. Protect ourselves by catching SIGPIPE and clean up the lockfiles as well in such a case. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:56:20 UTC |
| c55fae4 | René Scharfe | 21 December 2008, 01:28:48 UTC | fast-import.c: stricter strtoul check, silence compiler warning Store the return value of strtoul() in order to avoid compiler warnings on Ubuntu 8.10. Also check errno after each call, which is the only way to notice an overflow without making ULONG_MAX an illegal date. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:48:26 UTC |
| 8f14825 | René Scharfe | 21 December 2008, 01:12:11 UTC | connect.c: stricter port validation, silence compiler warning In addition to checking if the provided port is numeric, also check that the string isn't empty and that the port number is within the valid range. Incidentally, this silences a compiler warning about ignoring strtol's return value. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:48:23 UTC |
| a128a2c | Nanako Shiraishi | 20 December 2008, 11:27:02 UTC | Add a documentat on how to revert a faulty merge Linus and Junio explained issues that are involved in reverting a merge and how to continue working with a branch that was updated since such a revert on the mailing list. This is to help new people who did not see these messages. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:48:07 UTC |
| 753bc91 | Kirill A. Korinskiy | 20 December 2008, 06:19:46 UTC | Remove the requirement opaquelocktoken uri scheme The program flow of pushing over http is: - call lock_remote() to issue a DAV_LOCK request to the server to lock info/refs and branch refs being pushed into; handle_new_lock_ctx() is used to parse its response to populate "struct remote_lock" that is returned from lock_remote(); - send objects; - call unlock_remote() to drop the lock. The handle_new_lock_ctx() function assumed that the server will use a lock token in opaquelocktoken URI scheme, which may have been an Ok assumption under RFC 2518, but under RFC 4918 which obsoletes the older standard it is not necessarily true. This resulted in push failure (often resulted in "cannot lock existing info/refs" error message) when talking to a server that does not use opaquelocktoken URI scheme. Signed-off-by: Kirill A. Korinskiy <catap@catap.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:12:48 UTC |
| 08fc060 | Marcel M. Cary | 15 December 2008, 17:34:37 UTC | git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir I want directories of my working tree to be linked to from various paths on my filesystem where third-party components expect them, both in development and production environments. A build system's install step could solve this, but I develop scripts and web pages that don't need to be built. Git's submodule system could solve this, but we tend to develop, branch, and test those directories all in unison, so one big repository feels more natural. We prefer to edit and commit on the symlinked paths, not the canonical ones, and in that setting, "git pull" fails to find the top-level directory of the repository while other commands work fine. "git pull" fails because POSIX shells have a notion of current working directory that is different from getcwd(). The shell stores this path in PWD. As a result, "cd ../" can be interpreted differently in a shell script than chdir("../") in a C program. The shell interprets "../" by essentially stripping the last textual path component from PWD, whereas C chdir() follows the ".." link in the current directory on the filesystem. When PWD is a symlink, these are different destinations. As a result, Git's C commands find the correct top-level working tree, and shell scripts do not. Changes: * When interpreting a relative upward (../) path in cd_to_toplevel, prepend the cwd without symlinks, given by /bin/pwd * Add tests for cd_to_toplevel and "git pull" in a symlinked directory that failed before this fix, plus contrasting scenarios that already worked Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2008, 09:10:48 UTC |
| 5832d1a | Markus Heidelberg | 19 December 2008, 12:14:18 UTC | Documentation: fix typos, grammar, asciidoc syntax [jc: the original patch was against master but 99% of it applied to maint; this commit splits out the part that applies only to master.] Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:37:18 UTC |
| efe05b0 | Junio C Hamano | 20 December 2008, 03:32:29 UTC | Merge branch 'maint' to sync with GIT 1.6.0.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:35:55 UTC |
| 718258e | Junio C Hamano | 20 December 2008, 03:27:06 UTC | GIT 1.6.0.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:27:35 UTC |
| 88fbf67 | Junio C Hamano | 19 December 2008, 22:41:21 UTC | fast-import: make tagger information optional Even though newer Porcelain tools always record the tagger information when creating new tags, export/import pair should be able to faithfully reproduce ancient tag objects that lack tagger information. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> | 20 December 2008, 03:25:06 UTC |
| 4e46a8d | Johannes Schindelin | 20 December 2008, 00:00:27 UTC | fast-export: deal with tag objects that do not have a tagger When no tagger was found (old Git produced tags like this), no "tagger" line is printed (but this is incompatible with the current git fast-import). Alternatively, you can pass the option --fake-missing-tagger, forcing fast-export to fake a tagger Unspecified Tagger <no-tagger> with a tag date of the beginning of (Unix) time in the case of a missing tagger, so that fast-import is still able to import the result. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:11:27 UTC |
| 6727524 | Miklos Vajna | 20 December 2008, 00:52:17 UTC | SubmittingPatches: mention the usage of real name in Signed-off-by: lines Especially with something that is supposed to hopefully have some legal value down the line if somebody starts making noises, it really would be nice to have a real person to associate things with. Suggest this in the SubmittingPatches document. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:11:20 UTC |
| ce2c3eb | David Aguilar | 20 December 2008, 01:01:01 UTC | git-mergetool: properly handle "git mergetool -- filename" Like many git commands, git-mergetool allows "--" to signal the end of option processing. This adds a missing "shift" statement so that this is correctly handled. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:10:58 UTC |
| 0e73b3e | Wu Fengguang | 19 December 2008, 08:10:10 UTC | git-send-email: handle email address with quoted comma Correctly handle email addresses containing quoted commas, e.g. "Zhu, Yi" <yi.zhu@intel.com>, "Li, Shaohua" <shaohua.li@intel.com> The commas inside the double quotes are not separators. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:10:48 UTC |
| 04c8ce9 | Markus Heidelberg | 19 December 2008, 12:14:18 UTC | Documentation: fix typos, grammar, asciidoc syntax Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2008, 03:10:46 UTC |
| ec9f0ea | Markus Heidelberg | 19 December 2008, 12:14:52 UTC | Documentation: sync example output with git output Don't confuse the user with old git messages. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2008, 19:55:33 UTC |
| 0956a6d | René Scharfe | 18 December 2008, 16:56:51 UTC | Fix type-mismatch compiler warning from diff_populate_filespec() The type of the size member of filespec is ulong, while strbuf_detach expects a size_t pointer. This patch should fix the warning: Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2008, 17:58:40 UTC |
| 32738ed | Michael J Gruber | 18 December 2008, 17:11:18 UTC | test overlapping ignore patterns Add a test which checks that negated patterns such as "!foo.html" can override previous patterns such as "*.html". This is documented behaviour but had not been tested so far. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2008, 17:55:53 UTC |
| c0ceb2c | Junio C Hamano | 18 December 2008, 06:28:03 UTC | Merge branch 'lt/readlink' * lt/readlink: combine-diff.c: use strbuf_readlink() builtin-blame.c: use strbuf_readlink() make_absolute_path(): check bounds when seeing an overlong symlink Make 'prepare_temp_file()' ignore st_size for symlinks Make 'diff_populate_filespec()' use the new 'strbuf_readlink()' Make 'index_path()' use 'strbuf_readlink()' Make 'ce_compare_link()' use the new 'strbuf_readlink()' Add generic 'strbuf_readlink()' helper function | 18 December 2008, 06:28:03 UTC |
| 954597b | Arjen Laarhoven | 17 December 2008, 08:20:25 UTC | Enable threaded delta search on Mac OS X/Darwin Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2008, 06:01:20 UTC |
| ecc03c1 | Nanako Shiraishi | 18 December 2008, 03:34:56 UTC | Clarify documentation of "git checkout <tree-ish> paths" syntax The SYNOPSIS section of the manual writes: git checkout [options] [<tree-ish>] [--] <paths>... but the DESCRIPTION says that this form checks the paths out "from the index, or from a named commit." A later sentence refers to the same argument as "<tree-ish> argument", but it is not clear that these two sentences are talking about the same command line argument for first-time readers. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2008, 06:00:54 UTC |
| b4955fb | Junio C Hamano | 18 December 2008, 05:56:48 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui 0.12 git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL git-gui: Update Hungarian translation for 0.12 git-gui: Fixed typos in Swedish translation. git-gui: Updated Swedish translation (515t0f0u). git gui: update Italian translation git-gui: Update Japanese translation for 0.12 git-gui: Starting translation for Norwegian git-gui: Update German (completed) translation. git-gui: Update po template to include 'Mirroring %s' message git-gui: Fix commit encoding handling. git-gui: Fix handling of relative paths in blame. | 18 December 2008, 05:56:48 UTC |
| e612120 | Shawn O. Pearce | 18 December 2008, 04:15:17 UTC | git-gui 0.12 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 18 December 2008, 04:15:17 UTC |
| 1df2713 | Miklos Vajna | 17 December 2008, 21:29:06 UTC | githooks documentation: add a note about the +x mode In a freshly initialized repo it is only necessary to rename the .sample hooks, but when using older repos (initialized with older git init) enabled the +x mode is still necessary - docuement this. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:37:14 UTC |
| 912342d | Junio C Hamano | 17 December 2008, 20:37:58 UTC | combine-diff.c: use strbuf_readlink() When showing combined diff using work tree contents, use strbuf_readlink() to read symbolic links. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> | 17 December 2008, 21:36:35 UTC |
| edfd45d | Junio C Hamano | 17 December 2008, 20:37:53 UTC | builtin-blame.c: use strbuf_readlink() When faking a commit out of the work tree contents, use strbuf_readlink() to read the contents of symbolic links. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> | 17 December 2008, 21:36:35 UTC |
| 737e31a | Junio C Hamano | 17 December 2008, 20:37:48 UTC | make_absolute_path(): check bounds when seeing an overlong symlink Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> | 17 December 2008, 21:36:34 UTC |
| dfab6aa | Linus Torvalds | 17 December 2008, 18:31:36 UTC | Make 'prepare_temp_file()' ignore st_size for symlinks The code was already set up to not really need it, so this just massages it a bit to remove the use entirely. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:34 UTC |
| cf219d8 | Linus Torvalds | 17 December 2008, 18:26:13 UTC | Make 'diff_populate_filespec()' use the new 'strbuf_readlink()' This makes all tests pass on a system where 'lstat()' has been hacked to return bogus data in st_size for symlinks. Of course, the test coverage isn't complete, but it's a good baseline. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:34 UTC |
| b760d3a | Linus Torvalds | 17 December 2008, 17:51:53 UTC | Make 'index_path()' use 'strbuf_readlink()' This makes us able to properly index symlinks even on filesystems where st_size doesn't match the true size of the link. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:34 UTC |
| a60272b | Linus Torvalds | 17 December 2008, 17:47:27 UTC | Make 'ce_compare_link()' use the new 'strbuf_readlink()' This simplifies the code, and also makes ce_compare_link now able to handle filesystems with odd 'st_size' return values for symlinks. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:34 UTC |
| b11b7e1 | Linus Torvalds | 17 December 2008, 17:36:40 UTC | Add generic 'strbuf_readlink()' helper function It was already what 'git apply' did in read_old_data(), just export it as a real function, and make it be more generic. In particular, this handles the case of the lstat() st_size data not matching the readlink() return value properly (which apparently happens at least on NTFS under Linux). But as a result of this you could also use the new function without even knowing how big the link is going to be, and it will allocate an appropriately sized buffer. So we pass in the st_size of the link as just a hint, rather than a fixed requirement. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 21:36:30 UTC |
| d4d1351 | Johannes Schindelin | 14 December 2008, 22:12:49 UTC | git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL In dc871831(Only use GIT_CONFIG in "git config", not other programs), GIT_CONFIG_LOCAL was rested in peace, in favor of not reading /etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 17 December 2008, 15:50:55 UTC |
| 53682f0 | Markus Heidelberg | 17 December 2008, 02:59:36 UTC | doc/git-reset: add reference to git-stash The "Interrupted workflow" situation is a good example for using git-stash. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 09:16:43 UTC |
| d198367 | Markus Heidelberg | 17 December 2008, 02:59:23 UTC | Documentation: fix description for enabling hooks Since f98f8cb (Ship sample hooks with .sample suffix, 2008-06-24) hooks are not enabled by making them executable anymore, but by removing the '.sample' suffix from the filename. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 08:57:33 UTC |
| 4fce51c | Miklos Vajna | 16 December 2008, 15:48:12 UTC | git-daemon documentation: use {tilde} Use '{tilde}' instead of '~', becase the later does not appear in the manpage version, just in the HTML one. Noticed by gonzzor on IRC. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 08:56:36 UTC |
| b54dc9f | Junio C Hamano | 17 December 2008, 03:42:02 UTC | gitweb: do not run "git diff" that is Porcelain Jakub says that legacy-style URI to view two blob differences are never generated since 1.4.3. This codepath runs "git diff" Porcelain from the gitweb, which is a no-no. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 07:31:58 UTC |
| 438d299 | Junio C Hamano | 17 December 2008, 06:13:36 UTC | GIT 1.5.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 06:13:36 UTC |
| f23ffbe | Junio C Hamano | 17 December 2008, 06:08:22 UTC | GIT 1.5.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 06:08:28 UTC |
| 34b146c | Junio C Hamano | 17 December 2008, 06:03:29 UTC | GIT 1.5.4.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 06:06:47 UTC |
| dfff4b7 | Junio C Hamano | 17 December 2008, 03:42:02 UTC | gitweb: do not run "git diff" that is Porcelain Jakub says that legacy-style URI to view two blob differences are never generated since 1.4.3. This codepath runs "git diff" Porcelain from the gitweb, which is a no-no. It can trigger diff.external command that is specified in the configuration file of the repository being viewed. This patch applies to v1.5.4 and later. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2008, 05:54:44 UTC |
| 98171a0 | Lee Marlow | 15 December 2008, 17:45:49 UTC | bash completion: Sync config variables with their man pages Add 'normal' to config color options. Add 'mergeoptions' to branch config options. Add 'proxy' and 'mirror' to remote config options. Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2008, 07:06:17 UTC |
| 025a192 | Lee Marlow | 15 December 2008, 17:45:48 UTC | bash completion: Sort config completion variables Sort the config variables to make sync-ing them with Documents/config.txt easier in the future. Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2008, 07:06:17 UTC |
| 90c3302 | Junio C Hamano | 16 December 2008, 07:06:13 UTC | Merge branch 'maint' * maint: fast-import: close pack before unlinking it pager: do not dup2 stderr if it is already redirected git-show: do not segfault when showing a bad tag | 16 December 2008, 07:06:13 UTC |
| 87c8a56 | Johannes Schindelin | 15 December 2008, 21:11:40 UTC | fast-import: close pack before unlinking it This is sort of a companion patch to 4723ee9(Close files opened by lock_file() before unlinking.): on Windows, you cannot delete what is still open. This makes test 9300-fast-import pass on Windows for me; quite a few fast-imports leave temporary packs until the test "blank lines not necessary after other commands" actually tests for the number of files in .git/objects/pack/, which has a few temporary packs now. I guess that 8b4eb6b(Do not perform cross-directory renames when creating packs) was "responsible" for the breakage. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2008, 07:04:48 UTC |
| a833502 | Junio C Hamano | 15 December 2008, 08:33:34 UTC | pager: do not dup2 stderr if it is already redirected An earlier commit 61b8050 (sending errors to stdout under $PAGER, 2008-02-16) avoided losing the error messages that are sent to the standard error when $PAGER is in effect by dup2'ing fd 2 to the pager. his way, showing a tag object that points to a bad object: $ git show tag-foo would give the error message to the pager. However, it was not quite right if the user did: $ git show 2>error.log tag-foo i.e. use the pager but store the errors in a separate file. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 09:37:15 UTC |
| d2dadfe | Junio C Hamano | 15 December 2008, 08:36:56 UTC | git-show: do not segfault when showing a bad tag When a tag points at a bad or nonexistent object, we should diagnose the breakage and exit. An earlier commit 4f3dcc2 (Fix 'git show' on signed tag of signed tag of commit, 2008-07-01) lost this check and made it segfault instead; not good. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 09:29:44 UTC |
| 8befc50 | Johannes Schindelin | 14 December 2008, 22:10:52 UTC | Get rid of the last remnants of GIT_CONFIG_LOCAL In dc871831(Only use GIT_CONFIG in "git config", not other programs), GIT_CONFIG_LOCAL was rested in peace, in favor of not reading /etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 00:43:39 UTC |
| 390c348 | Alexander Gavrilov | 14 December 2008, 19:44:32 UTC | Documentation: Describe git-gui Tools menu configuration options. Now git gui has a customizable Tools menu, so this adds information about variables that are used to configure it. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 00:43:25 UTC |
| 2fad532 | YONETANI Tomokazu | 14 December 2008, 02:08:22 UTC | git-fast-import possible memory corruption problem Internal "allocate in bulk, we will never free this memory anyway" allocator used in fast-import had a logic to round up the size of the requested memory block in a wrong place (it computed if the available space is enough to fit the request first, and then carved a chunk of memory by size rounded up to the alignment, which could go beyond the actually available space). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2008, 00:41:32 UTC |
| 7e76aba | Markus Heidelberg | 13 December 2008, 19:05:34 UTC | builtin-commit: remove unused message variable builtin-commit uses commit_tree() from builtin-commit-tree since 6bb6b03 (builtin-commit: use commit_tree(), 2008-09-10), where the same message is used. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2008, 20:09:36 UTC |
| 0959df4 | Junio C Hamano | 13 December 2008, 05:50:34 UTC | Merge branch 'maint' * maint: git-config.txt: fix a typo | 13 December 2008, 05:50:34 UTC |
| a126ed0 | Brandon Casey | 12 December 2008, 23:20:07 UTC | git-branch: display sha1 on branch deletion Make it easier to recover from a mistaken branch deletion by displaying the sha1 of the branch's tip commit. Update t3200 test to match the change in output. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2008, 04:42:59 UTC |
| 544ddb0 | Jim Meyering | 12 December 2008, 09:00:41 UTC | git-config.txt: fix a typo Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2008, 04:39:41 UTC |
| de0db42 | Junio C Hamano | 11 December 2008, 08:36:31 UTC | Merge branch 'maint' * maint: fsck: reduce stack footprint make sure packs to be replaced are closed beforehand | 11 December 2008, 08:36:31 UTC |
| 04d3975 | Linus Torvalds | 11 December 2008, 03:44:37 UTC | fsck: reduce stack footprint The logic to mark all objects that are reachable from tips of refs were implemented as a set of recursive functions. In a repository with a deep enough history, this can easily eat up all the available stack space. Restructure the code to require less stackspace by using an object array to keep track of the objects that still need to be processed. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2008, 08:09:48 UTC |
| 07e62b7 | Jeff King | 10 December 2008, 09:25:19 UTC | rebase: improve error messages about dirty state If you have unstaged changes in your working tree and try to rebase, you will get the cryptic "foo: needs update" message, but nothing else. If you have staged changes, you get "your index is not up-to-date". Let's improve this situation in two ways: - for unstaged changes, let's also tell them we are canceling the rebase, and why (in addition to the "needs update" lines) - for the staged changes case, let's use language that is a little more clear to the user: their index contains uncommitted changes Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2008, 03:07:35 UTC |
| c74faea | Nicolas Pitre | 09 December 2008, 19:26:52 UTC | make sure packs to be replaced are closed beforehand Especially on Windows where an opened file cannot be replaced, make sure pack-objects always close packs it is about to replace. Even on non Windows systems, this could save potential bad results if ever objects were to be read from the new pack file using offset from the old index. This should fix t5303 on Windows. Signed-off-by: Nicolas Pitre <nico@cam.org> Tested-by: Johannes Sixt <j6t@kdbg.org> (MinGW) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2008, 01:56:05 UTC |
| 71fe945 | Alexander Potashev | 10 December 2008, 22:27:44 UTC | Fix typo in comment in builtin-add.c Reported-by: Tim Daly <daly@axiom-developer.org> Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2008, 23:39:00 UTC |
| b8dc2f5 | Miklos Vajna | 10 December 2008, 14:03:13 UTC | git-gui: Update Hungarian translation for 0.12 Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 December 2008, 19:44:03 UTC |
| 93b6d7c | Peter Krefting | 10 December 2008, 08:51:27 UTC | git-gui: Fixed typos in Swedish translation. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 December 2008, 19:43:15 UTC |
| de749a9 | Junio C Hamano | 10 December 2008, 19:39:07 UTC | Fix t4031 When I tweaked the patch to use $SHELL_PATH instead of a hard-coded "#!/bin/sh" to produce 3aa1f7c (diff: respect textconv in rewrite diffs, 2008-12-09), I screwed up. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2008, 19:39:07 UTC |
| 5363d07 | Junio C Hamano | 10 December 2008, 06:41:27 UTC | Merge branch 'maint' * maint: work around Python warnings from AsciiDoc git-svn: Make following parents atomic | 10 December 2008, 06:41:27 UTC |
| 3aa1f7c | Jeff King | 09 December 2008, 08:13:21 UTC | diff: respect textconv in rewrite diffs Currently we just skip rewrite diffs for binary files; this patch makes an exception for files which will be textconv'd, and actually performs the textconv before generating the diff. Conceptually, rewrite diffs should be in the exact same format as the a non-rewrite diff, except that we refuse to share any context. Thus it makes very little sense for "git diff" to show a textconv'd diff, but for "git diff -B" to show "Binary files differ". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2008, 06:28:55 UTC |
| 0c01857 | Jeff King | 09 December 2008, 08:12:28 UTC | diff: fix handling of binary rewrite diffs The current emit_rewrite_diff code always writes a text patch without checking whether the content is binary. This means that if you end up with a rewrite diff for a binary file, you get lots of raw binary goo in your patch. Instead, if we have binary files, then let's just skip emit_rewrite_diff altogether. We will already have shown the "dissimilarity index" line, so it is really about the diff contents. If binary diffs are turned off, the "Binary files a/file and b/file differ" message should be the same in either case. If we do have binary patches turned on, there isn't much point in making a less-efficient binary patch that does a total rewrite; no human is going to read it, and since binary patches don't apply with any fuzz anyway, the result of application should be the same. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2008, 06:14:25 UTC |
| 51ea440 | Alexander Potashev | 09 December 2008, 17:26:22 UTC | Fix typos in documentation Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2008, 05:39:23 UTC |
| 75bc957 | Tor Arvid Lund | 09 December 2008, 15:41:50 UTC | git-p4: Fix regression in p4Where method. Unfortunately, I introduced a bug in commit 7f705dc36 (git-p4: Fix bug in p4Where method). This happens because sometimes the result from "p4 where <somepath>" doesn't contain a "depotFile" key, but instead a "data" key that needs further parsing. This commit should ensure that both of these cases are checked. Signed-off-by: Tor Arvid Lund <torarvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2008, 05:39:16 UTC |
| 29b802a | Ralf Wildenhues | 09 December 2008, 06:23:51 UTC | Improve language in git-merge.txt and related docs Improve some minor language and format issues like hyphenation, phrases, spacing, word order, comma, attributes. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2008, 04:57:52 UTC |
| aa971cb | Junio C Hamano | 08 December 2008, 02:38:46 UTC | work around Python warnings from AsciiDoc It appears that a reference to an anchor defined as [[anchor-name]] from another place using <<anchor-name>> syntax, when the anchor name contains a string "-with-" in its name, triggers these warnings from Python interpreter. asciidoc -b docbook -d book user-manual.txt <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6 There currently is no reference to "Finding comments with given content", but for consistency and for futureproofing, the anchor is also updated as the other ones that are actually used and trigger these warnings. Signed-off-by: Junio C Hamano <junio@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2008, 03:06:15 UTC |
| 7f64a66 | Peter Krefting | 09 December 2008, 15:26:46 UTC | git-gui: Updated Swedish translation (515t0f0u). Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 December 2008, 15:35:01 UTC |
| 64bcf58 | Michele Ballabio | 04 December 2008, 17:28:21 UTC | git gui: update Italian translation Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 December 2008, 15:20:08 UTC |
| e882c6e | Nanako Shiraishi | 09 December 2008, 03:42:17 UTC | git-gui: Update Japanese translation for 0.12 Adds translation for one new message string. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 09 December 2008, 15:11:20 UTC |
| 9c0c1b1 | Alexey Borzenkov | 08 December 2008, 18:29:09 UTC | Define linkgit macro in [macros] section Starting with asciidoc 8.3.0 linkgit macro is no longer recognized by asciidoc and user guide suggests (http://www.methods.co.nz/asciidoc/userguide.html#_macro_definitions) that macros are supposed to be defined in [macros] section. I'm not sure whether undefined linkgit macro was working by pure chance or it is a regression in asciidoc 8.3.0, but this patch adds proper definition for the linkgit macro, allowing it to work on 8.3.0. Signed-off-by: Alexey Borzenkov <snaury@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2008, 01:11:37 UTC |
| 553589f | Deskin Miller | 08 December 2008, 13:31:31 UTC | git-svn: Make following parents atomic find_parent_branch generates branch@rev type branches when one has to look back through SVN history to properly get the history for a branch copied from somewhere not already being tracked by git-svn. If in the process of fetching this history, git-svn is interrupted, then when one fetches again, it will use whatever was last fetched as the parent commit and fail to fetch any more history which it didn't get to before being terminated. This is especially troubling in that different git-svn copies of the same SVN repository can end up with different commit sha1s, incorrectly showing the history as divergent and precluding easy collaboration using git push and fetch. To fix this, when we initialise the Git::SVN object $gs to search for and perhaps fetch history, we check if there are any commits in SVN in the range between the current revision $gs is at, and the top revision for which we were asked to fill history. If there are commits we're missing in that range, we continue the fetch from the current revision to the top, properly getting all history before using it as the parent for the branch we're trying to create. Signed-off-by: Deskin Miller <deskinm@umich.edu> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2008, 00:29:34 UTC |
| 9c996d0 | Fredrik Skolmli | 08 December 2008, 16:36:57 UTC | git-gui: Starting translation for Norwegian This file have been used locally for some time, and is near completion. Will put an effort into completing it later on, or just leave it as an excercise for other Norwegians. Signed-off-by: Fredrik Skolmli <fredrik@frsk.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 17:32:11 UTC |
| 4586864 | Jakub Narebski | 08 December 2008, 13:13:21 UTC | gitweb: Fix bug in insert_file() subroutine In insert_file() subroutine (which is used to insert HTML fragments as custom header, footer, hometext (for projects list view), and per project README.html (for summary view)) we used: map(to_utf8, <$fd>); This doesn't work, and other form has to be used: map { to_utf8($_) } <$fd>; Now with test for t9600 added, for $GIT_DIR/README.html. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2008, 17:04:36 UTC |
| 07bba55 | Christian Stimming | 06 December 2008, 20:22:16 UTC | git-gui: Update German (completed) translation. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 16:49:56 UTC |
| 8a33356 | Shawn O. Pearce | 08 December 2008, 16:32:28 UTC | git-gui: Update po template to include 'Mirroring %s' message A late addition to the message library. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 16:33:05 UTC |
| 3ac31e4 | Alexander Gavrilov | 06 December 2008, 17:24:35 UTC | git-gui: Fix commit encoding handling. Commits without an encoding header are supposed to be encoded in utf8. While this apparently hasn't always been the case, currently it is the active convention, so it is better to follow it; otherwise people who have to use commitEncoding on their machines are unable to read utf-8 commits made by others. I also think that it is preferrable to display the warning about an unsupported value of commitEncoding more prominently, because this condition may lead to surprising behavior and, eventually, to loss of data. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 16:33:05 UTC |
| 95e706b | Alexander Gavrilov | 06 December 2008, 17:21:54 UTC | git-gui: Fix handling of relative paths in blame. Currently using '..' or '.' in the file path for gui blame causes it to break, because the path is passed inside the SHA:PATH spec to cat-file, which apparently does not understand such items. As a result, cat-file returns nothing, and the viewer crashes because of an "index out of range" error. This commit adds a simple function that normalizes such paths. I choose not to use [file normalize], because it uses some data from the file system, e.g. dereferences symlinks, and creates an absolute path, while blame may be used to inspect historical information that bears no relation to the current filesystem state. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 08 December 2008, 16:33:05 UTC |
| e10ea81 | Jeff King | 08 December 2008, 02:57:01 UTC | diff: allow turning on textconv explicitly for plumbing Some history viewers use the diff plumbing to generate diffs rather than going through the "git diff" porcelain. Currently, there is no way for them to specify that they would like to see the text-converted version of the diff. This patch adds a "--textconv" option to allow such a plumbing user to allow text conversion. The user can then tell the viewer whether or not they would like text conversion enabled. While it may be tempting add a configuration option rather than requiring each plumbing user to be configured to pass --textconv, that is somewhat dangerous. Text-converted diffs generally cannot be applied directly, so each plumbing user should "opt in" to generating such a diff, either by explicit request of the user or by confirming that their output will not be fed to patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2008, 03:59:32 UTC |
| 5ec11af | Jeff King | 08 December 2008, 02:54:17 UTC | reorder ALLOW_TEXTCONV option setting Right now for the diff porcelain and the log family, we call: init_revisions(); setup_revisions(); DIFF_OPT_SET(ALLOW_TEXTCONV); However, that means textconv will _always_ be on, instead of being a default that can be manipulated with setup_revisions. Instead, we want: init_revisions(); DIFF_OPT_SET(ALLOW_TEXTCONV); setup_revisions(); which is what this patch does. We'll go ahead and move the callsite in wt-status, also; even though the user can't pass any options here, it is a cleanup that will help avoid any surprise later if the setup_revisions line is changed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2008, 03:59:25 UTC |
| 63e8dc5 | Junio C Hamano | 06 December 2008, 01:54:11 UTC | read-cache.c: typofix in comment Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2008, 03:08:23 UTC |
