| 630fc78 | Junio C Hamano | 24 January 2011, 19:00:00 UTC | Git 1.7.4-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 January 2011, 19:00:00 UTC |
| 342953a | Junio C Hamano | 24 January 2011, 18:54:12 UTC | Merge branch 'as/userdiff-pascal' * as/userdiff-pascal: userdiff: match Pascal class methods | 24 January 2011, 18:54:12 UTC |
| 0efbb7d | Junio C Hamano | 24 January 2011, 18:53:09 UTC | Merge branch 'jn/setup-fixes' * jn/setup-fixes: t1510: fix typo in the comment of a test Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase Subject: setup: officially support --work-tree without --git-dir tests: compress the setup tests tests: cosmetic improvements to the repo-setup test t/README: hint about using $(pwd) rather than $PWD in tests Fix expected values of setup tests on Windows | 24 January 2011, 18:53:09 UTC |
| 6abbee8 | Jonathan Nieder | 22 January 2011, 20:02:48 UTC | t1510: fix typo in the comment of a test Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 January 2011, 18:14:57 UTC |
| ea472c1 | Junio C Hamano | 23 January 2011, 23:49:41 UTC | Documentation updates for 'GIT_WORK_TREE without GIT_DIR' historical usecase Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 January 2011, 18:13:59 UTC |
| 4868b2e | Jonathan Nieder | 19 January 2011, 12:42:30 UTC | Subject: setup: officially support --work-tree without --git-dir The original intention of --work-tree was to allow people to work in a subdirectory of their working tree that does not have an embedded .git directory. Because their working tree, which their $cwd was in, did not have an embedded .git, they needed to use $GIT_DIR to specify where it is, and because this meant there was no way to discover where the root level of the working tree was, so we needed to add $GIT_WORK_TREE to tell git where it was. However, this facility has long been (mis)used by people's scripts to start git from a working tree _with_ an embedded .git directory, let git find .git directory, and then pretend as if an unrelated directory were the associated working tree of the .git directory found by the discovery process. It happens to work in simple cases, and is not worth causing "regression" to these scripts. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2011, 22:31:24 UTC |
| 8c0db6f | Jonathan Nieder | 21 January 2011, 18:37:34 UTC | Documentation: do not treat reset --keep as a special case The current treatment of "git reset --keep" emphasizes how it differs from --hard (treatment of local changes) and how it breaks down into plumbing (git read-tree -m -u HEAD <commit> followed by git update-ref HEAD <commit>). This can discourage people from using it, since it might seem to be a complex or niche option. Better to emphasize what the --keep flag is intended for --- moving the index and worktree from one commit to another, like "git checkout" would --- so the reader can make a more informed decision about the appropriate situations in which to use it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 January 2011, 20:41:14 UTC |
| 25f3af3 | Björn Steinbrink | 20 January 2011, 20:12:20 UTC | Correctly report corrupted objects The errno check added in commit 3ba7a06 "A loose object is not corrupt if it cannot be read due to EMFILE" only checked for whether errno is not ENOENT and thus incorrectly treated "no error" as an error condition. Because of that, it never reached the code path that would report that the object is corrupted and instead caused funny errors like: fatal: failed to read object 333c4768ce595793fdab1ef3a036413e2a883853: Success So we have to extend the check to cover the case in which the object file was successfully read, but its contents are corrupted. Reported-by: Will Palmer <wmpalmer@gmail.com> Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2011, 21:18:51 UTC |
| 786dabe | Jonathan Nieder | 19 January 2011, 12:40:51 UTC | tests: compress the setup tests New test helpers: - setup_repo, to initialize a repository or gitfile pointing to a repository, with core.bare and core.worktree set as specified; - try_case, to run setup from a given directory and validate the result, with GIT_DIR and GIT_WORK_TREE set as specified; - try_repo, to initialize a repository and call "try_case" from the toplevel and a subdirectory; - run_wt_tests, to run a battery of tests that check for sane behavior when GIT_WORK_TREE is set to various positions relative to the .git dir and cwd. Use these helpers to make the test shorter, less repetitive, and (one hopes) easier to understand and modify. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2011, 18:27:16 UTC |
| 91c031d | Jonathan Nieder | 19 January 2011, 12:38:22 UTC | tests: cosmetic improvements to the repo-setup test Give an overview in "sh t1510-repo-setup.sh --help" output. Waste some vertical and horizontal space for clearer code. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2011, 18:27:16 UTC |
| b20e9b0 | Junio C Hamano | 19 January 2011, 16:33:54 UTC | Merge branch 'maint' * maint: exec_cmd: remove unused extern | 19 January 2011, 16:33:54 UTC |
| b312b41 | Erik Faye-Lund | 10 January 2011, 22:00:49 UTC | exec_cmd: remove unused extern This definition was added by commit 77cb17e9, but it's left unused since commit 511707d. Remove the left-over definition. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2011, 16:27:22 UTC |
| 14154ce | Junio C Hamano | 19 January 2011, 16:26:47 UTC | Merge branch 'jn/gitweb-no-logo' into maint * jn/gitweb-no-logo: gitweb: make logo optional | 19 January 2011, 16:26:47 UTC |
| ae830c2 | Junio C Hamano | 19 January 2011, 16:26:44 UTC | Merge branch 'jk/diff-driver-binary-doc' into maint * jk/diff-driver-binary-doc: docs: explain diff.*.binary option | 19 January 2011, 16:26:44 UTC |
| 8a59702 | Junio C Hamano | 19 January 2011, 16:26:41 UTC | Merge branch 'tr/submodule-relative-scp-url' into maint * tr/submodule-relative-scp-url: submodule: fix relative url parsing for scp-style origin | 19 January 2011, 16:26:41 UTC |
| ea95907 | Junio C Hamano | 19 January 2011, 16:26:24 UTC | Merge branch 'rj/maint-difftool-cygwin-workaround' into maint * rj/maint-difftool-cygwin-workaround: difftool: Fix failure on Cygwin | 19 January 2011, 16:26:24 UTC |
| f8d0215 | Junio C Hamano | 19 January 2011, 16:26:17 UTC | Merge branch 'rj/maint-test-fixes' into maint * rj/maint-test-fixes: t9501-*.sh: Fix a test failure on Cygwin lib-git-svn.sh: Add check for mis-configured web server variables lib-git-svn.sh: Avoid setting web server variables unnecessarily t9142: Move call to start_httpd into the setup test t3600-rm.sh: Don't pass a non-existent prereq to test #15 | 19 January 2011, 16:26:17 UTC |
| 305579f | Junio C Hamano | 19 January 2011, 16:26:04 UTC | Merge branch 'jn/maint-gitweb-pathinfo-fix' into maint * jn/maint-gitweb-pathinfo-fix: gitweb: Fix handling of whitespace in generated links | 19 January 2011, 16:26:04 UTC |
| 3a1882c | Junio C Hamano | 19 January 2011, 16:25:52 UTC | Merge branch 'ak/describe-exact' into maint * ak/describe-exact: describe: Delay looking up commits until searching for an inexact match describe: Store commit_names in a hash table by commit SHA1 describe: Do not use a flex array in struct commit_name describe: Use for_each_rawref | 19 January 2011, 16:25:52 UTC |
| 267684f | Junio C Hamano | 19 January 2011, 16:25:46 UTC | Merge branch 'jn/maint-fast-import-object-reuse' into maint * jn/maint-fast-import-object-reuse: fast-import: insert new object entries at start of hash bucket | 19 January 2011, 16:25:46 UTC |
| f326a06 | Junio C Hamano | 19 January 2011, 16:25:41 UTC | Merge branch 'jn/submodule-b-current' into maint * jn/submodule-b-current: git submodule: Remove now obsolete tests before cloning a repo git submodule -b ... of current HEAD fails | 19 January 2011, 16:25:41 UTC |
| d84f280 | Junio C Hamano | 19 January 2011, 16:25:38 UTC | Merge branch 'jc/maint-svn-info-test-fix' into maint * jc/maint-svn-info-test-fix: t9119: do not compare "Text Last Updated" line from "svn info" | 19 January 2011, 16:25:38 UTC |
| 0bc6180 | Junio C Hamano | 19 January 2011, 16:25:31 UTC | Merge branch 'nd/maint-relative' into maint * nd/maint-relative: get_cwd_relative(): do not misinterpret root path | 19 January 2011, 16:25:31 UTC |
| e595910 | Jonathan Nieder | 16 January 2011, 02:22:35 UTC | Documentation/fast-import: put explanation of M 040000 <dataref> "" in context Omit needless words ("Additionally ... <path> may also" is redundant). While at it, place the explanation of this special case after the general rules for paths to provide the reader with some context. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2011, 00:51:13 UTC |
| 5ee5f5a | Ramsay Jones | 11 January 2011, 18:17:21 UTC | svndump.c: Fix a printf format compiler warning In particular, on systems that define uint32_t as an unsigned long, gcc complains as follows: CC vcs-svn/svndump.o vcs-svn/svndump.c: In function `svndump_read': vcs-svn/svndump.c:215: warning: int format, uint32_t arg (arg 2) In order to suppress the warning we use the C99 format specifier macro PRIu32 from <inttypes.h>. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 January 2011, 00:48:47 UTC |
| 60a2e33 | Jonathan Nieder | 16 January 2011, 03:49:40 UTC | remote-ext: do not segfault for blank lines Instead of stripping space characters past the beginning of the line and overflowing a buffer, stop at the beginning of the line (mimicking the corresponding fix in remote-fd). The argument to isspace does not need to be cast explicitly because git isspace takes care of that already. Noticed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2011, 18:18:25 UTC |
| 898243b | Jonathan Nieder | 16 January 2011, 02:16:05 UTC | Documentation/fast-import: capitalize beginning of sentence Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2011, 18:15:59 UTC |
| 4fb40c2 | Jonathan Nieder | 16 January 2011, 01:08:42 UTC | ll-merge: simplify opts == NULL case As long as sizeof(struct ll_merge_options) is small, there is not much reason not to keep a copy of the default merge options in the BSS section. In return, we get clearer code and one less stack frame in the opts == NULL case. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 January 2011, 04:34:14 UTC |
| adf872e | Junio C Hamano | 13 January 2011, 19:42:01 UTC | Git 1.7.4-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2011, 20:14:18 UTC |
| 477039c | Junio C Hamano | 13 January 2011, 19:39:18 UTC | Merge branch 'jn/gitweb-no-logo' * jn/gitweb-no-logo: gitweb: make logo optional | 13 January 2011, 19:39:18 UTC |
| 17e1c9e | Junio C Hamano | 13 January 2011, 19:38:05 UTC | Merge branch 'jn/perl-funcname' * jn/perl-funcname: userdiff/perl: catch BEGIN/END/... and POD as headers diff: funcname and word patterns for perl | 13 January 2011, 19:38:05 UTC |
| 17fd68d | Junio C Hamano | 13 January 2011, 19:36:12 UTC | Merge branch 'sr/gitweb-hilite-more' * sr/gitweb-hilite-more: gitweb: remove unnecessary test when closing file descriptor gitweb: add extensions to highlight feature map | 13 January 2011, 19:36:12 UTC |
| 857ba70 | Junio C Hamano | 13 January 2011, 19:36:05 UTC | Merge branch 'rj/svn-test' * rj/svn-test: lib-git-svn.sh: Move web-server handling code into separate function | 13 January 2011, 19:36:05 UTC |
| 7810c6b | Junio C Hamano | 13 January 2011, 19:35:28 UTC | Merge branch 'rj/test-fixes' * rj/test-fixes: t4135-*.sh: Skip the "backslash" tests on cygwin t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW t3032-*.sh: Pass the -b (--binary) option to sed on cygwin t6038-*.sh: Pass the -b (--binary) option to sed on cygwin Conflicts: t/t3032-merge-recursive-options.sh | 13 January 2011, 19:35:28 UTC |
| 37ee62b | Junio C Hamano | 13 January 2011, 19:34:56 UTC | Merge branch 'jk/diff-driver-binary-doc' * jk/diff-driver-binary-doc: docs: explain diff.*.binary option | 13 January 2011, 19:34:56 UTC |
| 4b297df | Junio C Hamano | 13 January 2011, 19:34:52 UTC | Merge branch 'jn/t9010-work-around-broken-svnadmin' * jn/t9010-work-around-broken-svnadmin: t9010: svnadmin can fail even if available | 13 January 2011, 19:34:52 UTC |
| 4f93fc7 | Junio C Hamano | 13 January 2011, 19:34:39 UTC | Merge branch 'tr/submodule-relative-scp-url' * tr/submodule-relative-scp-url: submodule: fix relative url parsing for scp-style origin | 13 January 2011, 19:34:39 UTC |
| 3e70e37 | Michael J Gruber | 13 January 2011, 09:35:34 UTC | RelNotes/1.7.4: minor fixes Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2011, 19:32:39 UTC |
| 9cf3f14 | Thomas Rast | 13 January 2011, 11:30:23 UTC | t0000: quote TAP snippets in test code t0000 contains two snippets of actual test output. This causes problems when passing -v to the test[*]: the test infrastructure echoes the tests before running them, and the TAP parser then sees this test output and concludes that two tests failed and that the TAP output was badly formatted. Guard against this by quoting the output in the source. [*] either by running 'make smoke' with GIT_TEST_OPTS=-v, or with prove ./t0000-basic.sh :: -v Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2011, 19:32:31 UTC |
| d2f15e2 | Junio C Hamano | 13 January 2011, 05:26:51 UTC | Merge branch 'maint' * maint: commit: suggest --amend --reset-author to fix commiter identity | 13 January 2011, 05:26:51 UTC |
| 3f14246 | Matthieu Moy | 12 January 2011, 18:29:14 UTC | commit: suggest --amend --reset-author to fix commiter identity Since the message advises to fix the configuration first, the advantage of using this command is that it is cut-and-paste ready, while using --author='...' requires the user to type his name and email again. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2011, 20:43:58 UTC |
| 7fad99e | Ramsay Jones | 10 January 2011, 23:21:26 UTC | t9157-*.sh: Make the svn version check more precise These tests require an svn version 1.5 or newer to run correctly. In particular, all 1.4.x versions and earlier are too old, so fix up the case label regex to cover this range exactly. [Fix provided by Anders Kaseorg <andersk@MIT.EDU>] Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2011, 21:01:43 UTC |
| ad5b694 | Alexey Shumkin | 11 January 2011, 08:53:59 UTC | userdiff: match Pascal class methods Class declarations were already covered by the second pattern, but class methods have the 'class' keyword in front too. Account for it. Signed-off-by: Alexey Shumkin <zapped@mail.ru> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2011, 19:03:48 UTC |
| 95b104c | Johannes Sixt | 11 January 2011, 07:44:30 UTC | t/README: hint about using $(pwd) rather than $PWD in tests This adds just a "do it this way" instruction without a lot of explanation, because the details are too complex to be explained at this point. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2011, 18:51:25 UTC |
| e6ec2b6 | Johannes Sixt | 30 December 2010, 20:51:53 UTC | Fix expected values of setup tests on Windows On Windows, bash stores absolute path names in shell variables in POSIX format that begins with a slash, rather than in drive-letter format; such a value is converted to the latter format when it is passed to a non-MSYS program such as git. When an expected test value is constructed, it must contain the value that will be produced by git, which will be in the drive-letter format. But TRASH_DIRECTORY is in POSIX format. Fix this by using $(pwd), which produces drive-letter format since 4114156a (Tests on Windows: $(pwd) must return Windows-style paths). The change in t1510 is a straight seach-and-replace, except for the first hunk of the diff. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2011, 18:49:38 UTC |
| a6fd3d4 | Junio C Hamano | 10 January 2011, 18:39:38 UTC | Merge branch 'maint' * maint: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly | 10 January 2011, 18:39:38 UTC |
| 54f4cd9 | Junio C Hamano | 10 January 2011, 18:39:28 UTC | Merge branch 'maint-1.7.2' into maint * maint-1.7.2: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly | 10 January 2011, 18:39:28 UTC |
| 7a876ed | Junio C Hamano | 10 January 2011, 18:39:18 UTC | Merge branch 'maint-1.7.1' into maint-1.7.2 * maint-1.7.1: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly | 10 January 2011, 18:39:18 UTC |
| 567323d | Junio C Hamano | 10 January 2011, 18:39:04 UTC | Merge branch 'maint-1.7.0' into maint-1.7.1 * maint-1.7.0: Documentation/git-archive: spell --worktree-attributes correctly | 10 January 2011, 18:39:04 UTC |
| ab43561 | Jeff King | 09 January 2011, 20:10:04 UTC | docs: explain diff.*.binary option This was added long ago as part of the userdiff refactoring for textconv, as internally it made the code simpler and cleaner. However, there was never a concrete use case for actually using the config variable. Now that Matthieu Moy has provided such a use case, it's easy to explain it using his example. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2011, 18:00:14 UTC |
| 0316bba | Jonathan Nieder | 06 January 2011, 18:00:51 UTC | t9010: svnadmin can fail even if available If svn is built against one version of SQLite and run against another, libsvn_subr needlessly errors out in operations that need to make a commit. That is clearly not a bug in git but let us consider the ramifications for the test suite. git-svn uses libsvn directly and is probably broken by that bug; it is right for git-svn tests to fail. The vcs-svn lib, on the other hand, does not use libsvn and the test t9010 only uses svn to check its work. This points to two possible improvements: - do not disable most vcs-svn tests if svn is missing. - skip validation rather than failing it when svn fails. Bring about both by putting the svn invocations into a single test that builds a repo to compare the test-svn-fe result against. The test will always pass but only will set the new SVNREPO test prereq if svn succeeds; and validation using that repo gets an SVNREPO prerequisite so it only runs with working svn installations. Works-around: http://bugs.debian.org/608925 Noticed-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> | 10 January 2011, 17:35:17 UTC |
| ea640cc | Thomas Rast | 10 January 2011, 10:37:26 UTC | submodule: fix relative url parsing for scp-style origin The function resolve_relative_url was not prepared to deal with an scp-style origin 'user@host:path' in the case where 'path' is only a single component. Fix this by extending the logic that strips one path component from the $remoteurl. Also add tests for both styles of URLs. Noticed-by: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2011, 17:10:54 UTC |
| 920a5d4 | Thomas Rast | 10 January 2011, 12:42:23 UTC | Documentation/githooks: post-rewrite-copy-notes never existed The documentation for the post-rewrite hook contains a paragraph from its early development, where the automatic notes copying facilities were not part of the series and thus this had to be a hook. Later versions of the series implemented notes copying as a core feature. Thus mentioning post-rewrite-copy-notes was never correct. As the other hooks do not have a "there is no default hook, but..." sentence unless they ship a sample hook in either templates or contrib, we simply remove the whole paragraph. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2011, 17:09:02 UTC |
| fc7642a | Thomas Rast | 10 January 2011, 12:57:43 UTC | Documentation/git-archive: spell --worktree-attributes correctly The --worktree-attributes option was correctly documented in ba053ea (archive: do not read .gitattributes in working directory, 2009-04-18). However, later in 9b4c8b0 (archive documentation: attributes are taken from the tree by default, 2010-02-10) the misspelling "--work-tree-attributes" was used to refer to it. Fix this. Noticed-by: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2011, 17:07:24 UTC |
| 2cf08b6 | Junio C Hamano | 09 January 2011, 07:48:47 UTC | Merge branch 'maint' * maint: Mark gitk script executable | 09 January 2011, 07:48:47 UTC |
| 5b5d53c | Ramsay Jones | 14 December 2010, 18:37:43 UTC | t4135-*.sh: Skip the "backslash" tests on cygwin The BSLASHPSPEC tests (11-13) fail on cygwin, since you can't create files containing an backslash character in the name. In order to skip these tests, we simply stop (incorrectly) asserting the BSLASHPSPEC prerequisite in test-lib.sh. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2011, 07:36:37 UTC |
| a28adc2 | Ramsay Jones | 14 December 2010, 18:35:48 UTC | t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW By default grep reads in text mode and converts CRLF into LF line endings, which causes tests 4, 6 and 8 to fail. In a similar manner to commit a94114ad (Do not strip CR when grepping HTTP headers, 2010-09-12), we set (and export) the GREP_OPTIONS variable to -U so that grep will use binary mode. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2011, 07:36:37 UTC |
| 906a9a7 | Ramsay Jones | 14 December 2010, 18:34:29 UTC | t3032-*.sh: Pass the -b (--binary) option to sed on cygwin The test using the conflict_hunks helper function (test 9) fails on cygwin, since sed (by default) throws away the CR from CRLF line endings. This behaviour is undesirable, since the validation code expects the CRLF line-ending to be present. In order to fix the problem we pass the -b (--binary) option to sed, using the SED_OPTIONS variable. We use the SED_STRIPS_CR prerequisite in the conditional initialisation of SED_OPTIONS. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2011, 07:36:37 UTC |
| a31d066 | Ramsay Jones | 14 December 2010, 18:32:12 UTC | t6038-*.sh: Pass the -b (--binary) option to sed on cygwin The tests using the fuzz_conflict helper function (tests 5-6) fail on cygwin in the same way they used to on MinGW, prior to commit ca02ad3. The solution is also the same; passing the -b (--binary) option to sed, using the SED_OPTIONS variable. We introduce a new prerequisite SED_STRIPS_CR to use in the conditional initialisation of SED_OPTIONS, rather than MINGW. The new prerequisite is set in test-lib.sh for both MinGW and Cygwin. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2011, 07:36:37 UTC |
| b393515 | Anders Kaseorg | 07 January 2011, 01:14:41 UTC | Mark gitk script executable The executable bit on gitk-git/gitk was lost (accidentally it seems) by commit 62ba5143ec2ab9d4083669b1b1679355e7639cd5. Put it back, so that gitk can be run directly from a git.git checkout. Note that the script is already executable in gitk.git, just not in git.git. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2011, 07:34:02 UTC |
| e17aa8a | Ramsay Jones | 06 January 2011, 18:29:23 UTC | t9157-*.sh: Add an svn version check Acked-by: Eric Wong <normalperson@yhbt.net> Acked-by: Steven Walter <stevenrwalter@gmail.com> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 07 January 2011, 22:14:36 UTC |
| 9cfdbf9 | StephenB | 06 January 2011, 19:06:51 UTC | git svn: fix the final example in man page 'git-remote add' creates a remote.origin.fetch entry in the config, we want to replace this entry rather than add another one (which will cause 'git fetch' to error). This adds 'git config --remove-section remote.origin' after the fetch for encouraging users to only use "git svn" for future updates. [ew: rewording of commit message for present tense] Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: StephenB <mail4stb@gmail.com> | 07 January 2011, 21:50:11 UTC |
| bc2d159 | Brandon Casey | 06 January 2011, 00:30:03 UTC | t3032: limit sed branch labels to 8 characters POSIX leaves as unspecified the handling of labels greater than 8 characters. Apparently, Sun decided to treat them as errors. Make sed on Solaris happy by trimming the length of labels to 8 characters. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2011, 20:34:52 UTC |
| ed40ec5 | Brandon Casey | 06 January 2011, 00:30:02 UTC | t0001,t1510,t3301: use sane_unset which always returns with status 0 On some shells (like /usr/xpg4/bin/sh on Solaris), unset will exit non-zero when passed the name of a variable that has not been set. Use sane_unset instead so that the return value of unset can be ignored while the && linkage of the test script can be preserved. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2011, 20:22:36 UTC |
| e83c267 | Brandon Casey | 06 January 2011, 00:30:01 UTC | trace.c: ensure NULL is not passed to printf GNU printf, and many others, will print the string "(null)" if a NULL pointer is passed as the argument to a "%s" format specifier. Some implementations (like on Solaris) do not detect a NULL pointer and will produce a segfault in this case. So, fix this by ensuring that pointer variables do not contain the value NULL. Assign the string "(null)" to the variables are NULL. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2011, 20:21:49 UTC |
| 685e9d9 | Junio C Hamano | 05 January 2011, 22:46:07 UTC | Git 1.7.4-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2011, 22:57:19 UTC |
| 8594495 | Junio C Hamano | 05 January 2011, 22:50:33 UTC | Merge branch 'maint' to sync with 1.7.3.5 | 05 January 2011, 22:50:33 UTC |
| 6e97ef3 | Junio C Hamano | 05 January 2011, 22:49:19 UTC | Git 1.7.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2011, 22:49:19 UTC |
| bf9b46c | Junio C Hamano | 05 January 2011, 21:34:43 UTC | Merge branch 'jn/svn-fe' (early part) * 'jn/svn-fe' (early part): vcs-svn: Error out for v3 dumps Conflicts: t/t9010-svn-fe.sh | 05 January 2011, 21:34:43 UTC |
| d3cae60 | Junio C Hamano | 05 January 2011, 21:31:25 UTC | Merge branch 'ao/t9001-fix' * ao/t9001-fix: t/t9001-send-email.sh: fix '&&' chain in some tests | 05 January 2011, 21:31:25 UTC |
| 9e98354 | Junio C Hamano | 05 January 2011, 21:31:01 UTC | Merge branch 'pw/convert-pathname-substitution' * pw/convert-pathname-substitution: t0021: avoid getting filter killed with SIGPIPE convert filter: supply path to external driver | 05 January 2011, 21:31:01 UTC |
| 0c30ed0 | Junio C Hamano | 05 January 2011, 21:30:29 UTC | Merge branch 'mg/cvsimport' * mg/cvsimport: cvsimport: handle the parsing of uppercase config options cvsimport: partial whitespace cleanup | 05 January 2011, 21:30:29 UTC |
| 3ca7353 | Sylvain Rabot | 30 December 2010, 21:20:29 UTC | gitweb: remove unnecessary test when closing file descriptor It happens that closing file descriptor fails whereas the blob is perfectly readable. According to perlman the reasons could be: If the file handle came from a piped open, "close" will additionally return false if one of the other system calls involved fails, or if the program exits with non-zero status. (If the only problem was that the program exited non-zero, $! will be set to 0.) Closing a pipe also waits for the process executing on the pipe to complete, in case you want to look at the output of the pipe afterwards, and implicitly puts the exit status value of that command into $?. Prematurely closing the read end of a pipe (i.e. before the process writ- ing to it at the other end has closed it) will result in a SIGPIPE being delivered to the writer. If the other end can't handle that, be sure to read all the data before closing the pipe. In this case we don't mind that close fails. Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 23:59:26 UTC |
| 3ce19eb | Sylvain Rabot | 30 December 2010, 21:20:28 UTC | gitweb: add extensions to highlight feature map added: sql, php5, phps, bash, zsh, ksh, mk, make Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 23:58:57 UTC |
| cc7e816 | Antonio Ospite | 04 January 2011, 20:56:58 UTC | t/t9001-send-email.sh: fix '&&' chain in some tests t/README recommends chaining test assertions. Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 23:46:29 UTC |
| 3aa3047 | Ramsay Jones | 30 December 2010, 19:44:48 UTC | lib-git-svn.sh: Move web-server handling code into separate function This library file is currently sourced by 57 test files, of which only four may (optionally) start a web-server in order to access the svn repo via an http url, rather than a file url. In addition to isolating the current web-server handling code from the majority of tests, in a new prepare_httpd function, we also add some more error checking and reporting code to validate the apache installation. Only those tests which attempt to start the web-server, by calling start_httpd, will execute this code. Note that it is important for start_httpd to return an error indication, if prepare_httpd fails, so that the failure to use the web-server, as requested by the user, should not go unnoticed. (Unless the svnrepo variable is set to an http url at the end of start_httpd, the remaining tests will use file urls, without comment.) Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 23:31:04 UTC |
| 60d5985 | Michael J Gruber | 29 December 2010, 21:55:34 UTC | cvsimport: handle the parsing of uppercase config options The current code leads to fatal: bad config value for 'cvsimport.r' in .git/config for a standard use case with cvsimport.r set. cvsimport sets internal variables by checking the config for each possible command line option. The problem is that config items are case insensitive, so config.r and config.R are the same. The ugly error is due to that fact that cvsimport expects a bool for -R (and thus config.R) but a remote name for -r (and thus config.r). Fix this by making cvsimport expect long names for uppercase options. config options for cvsimport have been undocumented so far, though present in the code and advertised in several tutorials. So one may read "enhance" for "fix". Similarly, the names for the options are "documented" in the code, waitiing for their lowercase equivalents to be transformed into long config options, as well. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 21:31:03 UTC |
| f2665ec | Junio C Hamano | 04 January 2011, 19:23:45 UTC | Merge branch 'maint' * maint: gitweb: skip logo in atom feed when there is none t9001: Fix test prerequisites | 04 January 2011, 19:23:45 UTC |
| 081f84e | Jonathan Nieder | 04 January 2011, 04:04:46 UTC | daemon: support <directory> arguments again Ever since v1.7.4-rc0~125^2~8 (daemon: use run-command api for async serving, 2010-11-04), git daemon spawns child processes instead of forking to serve requests. The child processes learn that they are being run for this purpose from the presence of the --serve command line flag. When running with <ok_path> arguments, the --serve flag is treated as one of the path arguments and the special child behavior does not kick in. So the child becomes an ordinary git daemon process, notices that all the addresses it needs are in use, and exits with the message "fatal: unable to allocate any listen sockets on port 9418". Fix it by putting --serve at the beginning of the command line, where the flag cannot be mistaken for a path argument. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 19:23:42 UTC |
| 469bfc9 | Ralf Wildenhues | 03 January 2011, 19:03:34 UTC | Fix typos in the documentation Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 19:23:42 UTC |
| 6822052 | Jonathan Nieder | 04 September 2010, 00:45:09 UTC | gitweb: make logo optional Some sites may not want to have a logo at all. While at it, use $cgi->img to simplify this code. (CGI.pm learned most HTML4 tags by version 2.79, so this should be portable to perl 5.8, though I haven't tested.) Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 18:49:32 UTC |
| 9d9f5e7 | Jonathan Nieder | 04 September 2010, 00:44:39 UTC | gitweb: skip logo in atom feed when there is none With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url, 2006-12-04), the logo URI to be written to Atom feeds was corrected but the case of no logo forgotten. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 18:48:37 UTC |
| 57da204 | Robin H. Johnson | 29 December 2010, 21:02:31 UTC | t9001: Fix test prerequisites Add in missing Perl prerequisites for new tests of send-email. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2010, 21:39:05 UTC |
| 01b97a4 | Junio C Hamano | 28 December 2010, 21:52:52 UTC | Git 1.7.4-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 21:53:24 UTC |
| 2cd900f | Junio C Hamano | 28 December 2010, 21:50:11 UTC | Merge branch 'maint' * maint: Prepare for 1.7.3.5 Fix false positives in t3404 due to SHELL=/bin/false close file on error in read_mmfile() Conflicts: RelNotes | 28 December 2010, 21:50:11 UTC |
| 1736793 | Junio C Hamano | 28 December 2010, 21:48:54 UTC | Prepare for 1.7.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 21:48:54 UTC |
| a121d53 | Junio C Hamano | 28 December 2010, 21:45:12 UTC | Merge branch 'jk/commit-die-on-bogus-ident' into maint * jk/commit-die-on-bogus-ident: commit: die before asking to edit the log message ident: die on bogus date format | 28 December 2010, 21:45:12 UTC |
| 359f34f | Junio C Hamano | 28 December 2010, 21:44:58 UTC | Merge branch 'ks/blame-worktree-textconv-cached' into maint * ks/blame-worktree-textconv-cached: fill_textconv(): Don't get/put cache if sha1 is not valid t/t8006: Demonstrate blame is broken when cachetextconv is on | 28 December 2010, 21:44:58 UTC |
| 58c58c8 | Junio C Hamano | 28 December 2010, 21:43:10 UTC | Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint * jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch | 28 December 2010, 21:43:10 UTC |
| 2f73969 | Junio C Hamano | 28 December 2010, 21:42:55 UTC | Merge branch 'jc/maint-am-abort-safely' into maint * jc/maint-am-abort-safely: am --abort: keep unrelated commits since the last failure and warn | 28 December 2010, 21:42:55 UTC |
| 0ec9ee3 | Junio C Hamano | 28 December 2010, 21:23:20 UTC | Merge branch 'kb/maint-status-cquote' into maint * kb/maint-status-cquote: status: Quote paths with spaces in short format | 28 December 2010, 21:23:20 UTC |
| d2559f7 | Brandon Casey | 22 December 2010, 23:58:53 UTC | t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-' The '--no-chain-reply-to' option is a Getopt::Long boolean option. The '--no-' prefix (as in --no-chain-reply-to) for boolean options is not supported in Getopt::Long version 2.32 which was released with Perl 5.8.0. This version only supports '--no' as in '--nochain-reply-to'. More recent versions of Getopt::Long, such as version 2.34, support either prefix. So use the older form in the tests. See also: 907a0b1e04ea31cb368e9422df93d8ebb0187914 84eeb687de7a6c7c42af3fb51b176e0f412a979e 3fee1fe87144360a1913eab86af9ad136c810076 Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 19:27:12 UTC |
| 5765870 | Junio C Hamano | 28 December 2010, 19:26:59 UTC | Merge branch 'jc/maint-rebase-rewrite-last-skip' * jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch | 28 December 2010, 19:26:59 UTC |
| f3bb8b4 | Junio C Hamano | 28 December 2010, 19:26:55 UTC | Merge branch 'nd/setup' * nd/setup: (47 commits) setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd git.txt: correct where --work-tree path is relative to Revert "Documentation: always respect core.worktree if set" t0001: test git init when run via an alias Remove all logic from get_git_work_tree() setup: rework setup_explicit_git_dir() setup: clean up setup_discovered_git_dir() t1020-subdirectory: test alias expansion in a subdirectory setup: clean up setup_bare_git_dir() setup: limit get_git_work_tree()'s to explicit setup case only Use git_config_early() instead of git_config() during repo setup Add git_config_early() git-rev-parse.txt: clarify --git-dir t1510: setup case #31 t1510: setup case #30 t1510: setup case #29 t1510: setup case #28 t1510: setup case #27 t1510: setup case #26 t1510: setup case #25 ... | 28 December 2010, 19:26:55 UTC |
| 5cd3e10 | Robin H. Johnson | 27 December 2010, 08:03:43 UTC | Fix false positives in t3404 due to SHELL=/bin/false If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's package building), the git-rebase exec tests will fail, because they call $SHELL around the command, and in the existing testcase, $SHELL was not being cleared sufficently. This lead to false positive failures of t3404 on systems where the package build user was locked down as noted above. Signed-off-by: "Robin H. Johnson" <robbat2@gentoo.org> X-Gentoo-Bug: 349083 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 19:22:16 UTC |
| a25e473 | Junio C Hamano | 27 December 2010, 17:19:38 UTC | userdiff/perl: catch BEGIN/END/... and POD as headers Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2010, 17:19:38 UTC |
| 71a5d4b | Jonathan Nieder | 26 December 2010, 09:07:31 UTC | diff: funcname and word patterns for perl The default function name discovery already works quite well for Perl code... with the exception of here-documents (or rather their ending). sub foo { print <<END here-document END return 1; } The default funcname pattern treats the unindented END line as a function declaration and puts it in the @@ line of diff and "grep --show-function" output. With a little knowledge of perl syntax, we can do better. You can try it out by adding "*.perl diff=perl" to the gitattributes file. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2010, 16:47:21 UTC |
| 0ed7481 | Nguyễn Thái Ngọc Duy | 27 December 2010, 01:26:04 UTC | setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd When setup_work_tree() is called, it moves cwd to $GIT_WORK_TREE and makes internal copy of $GIT_WORK_TREE absolute. The environt variable, if set by user, remains unchanged. If the variable is relative, it is no longer correct because its base dir has changed. Instead of making $GIT_WORK_TREE absolute too, we just say "." and let subsequent git processes handle it. Reported-by: Michel Briand <michelbriand@free.fr> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2010, 16:34:19 UTC |
| 26517de | Junio C Hamano | 26 December 2010, 19:18:39 UTC | Merge branch 'rs/maint-diff-fd-leak' into maint * rs/maint-diff-fd-leak: close file on error in read_mmfile() | 26 December 2010, 19:18:39 UTC |
| 5fd8981 | René Scharfe | 25 December 2010, 12:38:46 UTC | close file on error in read_mmfile() Reported in http://qa.debian.org/daca/cppcheck/sid/git_1.7.2.3-2.2.html and in http://thread.gmane.org/gmane.comp.version-control.git/123042. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2010, 19:17:18 UTC |
