| 6068ac8 | Martin von Zweigbergk | 20 December 2010, 15:18:25 UTC | completion: add missing configuration variables Quite a few configuration variables have been added since 226b343 (completion: add missing configuration variables to _git_config(), 2009-05-03). Add these variables to the Bash completion script. Also remove the obsolete 'add.ignore-errors' and 'color.grep.external', as well as 'diff.renameLimit.', which never existed and rename the misspelled 'sendemail.aliasesfiletype'. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 01:21:21 UTC |
| f29db85 | Junio C Hamano | 20 December 2010, 01:49:42 UTC | Merge branch 'maint' * maint: gitweb: Include links to feeds in HTML header only for '200 OK' response fsck docs: remove outdated and useless diagnostic userdiff: fix typo in ruby and python word regexes trace.c: mark file-local function static Fix typo in git-gc document. | 20 December 2010, 01:49:42 UTC |
| 4de0bbd | Jonathan Nieder | 13 December 2010, 09:28:05 UTC | t9300: use perl "head -c" clone in place of "dd bs=1 count=16000" kluge It is unfortunate to have to issue thousands of one-byte read calls to work around dd's refusal to buffer input that would fill a block after a short read (a3a6f4, 2010-12-13). We could do better by using "head -c", if it were available on all platforms we cared about. Replace it with some simple perl. While doing so, restructure 9300.114 to use a subshell instead of a script. Subshells can inherit functions (like the new head_c) from the parent shell while external scripts cannot. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 21:51:09 UTC |
| 834d9eb | Thiago Farina | 19 December 2010, 11:56:25 UTC | builtin/rm.c: Use ALLOC_GROW instead of alloc_nr and xrealloc. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 18:44:06 UTC |
| fcbc0d8 | Thiago Farina | 14 December 2010, 01:59:55 UTC | builtin/branch.c: Use ALLOC_GROW instead of alloc_nr and xrealloc. Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 18:43:53 UTC |
| 05bb5a2 | Jakub Narebski | 18 December 2010, 20:02:13 UTC | gitweb: Include links to feeds in HTML header only for '200 OK' response To do that, generating "<link />"s to feeds were refactored into print_feed_meta() subroutine, to keep nesting (indent) level in git_header_html() low. This has also the advantage of making code more clear. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 06:58:45 UTC |
| 0c806a0 | Mark Lodato | 18 December 2010, 05:38:38 UTC | fsck docs: remove outdated and useless diagnostic In git-fsck(1), there was a reference to the warning "<tree> has full pathnames in it". This exact wording has not been used since 2005 (commit f1f0d0889e55), when the wording was changed slightly. More importantly, the description of that warning was useless, and there were many other similar warning messages which were not document at all. Since all these warnings are fairly obvious, there is no need for them to be in the man page. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 06:58:40 UTC |
| b34f69f | Thomas Rast | 18 December 2010, 16:17:53 UTC | userdiff: fix typo in ruby and python word regexes Both had an unclosed ] that ruined the safeguard against not matching a non-space char. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 06:58:40 UTC |
| 8e8aa44 | Vasyl' Vavrychuk | 16 December 2010, 22:38:42 UTC | trace.c: mark file-local function static Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2010, 21:40:32 UTC |
| 4be0c35 | Jiang Xin | 16 December 2010, 07:16:49 UTC | Fix typo in git-gc document. The variable gc.packrefs for git-gc can be set to true, false and "notbare", not "nobare". Signed-off-by: Jiang Xin <jiangxin@ossxp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2010, 19:53:53 UTC |
| 1b97434 | Junio C Hamano | 17 December 2010, 05:43:08 UTC | Update draft release notes to 1.7.4 We are getting closer to -rc0 ;-) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2010, 05:43:08 UTC |
| 38a5932 | Junio C Hamano | 17 December 2010, 00:36:03 UTC | Merge branch 'maint' * maint: difftool: provide basename to external tools git-difftool.txt: correct the description of $BASE and describe $MERGED | 17 December 2010, 00:36:03 UTC |
| 4a689af | Michael J Gruber | 14 December 2010, 09:18:35 UTC | difftool: provide basename to external tools Currently, only configured diff helpers get the basename of the file being compared. Tools specified with "git difftool -x" only get the names of temporary files for the different versions. Export BASE so that an external tool can read the name from the environment. Rather than using a third argument, this avoids breaking existing scripts which may somewhat carelessly be using "$@" rather than "$1" "$2". Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2010, 21:01:36 UTC |
| 51bacee | Michael J Gruber | 14 December 2010, 09:18:34 UTC | git-difftool.txt: correct the description of $BASE and describe $MERGED Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2010, 21:01:31 UTC |
| cf7a64b | Junio C Hamano | 16 December 2010, 20:58:59 UTC | Merge branch 'kb/diff-C-M-synonym' * kb/diff-C-M-synonym: diff: use "find" instead of "detect" as prefix for long forms of -M and -C diff: add --detect-copies-harder as a synonym for --find-copies-harder | 16 December 2010, 20:58:59 UTC |
| 9145842 | Junio C Hamano | 16 December 2010, 20:58:38 UTC | Merge branch 'jn/fast-import-blob-access' * jn/fast-import-blob-access: t9300: avoid short reads from dd t9300: remove unnecessary use of /dev/stdin fast-import: Allow cat-blob requests at arbitrary points in stream fast-import: let importers retrieve blobs fast-import: clarify documentation of "feature" command fast-import: stricter parsing of integer options Conflicts: fast-import.c | 16 December 2010, 20:58:38 UTC |
| 4bb4d30 | Junio C Hamano | 16 December 2010, 20:57:15 UTC | Merge branch 'jl/fetch-submodule-recursive' * jl/fetch-submodule-recursive: fetch_populated_submodules(): document dynamic allocation Submodules: Add the "fetchRecurseSubmodules" config option Add the 'fetch.recurseSubmodules' config setting fetch/pull: Add the --recurse-submodules option Conflicts: builtin/fetch.c | 16 December 2010, 20:57:15 UTC |
| b5c6aac | Junio C Hamano | 16 December 2010, 20:55:36 UTC | Merge branch 'rj/msvc-fix' * rj/msvc-fix: msvc: Fix macro redefinition warnings msvc: Fix build by adding missing INTMAX_MAX define msvc: git-daemon.exe: Fix linker "unresolved externals" error msvc: Fix compilation errors in compat/win32/sys/poll.c | 16 December 2010, 20:55:36 UTC |
| 620b89c | Junio C Hamano | 16 December 2010, 20:51:05 UTC | Merge branch 'nd/extended-sha1-relpath' * nd/extended-sha1-relpath: get_sha1: teach ":$n:<path>" the same relative path logic get_sha1: support relative path ":path" syntax Make prefix_path() return char* without const Conflicts: sha1_name.c | 16 December 2010, 20:51:05 UTC |
| f68b780 | Junio C Hamano | 16 December 2010, 20:50:03 UTC | Merge branch 'aa/status-hilite-branch' * aa/status-hilite-branch: default color.status.branch to "same as header" status: show branchname with a configurable color | 16 December 2010, 20:50:03 UTC |
| b932c3c | Junio C Hamano | 16 December 2010, 20:49:59 UTC | Merge branch 'ak/describe-exact' * 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 | 16 December 2010, 20:49:59 UTC |
| 20cb8e2 | Junio C Hamano | 16 December 2010, 20:49:48 UTC | Merge branch 'nd/maint-relative' * nd/maint-relative: get_cwd_relative(): do not misinterpret root path | 16 December 2010, 20:49:48 UTC |
| b720c75 | Junio C Hamano | 16 December 2010, 20:49:35 UTC | Merge branch 'jn/maint-svn-fe' * jn/maint-svn-fe: t9010 fails when no svn is available vcs-svn: fix intermittent repo_tree corruption treap: make treap_insert return inserted node t9010 (svn-fe): Eliminate dependency on svn perl bindings | 16 December 2010, 20:49:35 UTC |
| f1f7677 | Junio C Hamano | 16 December 2010, 20:49:28 UTC | Merge branch 'jc/maint-svn-info-test-fix' * jc/maint-svn-info-test-fix: t9119: do not compare "Text Last Updated" line from "svn info" | 16 December 2010, 20:49:28 UTC |
| 7eaf4af | Junio C Hamano | 16 December 2010, 20:49:22 UTC | Merge branch 'jn/submodule-b-current' * jn/submodule-b-current: git submodule: Remove now obsolete tests before cloning a repo git submodule -b ... of current HEAD fails | 16 December 2010, 20:49:22 UTC |
| c835288 | Junio C Hamano | 16 December 2010, 20:49:16 UTC | Merge branch 'jn/maint-fast-import-object-reuse' * jn/maint-fast-import-object-reuse: fast-import: insert new object entries at start of hash bucket | 16 December 2010, 20:49:16 UTC |
| f73c3e9 | Junio C Hamano | 16 December 2010, 20:49:11 UTC | Merge branch 'jn/fast-import-ondemand-checkpoint' * jn/fast-import-ondemand-checkpoint: fast-import: treat SIGUSR1 as a request to access objects early | 16 December 2010, 20:49:11 UTC |
| 15368e1 | Junio C Hamano | 15 December 2010, 23:30:49 UTC | Sync with 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2010, 00:27:40 UTC |
| fa1c854 | Junio C Hamano | 15 December 2010, 19:47:40 UTC | Git 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:47:40 UTC |
| b91779f | Junio C Hamano | 15 December 2010, 19:45:36 UTC | Git 1.7.2.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:45:36 UTC |
| 9db41eb | Junio C Hamano | 15 December 2010, 19:40:40 UTC | Git 1.7.1.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:40:40 UTC |
| cb198b3 | Junio C Hamano | 15 December 2010, 19:38:19 UTC | Git 1.7.0.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:38:19 UTC |
| abf411e | Junio C Hamano | 15 December 2010, 19:32:57 UTC | Git 1.6.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:32:57 UTC |
| ec82874 | Junio C Hamano | 15 December 2010, 19:27:41 UTC | Git 1.6.5.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:27:41 UTC |
| 88fcc52 | Junio C Hamano | 15 December 2010, 19:19:11 UTC | Git 1.6.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:19:11 UTC |
| 3017ed6 | Jakub Narebski | 14 December 2010, 23:34:01 UTC | gitweb: Introduce esc_attr to escape attributes of HTML elements It is needed only to escape attributes of handcrafted HTML elements, and not those generated using CGI.pm subroutines / methods for HTML generation. While at it, add esc_url and esc_html where needed, and prefer to use CGI.pm HTML generating methods than handcrafted HTML code. Most of those are probably unnecessary (could be exploited only by person with write access to gitweb config, or at least access to the repository). This fixes CVE-2010-3906 Reported-by: Emanuele Gentili <e.gentili@tigersecurity.it> Helped-by: John 'Warthog9' Hawley <warthog9@kernel.org> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:16:31 UTC |
| 74f6e05 | Junio C Hamano | 14 December 2010, 17:09:13 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add Brazilian Portuguese (pt-BR) translation gitk: Make text selectable on Mac gitk: Prevent the text pane from becoming editable gitk: Add the equivalent of diff --color-words gitk: Update Swedish translation (290t) gitk: Show notes by default (like git log does) | 14 December 2010, 17:09:13 UTC |
| e6b71b3 | Junio C Hamano | 14 December 2010, 16:57:38 UTC | Merge branch 'maint' * maint: Prepare for 1.7.3.4 use persistent memory for rejected paths do not overwrite files in leading path lstat_cache: optionally return match_len add function check_ok_to_remove() t7607: add leading-path tests t7607: use test-lib functions and check MERGE_HEAD Do not link with -lcrypto under NO_OPENSSL Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:58:09 UTC |
| ada6a41 | Junio C Hamano | 14 December 2010, 15:51:35 UTC | Prepare for 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:52 UTC |
| 3055d78 | Clemens Buchacher | 15 November 2010, 19:52:19 UTC | use persistent memory for rejected paths An aborted merge prints the list of rejected paths as part of the error message. Since commit f66caaf9 (do not overwrite files in leading path), some of those paths do not have static buffers, so we have to keep a copy. Use string_list's to accomplish this. This changes the order of the list to the order in which the paths are processed. Previously, it was reversed. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:13 UTC |
| b1735b1 | Clemens Buchacher | 09 October 2010, 13:53:00 UTC | do not overwrite files in leading path If the work tree contains an untracked file x, and unpack-trees wants to checkout a path x/*, the file x is removed unconditionally. Instead, apply the same checks that are normally used for untracked files, and abort if the file cannot be removed. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:12 UTC |
| f7e3bd3 | Clemens Buchacher | 09 October 2010, 13:52:59 UTC | lstat_cache: optionally return match_len Return match_len so that the caller can know which leading path component matched. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:11 UTC |
| 6838d1a | Clemens Buchacher | 09 October 2010, 13:52:58 UTC | add function check_ok_to_remove() This wraps some inline code into the function check_ok_to_remove(), which will later be used for leading path components as well. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:10 UTC |
| 175659b | Clemens Buchacher | 10 October 2010, 08:38:58 UTC | t7607: add leading-path tests Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:54:05 UTC |
| 18a1d89 | Clemens Buchacher | 10 October 2010, 08:35:43 UTC | t7607: use test-lib functions and check MERGE_HEAD Use the test_commit and test_path_is_missing functions from the test library. Also make sure that a merge which fails due to pre-merge checks aborts properly and does not leave MERGE_HEAD behind. The "will not overwrite removed file" test is an exception to this. It notices the untracked file at a stage where the merge is already well under way. Therefore we cannot abort the merge without major restructuring. See the following thread for more details. http://mid.gmane.org/7vskopwxej.fsf@gitster.siamese.dyndns.org Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:09:56 UTC |
| 40d675f | Junio C Hamano | 14 December 2010, 15:50:20 UTC | Merge branch 'jc/maint-no-openssl-build-fix' into maint * jc/maint-no-openssl-build-fix: Do not link with -lcrypto under NO_OPENSSL | 14 December 2010, 15:50:20 UTC |
| b69fb78 | Junio C Hamano | 14 December 2010, 15:36:23 UTC | Merge branch 'ja/maint-pull-rebase-doc' into maint * ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase | 14 December 2010, 15:36:23 UTC |
| 6b090e1 | Junio C Hamano | 14 December 2010, 15:36:10 UTC | Merge branch 'tc/http-urls-ends-with-slash' into maint * tc/http-urls-ends-with-slash: http-fetch: rework url handling http-push: add trailing slash at arg-parse time, instead of later on http-push: check path length before using it http-push: Normalise directory names when pushing to some WebDAV servers http-backend: use end_url_with_slash() url: add str wrapper for end_url_with_slash() shift end_url_with_slash() from http.[ch] to url.[ch] t5550-http-fetch: add test for http-fetch t5550-http-fetch: add missing '&&' | 14 December 2010, 15:36:10 UTC |
| 5b57076 | Junio C Hamano | 14 December 2010, 15:36:00 UTC | Merge branch 'nd/maint-hide-checkout-index-from-error' into maint * nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages | 14 December 2010, 15:36:00 UTC |
| 006f424 | Junio C Hamano | 14 December 2010, 15:35:50 UTC | Merge branch 'jk/maint-reflog-bottom' into maint * jk/maint-reflog-bottom: reflogs: clear flags properly in corner case | 14 December 2010, 15:35:50 UTC |
| 37ad7ca | Junio C Hamano | 14 December 2010, 15:35:44 UTC | Merge branch 'mz/rebase-abort-reflog-fix' into maint * mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref | 14 December 2010, 15:35:44 UTC |
| e0cbf12 | Junio C Hamano | 14 December 2010, 15:35:31 UTC | Merge branch 'mz/maint-rebase-stat-config' into maint * mz/maint-rebase-stat-config: rebase: only show stat if configured to true | 14 December 2010, 15:35:31 UTC |
| 187b259 | Junio C Hamano | 14 December 2010, 15:35:18 UTC | Merge branch 'gc/http-with-non-ascii-username-url' into maint * gc/http-with-non-ascii-username-url: Fix username and password extraction from HTTP URLs t5550: test HTTP authentication and userinfo decoding Conflicts: t/lib-httpd/apache.conf | 14 December 2010, 15:35:18 UTC |
| 6758ad9 | Alexandre Erwin Ittner | 07 December 2010, 22:56:06 UTC | gitk: Add Brazilian Portuguese (pt-BR) translation Translating a SCM is tricky due to amount of jargon, so, I tried to keep the wording consistent with both the German and Italian git translations and the pt-BR translation of other SCMs. Signed-off-by: Alexandre Erwin Ittner <alexandre@ittner.com.br> Signed-off-by: Paul Mackerras <paulus@samba.org> | 14 December 2010, 09:04:11 UTC |
| 0137ef7 | Michael J Gruber | 13 December 2010, 16:12:29 UTC | t800?-blame.sh: retitle uniquely Currently we have three test files matching t800?-blame.sh. Rename the latter two to make it easier to spot where additions would go. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2010, 19:54:39 UTC |
| 28368e9 | Jeff King | 13 December 2010, 17:07:34 UTC | tests: flip executable bit on t9158 All tests are supposed to be executable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2010, 19:38:11 UTC |
| d38732c | Jeff King | 13 December 2010, 17:22:38 UTC | tests: add some script lint checks There are some common but minor errors we tend to make in writing test scripts: 1. Scripts are left non-executable. This is not usually noticed immediately because "make test" does not need the bit, but it is a matter of git policy to make them executable (and is a slight convenience when running individual scripts). 2. Two scripts are allocated the same number. Usually this happens on separate branches, and the problem only comes about during a merge. But since there is no textual conflict, the merger would have to be very observant to notice. This is also a minor error, but can make GIT_SKIP_TESTS ambiguous. This patch introduces a "test-lint" target which checks both. It is not invoked by default. You can invoke it as "make test-lint", or you can make it a prerequisite of running the tests by specifying "TEST_LINT = test-lint" in your config.mak or on the command line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2010, 19:37:44 UTC |
| 0d6504c | Johannes Sixt | 13 December 2010, 10:14:02 UTC | Avoid duplicate test number t7609 Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2010, 15:23:51 UTC |
| a3a6f4c | Jonathan Nieder | 13 December 2010, 06:31:51 UTC | t9300: avoid short reads from dd dd is a thin wrapper around read(2). As open group Issue 7 explains: It shall read the input one block at a time, using the specified input block size; it shall then process the block of data actually returned, which could be smaller than the requested block size. Any short read --- for example from a pipe whose capacity cannot fill a block --- results in that block being truncated. As a result, the first cat-blob test (9300.114) fails on Mac OS X, where the pipe capacity is around 8 KiB. Fix the test by using a block size of 1. Each read will block until the next byte of input is available. It would be even nicer to use head -c which expresses the intention more clearly. Alas, IRIX "head" does not support the -c option. Reported-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2010, 07:17:44 UTC |
| b5c1781 | Junio C Hamano | 13 December 2010, 05:49:53 UTC | Merge branch 'ja/maint-pull-rebase-doc' * ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase | 13 December 2010, 05:49:53 UTC |
| 52cb573 | Junio C Hamano | 13 December 2010, 05:49:53 UTC | Merge branch 'gb/web--browse' * gb/web--browse: web--browse: better support for chromium web--browse: support opera, seamonkey and elinks web--browse: split valid_tool list web--browse: coding style | 13 December 2010, 05:49:53 UTC |
| 6e67619 | Junio C Hamano | 13 December 2010, 05:49:53 UTC | Merge branch 'jn/parse-options-extra' * jn/parse-options-extra: update-index: migrate to parse-options API setup: save prefix (original cwd relative to toplevel) in startup_info parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION parse-options: allow git commands to invent new option types parse-options: never suppress arghelp if LITERAL_ARGHELP is set parse-options: do not infer PARSE_OPT_NOARG from option type parse-options: sanity check PARSE_OPT_NOARG flag parse-options: move NODASH sanity checks to parse_options_check parse-options: clearer reporting of API misuse parse-options: Don't call parse_options_check() so much | 13 December 2010, 05:49:53 UTC |
| 47bfb3d | Junio C Hamano | 13 December 2010, 05:49:52 UTC | Merge branch 'js/configurable-tab' * js/configurable-tab: Make the tab width used for whitespace checks configurable apply --whitespace=fix: fix tab-in-indent | 13 December 2010, 05:49:52 UTC |
| 6a79be3 | Junio C Hamano | 13 December 2010, 05:49:52 UTC | Merge branch 'nd/maint-hide-checkout-index-from-error' * nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages | 13 December 2010, 05:49:52 UTC |
| e623412 | Junio C Hamano | 13 December 2010, 05:49:52 UTC | Merge branch 'jn/gitweb-per-request-config' * jn/gitweb-per-request-config: gitweb: document $per_request_config better gitweb: selectable configurations that change with each request | 13 December 2010, 05:49:52 UTC |
| 4a29c6a | Junio C Hamano | 13 December 2010, 05:49:52 UTC | Merge branch 'ef/help-cmd-prefix' * ef/help-cmd-prefix: help: always suggest common-cmds if prefix of cmd | 13 December 2010, 05:49:52 UTC |
| a0078de | Junio C Hamano | 13 December 2010, 05:49:52 UTC | Merge branch 'tc/http-urls-ends-with-slash' * tc/http-urls-ends-with-slash: http-fetch: rework url handling http-push: add trailing slash at arg-parse time, instead of later on http-push: check path length before using it http-push: Normalise directory names when pushing to some WebDAV servers http-backend: use end_url_with_slash() url: add str wrapper for end_url_with_slash() shift end_url_with_slash() from http.[ch] to url.[ch] t5550-http-fetch: add test for http-fetch t5550-http-fetch: add missing '&&' | 13 December 2010, 05:49:52 UTC |
| 33935dc | Junio C Hamano | 13 December 2010, 05:49:52 UTC | Merge branch 'tc/format-patch-p' * tc/format-patch-p: format-patch: page output with --stdout | 13 December 2010, 05:49:52 UTC |
| 1e86274 | Junio C Hamano | 13 December 2010, 05:49:52 UTC | Merge branch 'ef/win32-dirent' * ef/win32-dirent: win32: use our own dirent.h msvc: opendir: handle paths ending with a slash win32: dirent: handle errors msvc: opendir: do not start the search msvc: opendir: allocate enough memory msvc: opendir: fix malloc-failure Conflicts: Makefile | 13 December 2010, 05:49:52 UTC |
| cd425a1 | Junio C Hamano | 13 December 2010, 05:49:51 UTC | Merge branch 'mz/rebase-i-verify' * mz/rebase-i-verify: rebase: support --verify | 13 December 2010, 05:49:51 UTC |
| 6b236bf | Junio C Hamano | 13 December 2010, 05:49:51 UTC | Merge branch 'mz/rebase-abort-reflog-fix' * mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref | 13 December 2010, 05:49:51 UTC |
| 9f5074e | Junio C Hamano | 13 December 2010, 05:49:51 UTC | Merge branch 'jk/maint-reflog-bottom' * jk/maint-reflog-bottom: reflogs: clear flags properly in corner case | 13 December 2010, 05:49:51 UTC |
| 0d181cb | Junio C Hamano | 13 December 2010, 05:49:51 UTC | Merge branch 'jk/asciidoc-update' * jk/asciidoc-update: docs: default to more modern toolset | 13 December 2010, 05:49:51 UTC |
| 73fd7f3 | Junio C Hamano | 13 December 2010, 05:49:51 UTC | Merge branch 'mz/pull-rebase-rebased' * mz/pull-rebase-rebased: Use reflog in 'pull --rebase . foo' | 13 December 2010, 05:49:51 UTC |
| 25756cf | Junio C Hamano | 13 December 2010, 05:49:50 UTC | Merge branch 'mz/maint-rebase-stat-config' * mz/maint-rebase-stat-config: rebase: only show stat if configured to true | 13 December 2010, 05:49:50 UTC |
| 6758af8 | Junio C Hamano | 13 December 2010, 05:49:50 UTC | Merge branch 'jn/git-cmd-h-bypass-setup' * jn/git-cmd-h-bypass-setup: update-index -h: show usage even with corrupt index merge -h: show usage even with corrupt index ls-files -h: show usage even with corrupt index gc -h: show usage even with broken configuration commit/status -h: show usage even with broken configuration checkout-index -h: show usage even in an invalid repository branch -h: show usage even in an invalid repository Conflicts: builtin/merge.c | 13 December 2010, 05:49:50 UTC |
| 4adcbea | Stefan Haller | 14 November 2010, 12:22:56 UTC | gitk: Make text selectable on Mac Stolen from git-gui, 23effa79f7 (original log message by Shawn O. Pearce <spearce@spearce.org> follows): git-gui: Force focus to the diff viewer on mouse click. Apparently a "feature" of Tcl/Tk on Mac OS X is that a disabled text widget cannot receive focus or receive a selection within it. This makes the diff viewer almost useless on that platform as you cannot select individual parts of the buffer. Now we force focus into the diff viewer when its clicked on with button 1. This works around the feature and allows selection to work within the viewer just like it does on other less sane systems, like Microsoft Windows. Signed-off-by: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 12 December 2010, 04:24:09 UTC |
| 120ea89 | Stefan Haller | 14 November 2010, 12:21:50 UTC | gitk: Prevent the text pane from becoming editable When setting the "Patch/Tree" radio buttons to "Tree" and clicking on a file to display it, the text pane would accidentally become editable (because of the early return in getblobline). Signed-off-by: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 12 December 2010, 04:24:09 UTC |
| ae4e3ff | Thomas Rast | 16 October 2010, 10:15:10 UTC | gitk: Add the equivalent of diff --color-words Use the newly added 'diff --word-diff=porcelain' to teach gitk a color-words mode, with two different modes analogous to the --word-diff=plain and --word-diff=color settings. These are selected by a dropdown box. As an extra twist, automatically enable this word-diff support when the user mentions a word-diff related option on the command line. These options were previously ignored because they would break diff parsing. Both of these features are only enabled if we have a version of git that supports --word-diff=porcelain, meaning at least 1.7.2. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 December 2010, 23:46:52 UTC |
| 1cca16e | Peter Krefting | 12 September 2010, 20:17:05 UTC | gitk: Update Swedish translation (290t) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 December 2010, 22:55:43 UTC |
| 4443091 | Junio C Hamano | 11 December 2010, 00:40:00 UTC | Relnotes: remove items fixed on 'maint' Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2010, 00:40:00 UTC |
| 271c2aa | Junio C Hamano | 11 December 2010, 00:36:19 UTC | Merge branch 'maint' | 11 December 2010, 00:36:53 UTC |
| c6d059b | Junio C Hamano | 11 December 2010, 00:35:00 UTC | Prepare for 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2010, 00:35:00 UTC |
| 7bf040c | Junio C Hamano | 11 December 2010, 00:13:14 UTC | Merge branch 'jk/maint-decorate-01-bool' into maint * jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values | 11 December 2010, 00:13:14 UTC |
| aa78384 | Junio C Hamano | 11 December 2010, 00:13:03 UTC | Merge branch 'mg/maint-tag-rfc1991' into maint * mg/maint-tag-rfc1991: tag: recognize rfc1991 signatures tag: factor out sig detection for tag display tag: factor out sig detection for body edits verify-tag: factor out signature detection t/t7004-tag: test handling of rfc1991 signatures | 11 December 2010, 00:13:03 UTC |
| af41867 | Junio C Hamano | 11 December 2010, 00:12:51 UTC | Merge branch 'ks/maint-getenv-fix' into maint * ks/maint-getenv-fix: setup: make sure git_dir path is in a permanent buffer, getenv(3) case | 11 December 2010, 00:12:51 UTC |
| f611ddc | Yann Dirson | 10 November 2010, 20:27:12 UTC | diff: use "find" instead of "detect" as prefix for long forms of -M and -C It is more consistent with existing --find-copies-harder; luckily "detect" variant has not appeared in any officially released version of git. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2010, 21:52:05 UTC |
| 148135f | Jeff King | 09 December 2010, 17:27:08 UTC | default color.status.branch to "same as header" This gives it the same behavior as we had prior to 1d28232 (status: show branchname with a configurable color). To do this we need the concept of a "NIL" color, which is provided by color.[ch]. The implementation is very simple; in particular, there are no precautions taken against code accidentally printing the NIL. This should be fine in practice because: 1. You can't input a NIL color in the config, so it must come from the in-code defaults. Which means it is up the client code to handle the NILs it defines. 2. If we do ever print a NIL, it will be obvious what the problem is, and the bug can be fixed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2010, 20:59:52 UTC |
| b361888 | Junio C Hamano | 10 December 2010, 18:32:12 UTC | thread-utils.h: simplify the inclusion All files that include this header file use the same four line incantation: #ifndef NO_PTHREADS #include <pthread.h> #include "thread-utils.h" #endif Move the responsibility for that gymnastics to the header file from the files that include it. This approach makes it easier to later declare new services that are related to threading in thread-utils.h and have them available to all the threading code. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2010, 20:58:06 UTC |
| e4117b1 | Jonathan Nieder | 10 December 2010, 19:48:25 UTC | Makefile: transport-helper uses thread-utils.h transport-helper.o gained a dependency on thread-utils.h in 7851b1e (remote-fd/ext: finishing touches after code review, 2010-11-17). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2010, 20:57:59 UTC |
| 1a3e302 | Alejandro R. Sedeño | 10 December 2010, 18:44:15 UTC | Add --force to git-send-email documentation Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2010, 18:50:32 UTC |
| 1c1f353 | Junio C Hamano | 10 December 2010, 07:42:05 UTC | fetch_populated_submodules(): document dynamic allocation ... while fixing a miscounting. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2010, 07:42:05 UTC |
| 2f76a26 | Junio C Hamano | 10 December 2010, 00:03:41 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: t9143: do not fail when unhandled.log.gz is not created git-svn: allow the mergeinfo property to be set | 10 December 2010, 00:03:41 UTC |
| 93d85f5 | Ramsay Jones | 04 December 2010, 19:00:51 UTC | msvc: Fix macro redefinition warnings Commit 4091bfc (MinGW: Add missing file mode bit defines, 28-12-2009) causes the msvc build to issue many additional (currently 1008) macro redefinition warnings. The warnings relate to the S_IRUSR, S_IWUSR, S_IXUSR and S_IRWXU macros. In order to fix the warnings, we simply remove the offending macro definitions which, for both msvc and MinGW, are not required. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Sebastian Schuberth <sschuberth@gmail.com> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2010, 00:02:53 UTC |
| 1a3b5a3 | Ramsay Jones | 04 December 2010, 18:57:30 UTC | msvc: Fix build by adding missing INTMAX_MAX define Commit c03c831 (do not depend on signed integer overflow, 05-10-2010) provokes an msvc build failure. The cause of the failure is a missing definition of the INTMAX_MAX constant, used in the new maximum_signed_value_of_type(a) macro, which would normally be defined in the C99 <stdint.h> header file. In order the fix the compilation error, we add an appropriate definition of the INTMAX_MAX constant, along with INTMAX_MIN and UINTMAX_MAX, to an msvc compat header file. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2010, 00:00:30 UTC |
| ed94cc7 | Junio C Hamano | 09 December 2010, 23:52:12 UTC | Documentation/git.txt: update list of maintenance releases Recently we have made 1.7.3.3, 1.7.2.4, 1.7.1.3 and 1.7.0.8. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2010, 23:52:12 UTC |
| 3d6e0f7 | Junio C Hamano | 09 December 2010, 21:38:05 UTC | get_sha1: teach ":$n:<path>" the same relative path logic We taught the object name parser to take ":./<path>", ":../<path>", etc. and understand them to be relative to the current working directory. Given that ":<path>" is just a short-hand for ":0:<path>" (i.e. "take stage #0 of that path"), we should allow ":$n:<path>" to interpret them the same way. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2010, 21:38:05 UTC |
| 7d79cb6 | Torsten Bögershausen | 09 December 2010, 19:53:19 UTC | t9143: do not fail when unhandled.log.gz is not created Do not depend on internal implementation details of svn, which right now uses perl to create a .gz file. So this test case will even work in the future, when svn changes its implementation. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Acked-by: Eric Wong <normalperson@yhbt.net> | 09 December 2010, 20:18:03 UTC |
| 6abd933 | Steven Walter | 25 September 2010, 03:51:50 UTC | git-svn: allow the mergeinfo property to be set As a first step towards preserving merges across dcommit, we need a mechanism to update the svn:mergeinfo property. [ew: fixed bashism and style issues in test case] Signed-off-by: Steven Walter <stevenrwalter@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 09 December 2010, 20:09:48 UTC |
| d1645d0 | Anders Kaseorg | 09 December 2010, 06:47:29 UTC | describe: Delay looking up commits until searching for an inexact match Now that struct commit.util is not used until after we've checked that the argument doesn't exactly match a tag, we can wait until then to look up the commits for each tag. This avoids a lot of I/O on --exact-match queries in repositories with many tags. For example, 'git describe --exact-match HEAD' becomes about 12 times faster on a cold cache (3.2s instead of 39s) in a linux-2.6 repository with 2000 packed tags. That is a huge win for the interactivity of the __git_ps1 shell prompt helper when on a detached HEAD. Signed-off-by: Anders Kaseorg <andersk@ksplice.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2010, 19:20:26 UTC |
