| 5f38e5e | Ralf Thielow | 24 September 2012, 17:16:21 UTC | l10n: de.po: correct translation of a 'rebase' message Noticed-by: Sascha Cunz <sascha-ml@babbelbox.org> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 27 September 2012, 18:58:51 UTC |
| 871e293 | Junio C Hamano | 24 August 2012, 19:34:19 UTC | Merge branch 'maint-1.7.11' into maint * maint-1.7.11: Prepare for 1.7.11.6 Make the ciabot scripts completely self-configuring in the normal case. Improved documentation for the ciabot scripts. man: git pull -r is a short for --rebase gitcli: describe abbreviation of long options rev-list docs: clarify --topo-order description Documentation/CodingGuidelines: spell out more shell guidelines Documentation: do not mention .git/refs/* directories tests: Introduce test_seq | 24 August 2012, 19:34:19 UTC |
| b521831 | Junio C Hamano | 24 August 2012, 19:33:31 UTC | Prepare for 1.7.11.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2012, 19:33:31 UTC |
| 1103996 | Junio C Hamano | 24 August 2012, 19:05:47 UTC | Merge branch 'mv/pull-r-for-rebase' into maint-1.7.11 A minor documentation update. * mv/pull-r-for-rebase: man: git pull -r is a short for --rebase | 24 August 2012, 19:05:47 UTC |
| bdb3033 | Junio C Hamano | 24 August 2012, 19:05:44 UTC | Merge branch 'jc/maint-abbrev-option-cli' into maint-1.7.11 We did not document that many commands take unique prefix abbreviations of long options (e.g. "--option" may be the only flag that the command accepts that begin with "--opt", in which case you can give "--opt") anywhere easy to find for new people. * jc/maint-abbrev-option-cli: gitcli: describe abbreviation of long options | 24 August 2012, 19:05:44 UTC |
| 7939a33 | Junio C Hamano | 24 August 2012, 19:05:40 UTC | Merge branch 'jc/maint-rev-list-topo-doc' into maint-1.7.11 It was unclear what "--topo-order" was really about in the documentation. It is not just about "children before parent", but also about "don't mix lineages". * jc/maint-rev-list-topo-doc: rev-list docs: clarify --topo-order description | 24 August 2012, 19:05:40 UTC |
| 9dd8175 | Junio C Hamano | 24 August 2012, 19:05:35 UTC | Merge branch 'hv/coding-guidelines' into maint-1.7.11 In earlier days, "imitate the style in the neibouring code" was sufficient to keep the coherent style, but over time some parts of the codebase have drifted enough to make it ineffective. * hv/coding-guidelines: Documentation/CodingGuidelines: spell out more shell guidelines | 24 August 2012, 19:05:35 UTC |
| 74b819a | Junio C Hamano | 24 August 2012, 19:05:30 UTC | Merge branch 'jc/tag-doc' into maint-1.7.11 Our documentation used to assume having files in .git/refs/* directories was the only to have branches and tags, but that is not true for quite some time. * jc/tag-doc: Documentation: do not mention .git/refs/* directories | 24 August 2012, 19:05:30 UTC |
| c247d76 | Junio C Hamano | 24 August 2012, 19:05:24 UTC | Merge branch 'mk/test-seq' into maint-1.7.11 Add a compatibility/utility function to the test framework. * mk/test-seq: tests: Introduce test_seq | 24 August 2012, 19:05:24 UTC |
| 47bc16b | Junio C Hamano | 24 August 2012, 19:05:19 UTC | Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11 * lp/no-cmd-http-fetch: builtin.h: remove unused cmd_<foo> declarations | 24 August 2012, 19:05:20 UTC |
| 3f98823 | Junio C Hamano | 24 August 2012, 19:05:11 UTC | Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11 * bw/maint-1.7.9-solaris-getpass: Enable HAVE_DEV_TTY for Solaris terminal: seek when switching between reading and writing | 24 August 2012, 19:05:11 UTC |
| 9e0833c | Junio C Hamano | 24 August 2012, 19:05:08 UTC | Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11 * jk/maint-commit-check-committer-early: commit: check committer identity more strictly | 24 August 2012, 19:05:08 UTC |
| df1effa | Eric S. Raymond | 23 August 2012, 05:21:53 UTC | Make the ciabot scripts completely self-configuring in the normal case. Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2012, 03:58:24 UTC |
| 6484070 | Eric S. Raymond | 23 August 2012, 04:10:53 UTC | Improved documentation for the ciabot scripts. Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2012, 03:58:20 UTC |
| fab4b04 | Junio C Hamano | 22 August 2012, 18:27:30 UTC | Merge branch 'maint-1.7.11' into maint * maint-1.7.11: contrib/ciabot: Get ciabot configuration from git variables | 22 August 2012, 18:27:30 UTC |
| c142616 | Eric S. Raymond | 22 August 2012, 10:52:30 UTC | contrib/ciabot: Get ciabot configuration from git variables These changes remove all need to modify the ciabot scripts for installation. Instead, per-project configuration can be dome via variables in a [ciabot] section of the config file. Also, correct for the new server address. Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 August 2012, 18:15:43 UTC |
| 889d358 | Junio C Hamano | 20 August 2012, 00:02:11 UTC | Git 1.7.12 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2012, 00:02:11 UTC |
| 91e4bfe | Junio C Hamano | 17 August 2012, 20:27:10 UTC | Merge branch 'jc/doc-git-updates' (early part) * 'jc/doc-git-updates' (early part): Documentation: update URL for formatted pages | 17 August 2012, 20:27:10 UTC |
| c70c09b | Junio C Hamano | 17 August 2012, 19:14:57 UTC | Documentation: update URL for formatted pages The one at kernel.org has not been updated for quite a while and can no longer be called "the latest". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2012, 20:25:43 UTC |
| d9aa361 | Miklos Vajna | 16 August 2012, 09:50:18 UTC | man: git pull -r is a short for --rebase Letting the "--rebase" option squat on the short-and-sweet single letter option "-r" was an unintended accident and was not even documented, but the short option seems to be already used in the wild. Let's document it so that other options that begin with "r" would not be tempted to steal it. Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2012, 07:26:52 UTC |
| 9c81990 | Junio C Hamano | 17 August 2012, 06:16:22 UTC | gitcli: describe abbreviation of long options Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2012, 06:16:28 UTC |
| bd120e3 | Junio C Hamano | 17 August 2012, 03:13:45 UTC | Merge git://github.com/git-l10n/git-po to update Swedish translation * git://github.com/git-l10n/git-po: l10n: Fixes to Swedish translation | 17 August 2012, 03:13:45 UTC |
| 5b8056c | Peter Krefting | 14 August 2012, 08:58:14 UTC | l10n: Fixes to Swedish translation Tersify texts overflowing an 80-character terminal. Fix spelling mistakes. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 16 August 2012, 12:57:51 UTC |
| 2a9a19e | Junio C Hamano | 15 August 2012, 20:46:16 UTC | Git 1.7.12-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2012, 20:46:16 UTC |
| 47e32d0 | Junio C Hamano | 15 August 2012, 20:41:17 UTC | Sync with 1.7.11.5 | 15 August 2012, 20:41:17 UTC |
| cd7c0be | Junio C Hamano | 15 August 2012, 20:39:53 UTC | Git 1.7.11.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2012, 20:39:53 UTC |
| d7d3b56 | Junio C Hamano | 15 August 2012, 20:37:20 UTC | Merge branch 'rj/maint-grep-remove-redundant-test' into maint * rj/maint-grep-remove-redundant-test: t7810-*.sh: Remove redundant test | 15 August 2012, 20:37:20 UTC |
| 45b65a6 | Junio C Hamano | 15 August 2012, 20:36:47 UTC | Merge branch 'hv/link-alt-odb-entry' into maint * hv/link-alt-odb-entry: link_alt_odb_entry: fix read over array bounds reported by valgrind | 15 August 2012, 20:36:47 UTC |
| 3f0350c | Junio C Hamano | 15 August 2012, 20:02:48 UTC | rev-list docs: clarify --topo-order description It was unclear what "--topo-order" was really about in the documentation. It is not just about "children before parent", but also about "don't mix lineages". Reword the description for both "--date-order" and "--topo-order", and add an illustration to it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2012, 20:04:20 UTC |
| 03b05c7 | Heiko Voigt | 15 August 2012, 17:06:01 UTC | Documentation/CodingGuidelines: spell out more shell guidelines In earlier days, "imitate the style in the neibouring code" was sufficient to keep the coherent style, but over time some parts of the codebase have drifted enough to make it ineffective. Spell some of the guidelines out. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2012, 18:00:39 UTC |
| 61b472e | Peter Baumann | 09 August 2012, 06:42:53 UTC | git svn: reset invalidates the memoized mergeinfo caches Since v1.7.0-rc2~11 (git-svn: persistent memoization, 2010-01-30), git-svn has maintained some private per-repository caches in .git/svn/.caches to avoid refetching and recalculating some mergeinfo-related information with every 'git svn fetch'. This memoization can cause problems, e.g consider the following case: SVN repo: ... - a - b - c - m <- trunk \ / d - e <- branch1 The Git import of the above repo is at commit 'a' and doesn't know about the branch1. In case of an 'git svn rebase', only the trunk of the SVN repo is imported. During the creation of the git commit 'm', git svn uses the svn:mergeinfo property and tries to find the corresponding git commit 'e' to create 'm' with 'c' and 'e' as parents. But git svn rebase only imports the current branch so commit 'e' is not imported. Therefore git svn fails to create commit 'm' as a merge commit, because one of its parents is not known to git. The imported history looks like this: ... - a - b - c - m <- trunk A later 'git svn fetch' to import all branches can't rewrite the commit 'm' to add 'e' as a parent and to make it a real git merge commit, because it was already imported. That's why the imported history misses the merge and looks like this: ... - a - b - c - m <- trunk \ d - e <- branch1 Right now the only known workaround for importing 'm' as a merge is to force reimporting 'm' again from SVN, e.g. via $ git svn reset --revision $(git find-rev $c) $ git svn fetch Sadly, this is where the behavior has regressed: git svn reset doesn't invalidate the old mergeinfo cache, which is no longer valid for the reimport, which leads to 'm' beeing imprted with only 'c' as parent. As solution to this problem, this commit invalidates the mergeinfo cache to force correct recalculation of the parents. During development of this patch, several ways for invalidating the cache where considered. One of them is to use Memoize::flush_cache, which will call the CLEAR method on the underlying Memoize persistency implementation. Sadly, neither Memoize::Storable nor the newer Memoize::YAML module introduced in 68f532f4ba888 could optionally be used implement the CLEAR method, so this is not an option. Reseting the internal hash used to store the memoized values has the same problem, because it calls the non-existing CLEAR method of the underlying persistency layer, too. Considering this and taking into account the different implementations of the memoization modules, where Memoize::Storable is not in our control, implementing the missing CLEAR method is not an option, at least not if Memoize::Storable is still used. Therefore the easiest solution to clear the cache is to delete the files on disk in 'git svn reset'. Normally, deleting the files behind the back of the memoization module would be problematic, because the in-memory representation would still exist and contain wrong data. Fortunately, the memoization is active in memory only for a small portion of the code. Invalidating the cache by deleting the files on disk if it isn't active should be safe. Signed-off-by: Peter Baumann <waste.manager@gmx.de> Signed-off-by: Steven Walter <stevenrwalter@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 10 August 2012, 19:53:18 UTC |
| e48fb75 | Robert Luberda | 08 August 2012, 05:35:00 UTC | git svn: handle errors and concurrent commits in dcommit dcommit didn't handle errors returned by SVN and coped very poorly with concurrent commits that appear in SVN repository while dcommit was running. In both cases it left git repository in inconsistent state: index (which was reset with `git reset --mixed' after a successful commit to SVN) no longer matched the checkouted tree, when the following commit failed or needed to be rebased. See http://bugs.debian.org/676904 for examples. This patch fixes the issues by: - introducing error handler for dcommit. The handler will try to rebase or reset working tree before returning error to the end user. dcommit_rebase function was extracted out of cmd_dcommit to ensure consistency between cmd_dcommit and the error handler. - calling `git reset --mixed' only once after all patches are successfully committed to SVN. This ensures index is not touched for most of the time of dcommit run. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 10 August 2012, 19:53:18 UTC |
| 034161a | Junio C Hamano | 09 August 2012, 17:51:46 UTC | Merge git://github.com/git-l10n/git-po L10n updates for 1.7.12-rc2 * 'master' of git://github.com/git-l10n/git-po: l10n: Update Swedish translation (1168t0f0u) l10n: de.po: translate 77 new messages l10n: vi.po: update one message l10n: zh_CN.po: update one translation l10n: Update one message in git.pot | 09 August 2012, 17:51:46 UTC |
| cc2f50d | Peter Krefting | 09 August 2012, 05:36:41 UTC | l10n: Update Swedish translation (1168t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 09 August 2012, 05:39:17 UTC |
| e5acacf | Junio C Hamano | 08 August 2012, 22:14:57 UTC | Merge branch 'bw/maint-1.7.9-solaris-getpass' The recent update to terminal I/O interface to get passwords &c interactively didn't quite work on Solaris. * bw/maint-1.7.9-solaris-getpass: Enable HAVE_DEV_TTY for Solaris terminal: seek when switching between reading and writing | 08 August 2012, 22:14:58 UTC |
| fa0aad4 | Matthieu Moy | 08 August 2012, 07:58:27 UTC | Documentation: list git-credential in plumbing commands Commit e30b2feb1b (Jun 24 2012, add 'git credential' plumbing command) forgot to add git-credential to command-list.txt, hence the command was not appearing in the documentation, making it hard for users to discover it. While we're there, capitalize the description line for git-crendential for consistency with other commands. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 August 2012, 16:59:17 UTC |
| da53e27 | Jiang Xin | 07 August 2012, 23:23:01 UTC | Merge git://github.com/ralfth/git-po-de * git://github.com/ralfth/git-po-de: l10n: de.po: translate 77 new messages | 07 August 2012, 23:23:01 UTC |
| e15c16d | Junio C Hamano | 07 August 2012, 17:39:34 UTC | Git 1.7.12-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 August 2012, 17:39:34 UTC |
| 33a54e7 | Ralf Thielow | 02 August 2012, 16:06:12 UTC | l10n: de.po: translate 77 new messages Translate 77 new messages came from git.pot update in 3b6137f (l10n: Update git.pot (76 new, 4 removed messages)) and bb2ba06 (l10n: Update one message in git.pot). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> | 07 August 2012, 16:41:18 UTC |
| 436783c | Ben Walton | 07 August 2012, 03:07:42 UTC | Enable HAVE_DEV_TTY for Solaris Now that git_terminal_prompt can cleanly interact with /dev/tty on Solaris, enable HAVE_DEV_TTY so that this code path is used for credential reading instead of relying on the crippled getpass(). Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 August 2012, 05:12:43 UTC |
| 67ba123 | Jeff King | 07 August 2012, 04:10:26 UTC | terminal: seek when switching between reading and writing When a stdio stream is opened in update mode (e.g., "w+"), the C standard forbids switching between reading or writing without an intervening positioning function. Many implementations are lenient about this, but Solaris libc will flush the recently-read contents to the output buffer. In this instance, that meant writing the non-echoed password that the user just typed to the terminal. Fix it by inserting a no-op fseek between the read and write. The opposite direction (writing followed by reading) is also disallowed, but our intervening fflush is an acceptable positioning function for that alternative. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 August 2012, 05:11:47 UTC |
| 58b66f8 | Tran Ngoc Quan | 07 August 2012, 00:18:01 UTC | l10n: vi.po: update one message * Translate message that updated from commit bb2ba06 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 07 August 2012, 00:22:59 UTC |
| b1d9b1d | Junio C Hamano | 06 August 2012, 22:58:38 UTC | Drop 1.7.11.x items from 1.7.12 release notes Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2012, 22:58:38 UTC |
| 9ffdd46 | Junio C Hamano | 06 August 2012, 22:53:33 UTC | Sync with maint | 06 August 2012, 22:53:33 UTC |
| b17a01d | Junio C Hamano | 06 August 2012, 22:51:58 UTC | Prepare for 1.7.11.5 Hopefully that will be the final 1.7.11.x maintenance release. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2012, 22:51:58 UTC |
| c8dacba | Junio C Hamano | 06 August 2012, 22:40:00 UTC | Merge branch 'jn/block-sha1' into maint * jn/block-sha1: Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads block-sha1: put expanded macro parameters in parentheses block-sha1: avoid pointer conversion that violates alignment constraints | 06 August 2012, 22:40:00 UTC |
| dbf64e1 | Junio C Hamano | 06 August 2012, 22:39:38 UTC | Merge branch 'jn/make-assembly-in-right-directory' into maint * jn/make-assembly-in-right-directory: Makefile: fix location of listing produced by "make subdir/foo.s" | 06 August 2012, 22:39:38 UTC |
| c2e585f | Junio C Hamano | 06 August 2012, 22:39:16 UTC | Merge branch 'ms/daemon-doc-typo' into maint * ms/daemon-doc-typo: Documentation/git-daemon: add missing word | 06 August 2012, 22:39:16 UTC |
| 05f5ba6 | Junio C Hamano | 06 August 2012, 22:37:54 UTC | Merge branch 'lm/git-blame-el' into maint * lm/git-blame-el: git-blame.el: Do not use bare 0 to mean (point-min) git-blame.el: Use with-current-buffer where appropriate git-blame.el: Do not use goto-line in lisp code | 06 August 2012, 22:37:54 UTC |
| 125f643 | Junio C Hamano | 06 August 2012, 22:37:43 UTC | Merge branch 'rs/ipv6-ssh-url' into maint * rs/ipv6-ssh-url: git: Wrong parsing of ssh urls with IPv6 literals ignores port | 06 August 2012, 22:37:43 UTC |
| e597c43 | Junio C Hamano | 06 August 2012, 22:37:28 UTC | Merge branch 'rs/git-blame-mapcar-mapc' into maint * rs/git-blame-mapcar-mapc: git-blame.el: use mapc instead of mapcar | 06 August 2012, 22:37:28 UTC |
| 809b262 | Junio C Hamano | 06 August 2012, 22:37:09 UTC | Merge branch 'rr/doc-commit' into maint * rr/doc-commit: commit: document a couple of options | 06 August 2012, 22:37:09 UTC |
| 7615cb0 | Štěpán Němec | 14 July 2012, 22:20:36 UTC | doc: A few minor copy edits. - (glossary) the quotes around the Wikipedia URL prevented its linkification in frontends that support it; remove them - (manual) newer version (SHA-1) == following, older == preceding, not the other way around - trivial typo and wording fixes Signed-off-by: Štěpán Němec <stepnem@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2012, 22:34:20 UTC |
| 1b8e822 | Junio C Hamano | 06 August 2012, 22:31:16 UTC | Merge branch 'jk/maint-checkout-orphan-check-fix' into maint * jk/maint-checkout-orphan-check-fix: checkout: don't confuse ref and object flags | 06 August 2012, 22:31:16 UTC |
| eb53600 | Junio C Hamano | 06 August 2012, 22:30:57 UTC | Merge branch 'mh/maint-revisions-doc' into maint * mh/maint-revisions-doc: Enumerate revision range specifiers in the documentation Make <refname> documentation more consistent. | 06 August 2012, 22:30:57 UTC |
| f52a386 | Junio C Hamano | 06 August 2012, 22:30:18 UTC | Merge branch 'jc/mergetool-tool-help' into maint * jc/mergetool-tool-help: mergetool: support --tool-help option like difftool does | 06 August 2012, 22:30:18 UTC |
| 9145b19 | Johannes Sixt | 06 August 2012, 21:06:14 UTC | Makefile: use overridable $(FIND) instead of hard-coded 'find' The Makefile already offers the variable $(FIND) and uses it except in one place. Fix it. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2012, 21:21:13 UTC |
| 831e61f | Junio C Hamano | 06 August 2012, 20:36:47 UTC | Documentation: do not mention .git/refs/* directories It is an implementation detail that a new tag is created by adding a file in the .git/refs/tags directory. The only thing the user needs to know is that a "git tag" creates a ref in the refs/tags namespace, and without "-f", it does not overwrite an existing tag. Inspired by a report from 乙酸鋰 <ch3cooli@gmail.com>; I think I caught all the existing mention in Documentation/ directory in the tip of 1.7.9.X maintenance track, but we may have added new ones since then. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 August 2012, 21:04:16 UTC |
| e5e38ce | Jiang Xin | 06 August 2012, 17:10:34 UTC | l10n: zh_CN.po: update one translation Translate 1 new messages came from git.pot update in bb2ba06 (l10n: Update one message in git.pot) Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 06 August 2012, 17:10:34 UTC |
| bb2ba06 | Jiang Xin | 06 August 2012, 15:48:08 UTC | l10n: Update one message in git.pot This update comes from commit v1.7.12-rc1-18-ge0453 (merge-recursive: separate message for common ancestors). Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 06 August 2012, 15:48:08 UTC |
| bfbf4d4 | Junio C Hamano | 06 August 2012, 03:51:05 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: zh_CN.po: translate 76 new messages l10n: vi.po update to follow POT in 3b613 l10n: Update git.pot (76 new, 4 removed messages) | 06 August 2012, 03:51:05 UTC |
| e0453cd | Ralf Thielow | 05 August 2012, 17:56:38 UTC | merge-recursive: separate message for common ancestors The function "merge_recursive" prints the count of common ancestors as "found %u common ancestor(s):". We should use a singular and a plural form of this message to help translators. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 August 2012, 19:34:57 UTC |
| 649900b | Jiang Xin | 02 August 2012, 03:50:59 UTC | l10n: zh_CN.po: translate 76 new messages Translate 76 new messages came from git.pot update in 3b6137f (l10n: Update git.pot (76 new, 4 removed messages)) Thynson reviewed this update and also contributed other improvements: * blob -> 二进制对象（blob） * 共用 -> 同时使用 Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Thynson <lanxingcan@gmail.com> | 04 August 2012, 23:12:27 UTC |
| d17cf5f | Michał Kiedrowicz | 03 August 2012, 22:21:04 UTC | tests: Introduce test_seq Jeff King wrote: The seq command is GNU-ism, and is missing at least in older BSD releases and their derivatives, not to mention antique commercial Unixes. We already purged it in b3431bc (Don't use seq in tests, not everyone has it, 2007-05-02), but a few new instances have crept in. They went unnoticed because they are in scripts that are not run by default. Replace them with test_seq that is implemented with a Perl snippet (proposed by Jeff). This is better than inlining this snippet everywhere it's needed because it's easier to read and it's easier to change the implementation (e.g. to C) if we ever decide to remove Perl from the test suite. Note that test_seq is not a complete replacement for seq(1). It just has what we need now, in addition that it makes it possible for us to do something like "test_seq a m" if we wanted to in the future. There are also many places that do `for i in 1 2 3 ...` but I'm not sure if it's worth converting them to test_seq. That would introduce running more processes of Perl. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 August 2012, 23:06:07 UTC |
| 9a7365c | Matthieu Moy | 03 August 2012, 08:40:23 UTC | git-remote-mediawiki: replace TODO-list in comment by appropriate link My account on Github is now used as wiki and issue tracking. This will be more flexible than in-tree management of a TODO-list. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 August 2012, 16:13:28 UTC |
| 9802f22 | Tran Ngoc Quan | 03 August 2012, 07:15:23 UTC | l10n: vi.po update to follow POT in 3b613 * Translated 76 new messages Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 03 August 2012, 07:28:51 UTC |
| 3b6137f | Jiang Xin | 02 August 2012, 01:35:23 UTC | l10n: Update git.pot (76 new, 4 removed messages) Generate po/git.pot from v1.7.12-rc1-16-g05a20, and there are 76 new, 4 removed l10n messages. * 76 new messages are added at lines: 230, 337-580, 4972, 4984, 4998, 5017, 5280-5378, 5654 * 4 old messages are deleted from the previous version at lines: 230, 4729, 4764, 5295 Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 02 August 2012, 01:35:23 UTC |
| 05a20c8 | Junio C Hamano | 01 August 2012, 22:59:08 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: de.po: translate 4 new messages l10n: vi.po: translate 4 new messages l10n: zh_CN.po: translate 4 new messages l10n: Update git.pot (4 new, 3 removed messages) | 01 August 2012, 22:59:08 UTC |
| e39beac | Ralf Thielow | 01 August 2012, 17:09:09 UTC | git-rebase.sh: fix typo in an error message Fix a typo in the error messages which is shown if it seems that a rebase is already in progress. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 August 2012, 20:58:47 UTC |
| 97c7934 | Junio C Hamano | 31 July 2012, 16:43:07 UTC | Merge branch 'nd/maint-i18n-diffstat' * nd/maint-i18n-diffstat: i18n: leave \n out of translated diffstat | 31 July 2012, 16:43:07 UTC |
| 5fe1484 | Junio C Hamano | 31 July 2012, 16:41:51 UTC | Merge branch 'jx/i18n-1.7.11' Add i18n support for scripted Porcelains, and mark strings in merge(-recursive), am, and rebase for i18n. * jx/i18n-1.7.11: i18n: merge-recursive: mark strings for translation Remove dead code which contains bad gettext block i18n: am: mark more strings for translation rebase: remove obsolete and unused LONG_USAGE which breaks xgettext i18n: Rewrite gettext messages start with dash i18n: rebase: mark messages for translation i18n: New keywords for xgettext extraction from sh | 31 July 2012, 16:41:52 UTC |
| 9c87b0d | Ralf Thielow | 30 July 2012, 15:50:53 UTC | l10n: de.po: translate 4 new messages Translate 4 new messages came from git.pot update in 0bbe5b4 (l10n: Update git.pot (4 new, 3 removed messages)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 31 July 2012, 15:01:15 UTC |
| fd4652e | Tran Ngoc Quan | 31 July 2012, 00:45:53 UTC | l10n: vi.po: translate 4 new messages Update Vietnamse translation to POT file in 0bbe5b4 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 31 July 2012, 00:45:53 UTC |
| 23ff333 | Jiang Xin | 30 July 2012, 22:45:33 UTC | l10n: zh_CN.po: translate 4 new messages Translate 4 new messages came from git.pot update in 0bbe5b4 (l10n: Update git.pot (4 new, 3 removed messages)) Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 30 July 2012, 22:45:33 UTC |
| 3b2d763 | Junio C Hamano | 30 July 2012, 20:00:03 UTC | Git 1.7.12-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2012, 20:20:00 UTC |
| 9c9b9ed | Junio C Hamano | 30 July 2012, 20:17:31 UTC | Sync with 1.7.11.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2012, 20:18:18 UTC |
| 0e4c882 | Junio C Hamano | 30 July 2012, 20:09:25 UTC | Git 1.7.11.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2012, 20:16:51 UTC |
| f17adbc | Junio C Hamano | 30 July 2012, 20:05:36 UTC | Merge branch 'jk/maint-commit-document-editmsg' into maint "$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log message user edits was not documented. * jk/maint-commit-document-editmsg: commit: document the temporary commit message file | 30 July 2012, 20:05:36 UTC |
| 5c992a1 | Junio C Hamano | 30 July 2012, 20:05:25 UTC | Merge branch 'jk/maint-advise-vaddf' into maint The advise() function did not use varargs correctly to format its message. * jk/maint-advise-vaddf: advice: pass varargs to strbuf_vaddf, not strbuf_addf | 30 July 2012, 20:05:25 UTC |
| 2e3710b | Junio C Hamano | 30 July 2012, 20:05:13 UTC | Merge branch 'kk/maint-commit-tree' into maint "git commit-tree" learned a more natural "-p <parent> <tree>" order of arguments long time ago, but recently forgot it by mistake. * kk/maint-commit-tree: Revert "git-commit-tree(1): update synopsis" commit-tree: resurrect command line parsing updates | 30 July 2012, 20:05:13 UTC |
| 70f6be7 | Junio C Hamano | 30 July 2012, 20:04:59 UTC | Merge branch 'jv/maint-no-ext-diff' into maint "git diff --no-ext-diff" did not output anything for a typechange filepair when GIT_EXTERNAL_DIFF is in effect. * jv/maint-no-ext-diff: diff: test precedence of external diff drivers diff: correctly disable external_diff with --no-ext-diff | 30 July 2012, 20:04:59 UTC |
| 9b67f56 | Junio C Hamano | 30 July 2012, 20:04:39 UTC | Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint When "git am" failed, old timers knew to check .git/rebase-apply/patch to see what went wrong, but we never told the users about it. * pg/maint-1.7.9-am-where-is-patch: am: indicate where a failed patch is to be found | 30 July 2012, 20:04:39 UTC |
| 8ba105d | Junio C Hamano | 30 July 2012, 20:04:18 UTC | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint When "git submodule add" clones a submodule repository, it can get confused where to store the resulting submodule repository in the superproject's .git/ directory when there is a symbolic link in the path to the current directory. * jl/maint-1.7.10-recurse-submodules-with-symlink: submodules: don't stumble over symbolic links when cloning recursively | 30 July 2012, 20:04:18 UTC |
| 80ffb75 | Junio C Hamano | 30 July 2012, 20:03:40 UTC | Merge branch 'jc/maint-filter-branch-epoch-date' into maint In 1.7.9 era, we taught "git rebase" about the raw timestamp format but we did not teach the same trick to "filter-branch", which rolled a similar logic on its own. * jc/maint-filter-branch-epoch-date: t7003: add test to filter a branch with a commit at epoch date.c: Fix off by one error in object-header date parsing filter-branch: do not forget the '@' prefix to force git-timestamp | 30 July 2012, 20:04:18 UTC |
| 3e6d071 | Junio C Hamano | 30 July 2012, 19:56:42 UTC | Merge branch 'rj/maint-grep-remove-redundant-test' "git grep" stopped spawning an external "grep" long time ago, but a duplicated test to check internal and external "grep" was left behind. * rj/maint-grep-remove-redundant-test: t7810-*.sh: Remove redundant test | 30 July 2012, 19:56:42 UTC |
| 8de8bb8 | Junio C Hamano | 30 July 2012, 19:56:25 UTC | Merge branch 'dg/submodule-in-dismembered-working-tree' Finishing touches to the new test script. * dg/submodule-in-dismembered-working-tree: t7409: make sure submodule is initialized and updated in more detail | 30 July 2012, 19:56:25 UTC |
| 95e7705 | Daniel Graña | 30 July 2012, 17:51:59 UTC | t7409: make sure submodule is initialized and updated in more detail The earlier test did not even make sure that the correct commit is checked out in the submodule directory. Inspect the result in a bit more detail. Signed-off-by: Daniel Graña <dangra@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2012, 19:56:14 UTC |
| fbea95c | Junio C Hamano | 30 July 2012, 19:55:01 UTC | Merge branch 'hv/link-alt-odb-entry' The code to avoid mistaken attempt to add the object directory itself as its own alternate could read beyond end of a string while comparison. * hv/link-alt-odb-entry: link_alt_odb_entry: fix read over array bounds reported by valgrind | 30 July 2012, 19:55:01 UTC |
| dff9d65 | Florian Achleitner | 30 July 2012, 14:31:18 UTC | Add explanatory comment for transport-helpers refs mapping. The patch below adds a comment to fetch_with_import() explaining the loop that saves the fetched commit names after 'git fast-import' has done its work. It avoids some confusion about which refs the fast-import stream is supposed to use to write its result. Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2012, 19:22:35 UTC |
| 0bbe5b4 | Jiang Xin | 30 July 2012, 02:24:47 UTC | l10n: Update git.pot (4 new, 3 removed messages) Generate po/git.pot from v1.7.12-rc0-54-g9e211, and there are 4 new, 3 removed l10n messages. * 4 new messages are added at lines: 1254, 1264, 1459, 1523 * 3 old messages are deleted from the previous version at lines: 1254, 1273, 2854 Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 30 July 2012, 02:24:47 UTC |
| 4ca9453 | Ramsay Jones | 28 July 2012, 18:50:49 UTC | t7810-*.sh: Remove redundant test Since commit bbc09c22 ("grep: rip out support for external grep", 12-01-2010), test number 60 ("grep -C1 hunk mark between files") is essentially the same as test number 59. Test 59 was intended to verify the behaviour of git-grep resulting from multiple invocations of an external grep. As part of the test, it creates and adds 1024 files to the index, which is now wasted effort. Remove test 59, since it is now redundant. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2012, 01:08:50 UTC |
| 425b8a2 | Ramsay Jones | 28 July 2012, 18:48:06 UTC | t1100-*.sh: Fix an intermittent test failure In particular, the final test ('flags and then non flags') fails intermittently, depending on how much time elapsed between the invocations of "git commit-tree" when creating the commits which later have their commit id's compared. For example, if the commits for childid-3 and childid-4 are created 1 or more seconds apart, then the commits, which would otherwise be identical, will have different commit id's. In order to make the test reproducible, we remove the variability by setting the author and committer times to a well defined state. We accomplish this with a single call to 'test_tick' at the start of the test. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2012, 01:07:47 UTC |
| cb2912c | Heiko Voigt | 28 July 2012, 15:46:36 UTC | link_alt_odb_entry: fix read over array bounds reported by valgrind pfxlen can be longer than the path in objdir when relative_base contains the path to gits object directory. Here we are interested in checking if ent->base[] (the part that corresponds to .git/objects) is the same string as objdir, and the code NUL-terminated ent->base[] to LEADING PATH\0XX/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\0 in preparation for these "duplicate check" step (before we return from the function, the first NUL is turned into '/' so that we can fill XX when probing for loose objects). All we need to do is to compare the string with the path to our object directory. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2012, 01:02:51 UTC |
| 07a71b8 | Jeff King | 28 July 2012, 15:18:29 UTC | t: add missing executable bit to t7409 Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2012, 22:20:42 UTC |
| 9e2116a | Junio C Hamano | 28 July 2012, 05:25:19 UTC | Update draft release notes to 1.7.12 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 July 2012, 05:25:19 UTC |
| 51e383d | Junio C Hamano | 28 July 2012, 04:48:27 UTC | Merge branch 'extract-remaining' of git://git.bogomips.org/git-svn * 'extract-remaining' of git://git.bogomips.org/git-svn: Extract Git::SVN::GlobSpec from git-svn. Move Git::IndexInfo into its own file. Load all the modules in one place and before running code. Extract Git::SVN::Migration from git-svn. Prepare Git::SVN::Migration for extraction from git-svn. Extract Git::SVN::Log from git-svn. Prepare Git::SVN::Log for extraction from git-svn. | 28 July 2012, 04:48:27 UTC |
| 646e417 | Junio C Hamano | 28 July 2012, 04:18:09 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: Move initialization of Git::SVN variables into Git::SVN. Extract Git::SVN from git-svn into its own .pm file. Prepare Git::SVN for extraction into its own file. Extract some utilities from git-svn to allow extracting Git::SVN. perl: detect new files in MakeMaker builds The Makefile.PL will now find .pm files itself. Don't lose Error.pm if $@ gets clobbered. Quiet warning if Makefile.PL is run with -w and no --localedir | 28 July 2012, 04:18:09 UTC |
| 12688bb | Junio C Hamano | 28 July 2012, 04:17:00 UTC | Merge branch 'jk/autoident-test' Fix test breakages by a builder who does not have a valid user name in his /etc/password entry. * jk/autoident-test: t7502: test early quit from commit with bad ident t7502: handle systems where auto-identity is broken t7502: drop confusing test_might_fail call t7502: narrow checks for author/committer name in template t7502: properly quote GIT_EDITOR t7502: clean up fake_editor tests | 28 July 2012, 04:17:00 UTC |
| 3b0553c | Junio C Hamano | 28 July 2012, 04:16:45 UTC | Merge branch 'jk/help-plug-memleak' Plug a few trivial memory leaks. * jk/help-plug-memleak: help.c::exclude_cmds(): plug a leak help.c::uniq: plug a leak | 28 July 2012, 04:16:45 UTC |
| a64fe6c | Junio C Hamano | 28 July 2012, 04:13:46 UTC | Merge branch 'dg/submodule-in-dismembered-working-tree' In a superproject that has repository outside of its working tree, "git submodule add" failed to clone a new submodule, as GIT_DIR and GIT_WORK_TREE environment variables necessary to work in such a superproject interfered with access to the submodule repository. * dg/submodule-in-dismembered-working-tree: git-submodule: work with GIT_DIR/GIT_WORK_TREE | 28 July 2012, 04:13:46 UTC |
