| 117eea7 | Junio C Hamano | 22 July 2013, 18:21:34 UTC | Git 1.8.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 18:21:34 UTC |
| efe6de6 | Ondřej Bílka | 22 July 2013, 08:02:17 UTC | update URL to the marc.info mail archive The name marc.theaimsgroup.com is no longer active, and has migrated to marc.info. Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 17:11:18 UTC |
| 31fe405 | Junio C Hamano | 22 July 2013, 06:02:53 UTC | Update draft release notes to 1.8.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 06:03:19 UTC |
| 281ff45 | Junio C Hamano | 22 July 2013, 05:51:45 UTC | Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maint * rr/maint-fetch-tag-doc-asterisks: fetch-options.txt: prevent a wildcard refspec from getting misformatted | 22 July 2013, 05:51:45 UTC |
| 5607c74 | Junio C Hamano | 22 July 2013, 05:51:43 UTC | Merge branch 'dk/maint-t5150-dirname' into maint * dk/maint-t5150-dirname: tests: allow sha1's as part of the path | 22 July 2013, 05:51:43 UTC |
| 25b3e4f | Junio C Hamano | 22 July 2013, 05:51:41 UTC | Merge branch 'dk/version-gen-gitdir' into maint * dk/version-gen-gitdir: GIT-VERSION-GEN: support non-standard $GIT_DIR path | 22 July 2013, 05:51:41 UTC |
| b6538a0 | Junio C Hamano | 22 July 2013, 05:51:39 UTC | Merge branch 'nk/config-local-doc' into maint * nk/config-local-doc: config: Add description of --local option | 22 July 2013, 05:51:39 UTC |
| eac00c5 | Junio C Hamano | 22 July 2013, 05:51:37 UTC | Merge branch 'kb/diff-blob-blob-doc' into maint * kb/diff-blob-blob-doc: Documentation: Move "git diff <blob> <blob>" | 22 July 2013, 05:51:37 UTC |
| 4f9f1f5 | Junio C Hamano | 22 July 2013, 05:51:32 UTC | Merge branch 'mm/merge-in-dirty-worktree-doc' into maint * mm/merge-in-dirty-worktree-doc: Documentation/git-merge.txt: weaken warning about uncommited changes | 22 July 2013, 05:51:32 UTC |
| 80f0743 | Junio C Hamano | 22 July 2013, 05:51:29 UTC | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint * ph/builtin-srcs-are-in-subdir-these-days: fix "builtin-*" references to be "builtin/*" | 22 July 2013, 05:51:29 UTC |
| 8c091d9 | Junio C Hamano | 22 July 2013, 05:51:24 UTC | Merge branch 'ft/doc-git-transport' into maint * ft/doc-git-transport: documentation: add git:// transport security notice | 22 July 2013, 05:51:24 UTC |
| dbed593 | Junio C Hamano | 22 July 2013, 05:51:22 UTC | Merge branch 'mh/maint-lockfile-overflow' into maint * mh/maint-lockfile-overflow: lockfile: fix buffer overflow in path handling | 22 July 2013, 05:51:22 UTC |
| 82ec54d | Junio C Hamano | 22 July 2013, 05:48:13 UTC | Merge branch 'jc/maint-diff-core-safecrlf' into maint Avoid failing "git diff" when core.safecrlf is set to true, because the user cannot tell where the breakage is in preparation for fixing and committing. * jc/maint-diff-core-safecrlf: diff: demote core.safecrlf=true to core.safecrlf=warn | 22 July 2013, 05:48:13 UTC |
| 7c8ce4e | Vitor Antunes | 18 July 2013, 23:04:53 UTC | t9801: git-p4: check ignore files with client spec This test confirms that a file can be ignored during git p4 sync if if is excluded in P4 client specification. Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2013, 22:34:10 UTC |
| f893b74 | Junio C Hamano | 19 July 2013, 17:59:36 UTC | Start preparing for 1.8.3.4 Hopefully this will be the final maintenance release before we go to feature freeze for 1.8.4. | 19 July 2013, 18:15:17 UTC |
| 1f976bd | Stefan Beller | 18 July 2013, 21:35:27 UTC | apply.c::find_name_traditional(): do not initialize len to the line's length The variable len is set to len = strchrnul(line, '\n') - line; unconditionally 9 lines later, hence we can remove the call to strlen. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2013, 18:15:17 UTC |
| 3def06e | Stefan Beller | 18 July 2013, 21:35:26 UTC | http-push.c::add_send_request(): do not initialize transfer_request That pointer will be assigned to new memory via request = xmalloc(sizeof(*request)); 20 lines later unconditionally anyway, so it's safe to not assign it to an arbitrary variable. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2013, 18:15:17 UTC |
| 98aa2ea | Junio C Hamano | 19 July 2013, 17:43:13 UTC | Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maint * tr/test-lint-no-export-assignment-in-shell: test-lint: detect 'export FOO=bar' t9902: fix 'test A == B' to use = operator | 19 July 2013, 17:43:13 UTC |
| 871ed78 | Junio C Hamano | 19 July 2013, 17:43:08 UTC | Merge branch 'rr/name-rev-stdin-doc' into maint * rr/name-rev-stdin-doc: name-rev doc: rewrite --stdin paragraph | 19 July 2013, 17:43:08 UTC |
| ba5831f | Junio C Hamano | 19 July 2013, 17:43:05 UTC | Merge branch 'ft/diff-rename-default-score-is-half' into maint * ft/diff-rename-default-score-is-half: diff-options: document default similarity index | 19 July 2013, 17:43:05 UTC |
| 069dba2 | Junio C Hamano | 19 July 2013, 17:43:01 UTC | Merge branch 'jc/t1512-fix' into maint * jc/t1512-fix: get_short_sha1(): correctly disambiguate type-limited abbreviation t1512: correct leftover constants from earlier edition | 19 July 2013, 17:43:02 UTC |
| e6d6911 | Junio C Hamano | 19 July 2013, 17:42:57 UTC | Merge branch 'vl/typofix' into maint * vl/typofix: random typofixes (committed missing a 't', successful missing an 's') | 19 July 2013, 17:42:57 UTC |
| 0b57758 | Junio C Hamano | 19 July 2013, 17:42:52 UTC | Merge branch 'wk/doc-git-has-grown' into maint * wk/doc-git-has-grown: user-manual: Update download size for Git and the kernel | 19 July 2013, 17:42:52 UTC |
| b002bb8 | Junio C Hamano | 19 July 2013, 17:42:49 UTC | Merge branch 'ys/cygstart' into maint * ys/cygstart: web--browse: support /usr/bin/cygstart on Cygwin | 19 July 2013, 17:42:49 UTC |
| bd54df0 | Junio C Hamano | 19 July 2013, 17:42:46 UTC | Merge branch 'mm/push-force-is-dangerous' into maint * mm/push-force-is-dangerous: Documentation/git-push.txt: explain better cases where --force is dangerous | 19 July 2013, 17:42:46 UTC |
| 52c1999 | Junio C Hamano | 19 July 2013, 17:42:18 UTC | Merge branch 'rs/logical-vs-binary-or' into maint * rs/logical-vs-binary-or: use logical OR (||) instead of binary OR (|) in logical context | 19 July 2013, 17:42:18 UTC |
| 6ddc862 | Junio C Hamano | 19 July 2013, 17:41:22 UTC | Merge branch 'js/test-ln-s-add' into maint * js/test-ln-s-add: t4011: remove SYMLINKS prerequisite t6035: use test_ln_s_add to remove SYMLINKS prerequisite t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite t3100: use test_ln_s_add to remove SYMLINKS prerequisite t3030: use test_ln_s_add to remove SYMLINKS prerequisite t0000: use test_ln_s_add to remove SYMLINKS prerequisite tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) tests: introduce test_ln_s_add t3010: modernize style test-chmtime: Fix exit code on Windows | 19 July 2013, 17:41:23 UTC |
| 211e76d | Junio C Hamano | 19 July 2013, 17:41:01 UTC | Merge branch 'jk/apache-test-for-2.4' into maint Allow our tests to run with newer Apache. * jk/apache-test-for-2.4: lib-httpd/apache.conf: check version only after mod_version loads t/lib-httpd/apache.conf: configure an MPM module for apache 2.4 t/lib-httpd/apache.conf: load compat access module in apache 2.4 t/lib-httpd/apache.conf: load extra auth modules in apache 2.4 t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 | 19 July 2013, 17:41:01 UTC |
| 8589a74 | Junio C Hamano | 19 July 2013, 17:40:57 UTC | Merge branch 'tr/test-commit-only-on-orphan' into maint * tr/test-commit-only-on-orphan: Test 'commit --only' after 'checkout --orphan' | 19 July 2013, 17:40:57 UTC |
| 509152d | Junio C Hamano | 19 July 2013, 17:40:53 UTC | Merge branch 'sb/archive-zip-double-assignment-fix' into maint * sb/archive-zip-double-assignment-fix: archive-zip:write_zip_entry: Remove second reset of size variable to zero. | 19 July 2013, 17:40:53 UTC |
| 6741edc | Junio C Hamano | 19 July 2013, 17:39:12 UTC | Merge branch 'th/bisect-skip-report-range-fix' into maint The bisect log listed incorrect commits when bisection ends with only skipped ones. * th/bisect-skip-report-range-fix: bisect: Fix log output for multi-parent skip ranges | 19 July 2013, 17:39:12 UTC |
| afebd68 | Junio C Hamano | 19 July 2013, 17:39:09 UTC | Merge branch 'rs/tar-tests' into maint * rs/tar-tests: t5000: test long filenames t5000: simplify tar-tree tests t5000: use check_tar for prefix test t5000: factor out check_tar t5000, t5003: create directories for extracted files lazily t5000: integrate export-subst tests into regular tests | 19 July 2013, 17:39:10 UTC |
| 439b55b | Junio C Hamano | 19 July 2013, 17:39:06 UTC | Merge branch 'rr/column-doc' into maint * rr/column-doc: column doc: rewrite documentation for column.ui | 19 July 2013, 17:39:06 UTC |
| 65ed868 | Junio C Hamano | 19 July 2013, 17:39:01 UTC | Merge branch 'rs/discard-index-discard-array' into maint * rs/discard-index-discard-array: read-cache: free cache in discard_index read-cache: add simple performance test | 19 July 2013, 17:39:01 UTC |
| 7f05e4a | Junio C Hamano | 19 July 2013, 17:38:18 UTC | Merge branch 'tr/coverage' into maint The test coverage framework was left broken for some time. * tr/coverage: coverage: build coverage-untested-functions by default coverage: set DEFAULT_TEST_TARGET to avoid using prove coverage: do not delete .gcno files before building coverage: split build target into compile and test | 19 July 2013, 17:38:18 UTC |
| debecc5 | Stefan Beller | 19 July 2013, 16:26:24 UTC | Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-sh Reported-By: Ibrahim M. Ghazal <imgx64@gmail.com> Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2013, 17:15:09 UTC |
| 5addd1c | Junio C Hamano | 15 July 2013, 17:39:43 UTC | Git 1.8.3.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 July 2013, 17:39:43 UTC |
| 90360c7 | Junio C Hamano | 15 July 2013, 17:36:14 UTC | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint "git apply" parsed patches that add new files, generated by programs other than Git, incorrectly. This is an old breakage in v1.7.11. * tr/maint-apply-non-git-patch-parsefix: apply: carefully strdup a possibly-NULL name | 15 July 2013, 17:36:14 UTC |
| 29b2f05 | Junio C Hamano | 15 July 2013, 17:36:01 UTC | Merge branch 'bc/http-keep-memory-given-to-curl' into maint Older cURL wanted piece of memory we call it with to be stable, but we updated the auth material after handing it to a call. * bc/http-keep-memory-given-to-curl: http.c: don't rewrite the user:passwd string multiple times | 15 July 2013, 17:36:01 UTC |
| d2db8f7 | Junio C Hamano | 15 July 2013, 17:35:43 UTC | Merge branch 'jk/pull-into-dirty-unborn' into maint "git pull" into nothing trashed "local changes" that were in the index. * jk/pull-into-dirty-unborn: pull: merge into unborn by fast-forwarding from empty tree pull: update unborn branch tip after index | 15 July 2013, 17:35:43 UTC |
| 1f101bf | Junio C Hamano | 15 July 2013, 17:35:17 UTC | Merge branch 'fg/submodule-non-ascii-path' into maint Many "git submodule" operations did not work on a submodule at a path whose name is not in ASCII. * fg/submodule-non-ascii-path: t7400: test of UTF-8 submodule names pass under Mac OS handle multibyte characters in name | 15 July 2013, 17:35:17 UTC |
| 1b79021 | Junio C Hamano | 15 July 2013, 17:35:04 UTC | Merge branch 'fc/sequencer-plug-leak' into maint "cherry-pick" had a small leak in its error codepath. * fc/sequencer-plug-leak: sequencer: avoid leaking message buffer when refusing to create an empty commit sequencer: remove useless indentation | 15 July 2013, 17:35:04 UTC |
| 8ca36db | Junio C Hamano | 15 July 2013, 17:34:36 UTC | Merge branch 'mt/send-email-cc-match-fix' into maint Logic used by git-send-email to suppress cc mishandled names like "A U. Thor" <author@example.xz>, where the human readable part needs to be quoted (the user input may not have the double quotes around the name, and comparison was done between quoted and unquoted strings). It also mishandled names that need RFC2047 quoting. * mt/send-email-cc-match-fix: send-email: sanitize author when writing From line send-email: add test for duplicate utf8 name test-send-email: test for pre-sanitized self name t/send-email: test suppress-cc=self with non-ascii t/send-email: add test with quoted sender send-email: make --suppress-cc=self sanitize input t/send-email: test suppress-cc=self on cccmd send-email: fix suppress-cc=self on cccmd t/send-email.sh: add test for suppress-cc=self | 15 July 2013, 17:34:36 UTC |
| 9968fff | Thomas Rast | 08 July 2013, 15:20:32 UTC | test-lint: detect 'export FOO=bar' Some shells do not understand the one-line construct, and instead need FOO=bar && export FOO Detect this in the test-lint target. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 July 2013, 17:21:33 UTC |
| 38678a1 | Thomas Rast | 08 July 2013, 15:20:31 UTC | t9902: fix 'test A == B' to use = operator The == operator as an alias to = is not POSIX. This doesn't actually matter for the execution of the script, because it only runs when the shell is bash. However, it trips up test-lint, so it's nicer to use the standard form. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 July 2013, 17:20:59 UTC |
| 3087b61 | Ramkumar Ramachandra | 07 July 2013, 12:43:16 UTC | name-rev doc: rewrite --stdin paragraph Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2013, 18:17:50 UTC |
| 2fbd4f9 | Michael Haggerty | 06 July 2013, 19:48:52 UTC | lockfile: fix buffer overflow in path handling The path of the file to be locked is held in lock_file::filename, which is a fixed-length buffer of length PATH_MAX. This buffer is also (temporarily) used to hold the path of the lock file, which is the path of the file being locked plus ".lock". Because of this, the path of the file being locked must be less than (PATH_MAX - 5) characters long (5 chars are needed for ".lock" and one character for the NUL terminator). On entry into lock_file(), the path length was only verified to be less than PATH_MAX characters, not less than (PATH_MAX - 5) characters. When and if resolve_symlink() is called, then that function is correctly told to treat the buffer as (PATH_MAX - 5) characters long. This part is correct. However: * If LOCK_NODEREF was specified, then resolve_symlink() is never called. * If resolve_symlink() is called but the path is not a symlink, then the length check is never applied. So it is possible for a path with length (PATH_MAX - 5 <= len < PATH_MAX) to make it through the checks. When ".lock" is strcat()ted to such a path, the lock_file::filename buffer is overflowed. Fix the problem by adding a check when entering lock_file() that the original path is less than (PATH_MAX - 5) characters. [jc: with independent development by Peff] Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 July 2013, 17:29:28 UTC |
| 8240943 | Fraser Tweedale | 05 July 2013, 08:42:17 UTC | diff-options: document default similarity index The default similarity index of 50% is documented in gitdiffcore(7) but it is worth also mentioning it in the description of the -M/--find-renames option. Signed-off-by: Fraser Tweedale <frase@frase.id.au> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2013, 06:14:37 UTC |
| 531c8dd | Ramkumar Ramachandra | 28 June 2013, 15:46:19 UTC | fixup-builtins: retire an old transition helper script This script was added in 36e5e70 (Start deprecating "git-command" in favor of "git command", 2007-06-30) with the intent of aiding the transition away from dashed forms. It has already been used to help the transision and served its purpose, and is no longer very useful for follow-up work, because the majority of remaining matches it finds are false positives. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 July 2013, 05:47:53 UTC |
| 81a199b | Junio C Hamano | 03 July 2013, 22:43:41 UTC | Update draft release notes to 1.8.3.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 July 2013, 22:43:41 UTC |
| 4efd165 | Junio C Hamano | 03 July 2013, 22:41:17 UTC | Merge branch 'rr/diffcore-pickaxe-doc' into maint * rr/diffcore-pickaxe-doc: diffcore-pickaxe doc: document -S and -G properly diffcore-pickaxe: make error messages more consistent | 03 July 2013, 22:41:17 UTC |
| 213d256 | Junio C Hamano | 03 July 2013, 22:41:05 UTC | Merge branch 'cr/git-work-tree-sans-git-dir' into maint * cr/git-work-tree-sans-git-dir: git.txt: remove stale comment regarding GIT_WORK_TREE | 03 July 2013, 22:41:05 UTC |
| ac5611a | Junio C Hamano | 03 July 2013, 22:40:38 UTC | Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maint * fc/do-not-use-the-index-in-add-to-index: read-cache: trivial style cleanups read-cache: fix wrong 'the_index' usage | 03 July 2013, 22:40:38 UTC |
| a256a58 | Junio C Hamano | 03 July 2013, 22:39:37 UTC | Merge branch 'dm/unbash-subtree' into maint * dm/unbash-subtree: contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash | 03 July 2013, 22:39:37 UTC |
| 8dbc039 | Junio C Hamano | 03 July 2013, 22:39:15 UTC | Merge branch 'jc/core-checkstat' into maint * jc/core-checkstat: deprecate core.statinfo at Git 2.0 boundary | 03 July 2013, 22:39:15 UTC |
| 0bdae5f | Junio C Hamano | 03 July 2013, 22:37:58 UTC | Merge branch 'jc/t5551-posix-sed-bre' into maint * jc/t5551-posix-sed-bre: t5551: do not use unportable sed '\+' | 03 July 2013, 22:37:58 UTC |
| e9fee67 | Junio C Hamano | 03 July 2013, 22:37:50 UTC | Merge branch 'vv/help-unknown-ref' into maint * vv/help-unknown-ref: merge: use help_unknown_ref() help: add help_unknown_ref() | 03 July 2013, 22:37:50 UTC |
| 250ee16 | Junio C Hamano | 03 July 2013, 22:36:54 UTC | Merge branch 'rs/empty-archive' into maint * rs/empty-archive: t5004: resurrect original empty tar archive test t5004: avoid using tar for checking emptiness of archive Conflicts: t/t5004-archive-corner-cases.sh | 03 July 2013, 22:36:54 UTC |
| 15afe95 | Junio C Hamano | 03 July 2013, 22:36:30 UTC | Merge branch 'rh/merge-options-doc-fix' into maint * rh/merge-options-doc-fix: Documentation/merge-options.txt: restore `-e` option | 03 July 2013, 22:36:30 UTC |
| c9d9a2d | Junio C Hamano | 03 July 2013, 22:35:55 UTC | Merge branch 'an/diff-index-doc' into maint * an/diff-index-doc: Documentation/diff-index: mention two modes of operation | 03 July 2013, 22:35:55 UTC |
| 897175f | Junio C Hamano | 03 July 2013, 22:31:36 UTC | Merge branch 'cm/gitweb-project-list-persistent-cgi-fix' into maint "gitweb" forgot to clear a global variable $search_regexp upon each request, mistakenly carrying over the previous search to a new one when used as a persistent CGI. * cm/gitweb-project-list-persistent-cgi-fix: gitweb: fix problem causing erroneous project list | 03 July 2013, 22:31:36 UTC |
| 4b0d73f | Junio C Hamano | 03 July 2013, 22:31:27 UTC | Merge branch 'ar/wildmatch-foldcase' into maint The wildmatch engine did not honor WM_CASEFOLD option correctly. * ar/wildmatch-foldcase: wildmatch: properly fold case everywhere | 03 July 2013, 22:31:27 UTC |
| 318e758 | Junio C Hamano | 03 July 2013, 22:30:59 UTC | Merge branch 'cb/log-follow-with-combined' into maint "git log -c --follow $path" segfaulted upon hitting the commit that renamed the $path being followed. * cb/log-follow-with-combined: fix segfault with git log -c --follow | 03 July 2013, 22:30:59 UTC |
| b3bf469 | Junio C Hamano | 03 July 2013, 22:30:24 UTC | Merge branch 'rr/die-on-missing-upstream' into maint When a reflog notation is used for implicit "current branch", we did not say which branch, and worse said "branch ''". * rr/die-on-missing-upstream: sha1_name: fix error message for @{<N>}, @{<date>} sha1_name: fix error message for @{u} | 03 July 2013, 22:30:24 UTC |
| dfc6b04 | Junio C Hamano | 03 July 2013, 22:27:19 UTC | Merge branch 'maint-1.8.2' into maint * maint-1.8.2: git-config: update doc for --get with multiple values | 03 July 2013, 22:27:19 UTC |
| f59bebb | Junio C Hamano | 03 July 2013, 22:26:53 UTC | Merge branch 'maint-1.8.1' into maint-1.8.2 * maint-1.8.1: git-config: update doc for --get with multiple values | 03 July 2013, 22:26:53 UTC |
| 62e91ef | John Keeping | 03 July 2013, 18:27:39 UTC | git-config: update doc for --get with multiple values Since commit 00b347d (git-config: do not complain about duplicate entries, 2012-10-23), "git config --get" does not exit with an error if there are multiple values for the specified key but instead returns the last value. Update the documentation to reflect this. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 July 2013, 18:48:15 UTC |
| 94d75d1 | Junio C Hamano | 02 July 2013, 04:54:45 UTC | get_short_sha1(): correctly disambiguate type-limited abbreviation One test in t1512 that expects a failure incorrectly passed. The test prepares a commit whose object name begins with ten "0"s, and also prepares a tag that points at the commit. The object name of the tag also begins with ten "0"s. There is no other commit-ish object in the repository whose name begins with such a prefix. Ideally, in such a repository: $ git rev-parse --verify 0000000000^{commit} should yield that commit. If 0000000000 is taken as the commit 0000000000e4f, peeling it to a commmit yields that commit itself, and if 0000000000 is taken as the tag 0000000000f8f, peeling it to a commit also yields the same commit, so in that twisted sense, the extended SHA-1 expression 0000000000^{commit} is unambigous. The test that expects a failure is to check the above command. The reason the test expects a failure is that we did not implement such a "unification" of two candidate objects. What we did (or at least, meant to) implement was to recognise that a commit-ish is required to expand 0000000000, and notice that there are two succh commit-ish, and diagnose the request as ambiguous. However, there was a bug in the logic to check the candidate objects. When the code saw 0000000000f8f (a tag) that shared the shortened prefix (ten "0"s), it tried to make sure that the tag is a commit-ish by looking at the tag object. Because it incorrectly used lookup_object() when the tag has not been parsed, however, we incorrectly declared that the tag is _not_ a commit-ish, leaving the sole commit in the repository, 0000000000e4f, that has the required prefix as "unique match", causing the test to pass when it shouldn't. This fixes the logic to inspect the type of the object a tag refers to, to make the test that is expected to fail correctly fail. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 July 2013, 04:54:45 UTC |
| 2c57f7c | Junio C Hamano | 02 July 2013, 04:49:09 UTC | t1512: correct leftover constants from earlier edition The earliest iteration of this test script used a magic string 110282 as the common prefix for ambiguous object names, but the final edition switched the common prefix to 0000000000 (10 "0"s). Unfortunately, instances of the original prefix were left in the comments and a few tests. Replace them with the correct constants. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 July 2013, 04:54:27 UTC |
| f66d000 | Andrew Pimlott | 01 July 2013, 16:20:36 UTC | t7500: fix flipped actual/expect Signed-off-by: Andrew Pimlott <andrew@pimlott.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2013, 16:53:00 UTC |
| 296fa99 | Andrew Pimlott | 01 July 2013, 16:20:35 UTC | lib-rebase: document exec_ in FAKE_LINES Signed-off-by: Andrew Pimlott <andrew@pimlott.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2013, 16:52:25 UTC |
| 43d11f4 | Junio C Hamano | 30 June 2013, 22:36:03 UTC | Start preparing for 1.8.3.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 June 2013, 22:36:03 UTC |
| c6c4250 | Junio C Hamano | 30 June 2013, 22:33:40 UTC | Merge branch 'fc/macos-x-clipped-write' into maint Mac OS X does not like to write(2) more than INT_MAX number of bytes; work it around by chopping write(2) into smaller pieces. * fc/macos-x-clipped-write: compate/clipped-write.c: large write(2) fails on Mac OS X/XNU | 30 June 2013, 22:33:40 UTC |
| 9186375 | Junio C Hamano | 30 June 2013, 22:33:13 UTC | Merge branch 'da/darwin' into maint Newer MacOS X encourages the programs to compile and link with their CommonCrypto, not with OpenSSL. * da/darwin: imap-send: eliminate HMAC deprecation warnings on Mac OS X cache.h: eliminate SHA-1 deprecation warnings on Mac OS X Makefile: add support for Apple CommonCrypto facility Makefile: fix default regex settings on Darwin | 30 June 2013, 22:33:14 UTC |
| 5a87e92 | Ramkumar Ramachandra | 30 June 2013, 12:05:28 UTC | check-ignore doc: fix broken link to ls-files page Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 June 2013, 19:34:14 UTC |
| 5155c7f | SZEDER Gábor | 30 June 2013, 10:45:25 UTC | test: spell 'ls-files --delete' option correctly in test descriptions The option is spelled '--deleted'. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 June 2013, 19:31:26 UTC |
| 3a46183 | Junio C Hamano | 28 June 2013, 21:56:30 UTC | Git 1.8.3.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2013, 21:56:30 UTC |
| 94b5404 | Stefano Lattarini | 28 June 2013, 17:19:42 UTC | configure: fix option help message for --disable-pthreads The configure option to disable threading is '--disable-pthreads', not '--without-pthreads'. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2013, 17:49:26 UTC |
| 6653aa9 | Junio C Hamano | 28 June 2013, 17:00:00 UTC | Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint Cloning with "git clone --depth N" while fetch.fsckobjects (or transfer.fsckobjects) is set to true did not tell the cut-off points of the shallow history to the process that validates the objects and the history received, causing the validation to fail. * 'nd/clone-connectivity-shortcut' (early part): fetch-pack: prepare updated shallow file before fetching the pack clone: let the user know when check_everything_connected is run | 28 June 2013, 17:00:00 UTC |
| e2652c0 | Junio C Hamano | 27 June 2013, 21:48:14 UTC | Start preparing for 1.8.3.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2013, 21:48:14 UTC |
| 88f90f8 | Junio C Hamano | 27 June 2013, 21:38:22 UTC | Merge branch 'ks/difftool-dir-diff-copy-fix' into maint * ks/difftool-dir-diff-copy-fix: difftool --dir-diff: allow changing any clean working tree file | 27 June 2013, 21:38:23 UTC |
| 6be17ec | Junio C Hamano | 27 June 2013, 21:38:17 UTC | Merge branch 'rr/push-head' into maint * rr/push-head: push: make push.default = current use resolved HEAD push: fail early with detached HEAD and current push: factor out the detached HEAD error message | 27 June 2013, 21:38:17 UTC |
| c9cae1e | Junio C Hamano | 27 June 2013, 21:38:16 UTC | Merge branch 'fc/show-branch-in-rebase-am' into maint * fc/show-branch-in-rebase-am: prompt: fix for simple rebase | 27 June 2013, 21:38:16 UTC |
| f79467e | Junio C Hamano | 27 June 2013, 21:38:14 UTC | Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint * tg/maint-zsh-svn-remote-prompt: prompt: fix show upstream with svn and zsh | 27 June 2013, 21:38:14 UTC |
| fc78791 | Junio C Hamano | 27 June 2013, 21:38:12 UTC | Merge branch 'nd/urls-doc-no-file-hyperlink-fix' into maint * nd/urls-doc-no-file-hyperlink-fix: urls.txt: avoid auto converting to hyperlink | 27 June 2013, 21:38:12 UTC |
| 1ec379f | Junio C Hamano | 27 June 2013, 21:38:09 UTC | Merge branch 'tr/push-no-verify-doc' into maint * tr/push-no-verify-doc: Document push --no-verify | 27 June 2013, 21:38:09 UTC |
| ee1a1dd | Junio C Hamano | 27 June 2013, 21:38:07 UTC | Merge branch 'rs/commit-m-no-edit' into maint * rs/commit-m-no-edit: commit: don't start editor if empty message is given with -m | 27 June 2013, 21:38:07 UTC |
| 872f5bf | Junio C Hamano | 27 June 2013, 21:38:02 UTC | Merge branch 'jc/strbuf-branchname-fix' into maint * jc/strbuf-branchname-fix: strbuf_branchname(): do not double-expand @{-1}~22 | 27 June 2013, 21:38:02 UTC |
| a0bf40d | Junio C Hamano | 27 June 2013, 21:37:55 UTC | Merge branch 'mk/combine-diff-context-horizon-fix' into maint * mk/combine-diff-context-horizon-fix: combine-diff.c: Fix output when changes are exactly 3 lines apart | 27 June 2013, 21:37:56 UTC |
| 81de16a | Junio C Hamano | 27 June 2013, 21:37:52 UTC | Merge branch 'kb/ancestry-path-threedots' into maint * kb/ancestry-path-threedots: revision.c: treat A...B merge bases as if manually specified t6019: demonstrate --ancestry-path A...B breakage | 27 June 2013, 21:37:52 UTC |
| 7f3447c | Junio C Hamano | 27 June 2013, 21:37:44 UTC | Merge branch 'jk/subtree-do-not-push-if-split-fails' into maint * jk/subtree-do-not-push-if-split-fails: contrib/subtree: don't delete remote branches if split fails | 27 June 2013, 21:37:44 UTC |
| 0fb2c97 | Junio C Hamano | 27 June 2013, 21:37:41 UTC | Merge branch 'mh/fetch-into-shallow' into maint * mh/fetch-into-shallow: t5500: add test for fetching with an unknown 'shallow' upload-pack: ignore 'shallow' lines with unknown obj-ids | 27 June 2013, 21:37:41 UTC |
| 11fbc0b | Junio C Hamano | 27 June 2013, 21:37:21 UTC | Merge branch 'jh/checkout-auto-tracking' into maint * jh/checkout-auto-tracking: glossary: Update and rephrase the definition of a remote-tracking branch branch.c: Validate tracking branches with refspecs instead of refs/remotes/* t9114.2: Don't use --track option against "svn-remote"-tracking branches t7201.24: Add refspec to keep --track working t3200.39: tracking setup should fail if there is no matching refspec. checkout: Use remote refspecs when DWIMming tracking branches t2024: Show failure to use refspec when DWIMming remote branch names t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>' | 27 June 2013, 21:37:21 UTC |
| 2061801 | Fraser Tweedale | 26 June 2013, 05:53:59 UTC | documentation: add git:// transport security notice The fact that the git:// transport does no authentication is easily overlooked. For example, DNS poisoning may result in fetching from somewhere that was not intended. Add a brief security notice to the "GIT URLS" section of the documentation stating that the git transport should be used with caution on unsecured networks. Signed-off-by: Fraser Tweedale <frase@frase.id.au> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 June 2013, 20:55:37 UTC |
| 5e62cc1 | Ramkumar Ramachandra | 25 June 2013, 15:54:36 UTC | column doc: rewrite documentation for column.ui The configuration option column.ui is very poorly documented, and it is unclear what the defaults are, and what option can be combined with what. Rewrite it by splitting up the options into three sections clearly showing how COL_ENABLED, COL_LAYOUT_MASK, and COL_DENSE work. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 June 2013, 15:51:43 UTC |
| 5430bb2 | Junio C Hamano | 24 June 2013, 21:35:04 UTC | diff: demote core.safecrlf=true to core.safecrlf=warn Otherwise the user will not be able to start to guess where in the contents in the working tree the offending unsafe CR lies. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 June 2013, 20:55:03 UTC |
| 4b9ced2 | W. Trevor King | 19 June 2013, 01:55:22 UTC | user-manual: Update download size for Git and the kernel They've grown since d19fbc3 (Documentation: add git user's manual, 2007-01-07) when the stats were initially added. I've rounded download sizes up to the nearest multiple of ten MiB to decrease the precision and give a bit of growing room. Exact sizes: $ git clone git://git.kernel.org/pub/scm/git/git.git Initialized empty Git repository in /tmp/git/.git/ remote: Counting objects: 156872, done. remote: Compressing objects: 100% (40826/40826), done. remote: Total 156872 (delta 115322), reused 155492 (delta 114094) Receiving objects: 100% (156872/156872), 37.29 MiB | 7.54 MiB/s, done. Resolving deltas: 100% (115322/115322), done. $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Initialized empty Git repository in /tmp/linux/.git/ remote: Counting objects: 3057404, done. remote: Compressing objects: 100% (474769/474769), done. Receiving objects: 100% (3057404/3057404), 634.33 MiB | 27.95 MiB/s, done. remote: Total 3057404 (delta 2570385), reused 3040910 (delta 2554408) Resolving deltas: 100% (2570385/2570385), done. Checking out files: 100% (43012/43012), done. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 June 2013, 07:35:50 UTC |
| 5bdc47e | Jeff King | 21 June 2013, 18:12:51 UTC | lib-httpd/apache.conf: check version only after mod_version loads Commit 0442743 introduced an <IfVersion> directive near the top of the apache config file. However, at that point we have not yet checked for and loaded the mod_version module. This means that the directive will behave oddly if mod_version is dynamically loaded, failing to match when it should. We can fix this by moving the whole block below the LoadModule directive for mod_version. Reported-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2013, 20:58:06 UTC |
| cc2f6b6 | Yaakov Selkowitz | 21 June 2013, 07:24:32 UTC | web--browse: support /usr/bin/cygstart on Cygwin While both GUI and console Cygwin browsers do exist, anecdotal evidence suggests most users rely on their native Windows browser. cygstart, which is a long-standing part of the base Cygwin installation, will cause the page to be opened in the default Windows browser (the one registered to open .html files). Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2013, 16:05:15 UTC |
| c0add30 | Ramkumar Ramachandra | 18 June 2013, 19:24:05 UTC | completion: complete diff --word-diff Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2013, 15:52:16 UTC |
