| 7d72253 | Junio C Hamano | 10 December 2015, 20:59:37 UTC | Git 2.7-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2015, 20:59:37 UTC |
| 39e07f7 | Junio C Hamano | 10 December 2015, 20:45:17 UTC | Sync with maint * maint: Documentation/git-update-index: add missing opts to synopsis | 10 December 2015, 20:45:17 UTC |
| 86c95ac | Junio C Hamano | 10 December 2015, 20:43:52 UTC | Update release notes to 2.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2015, 20:43:52 UTC |
| 56d63d0 | Junio C Hamano | 10 December 2015, 20:36:15 UTC | Merge branch 'nd/doc-check-ref-format-typo' * nd/doc-check-ref-format-typo: git-check-ref-format.txt: typo, s/avoids/avoid/ | 10 December 2015, 20:36:15 UTC |
| 844a9ce | Junio C Hamano | 10 December 2015, 20:36:13 UTC | Merge branch 'bc/object-id' More transition from "unsigned char[40]" to "struct object_id". This needed a few merge fixups, but is mostly disentangled from other topics. * bc/object-id: remote: convert functions to struct object_id Remove get_object_hash. Convert struct object to object_id Add several uses of get_object_hash. object: introduce get_object_hash macro. ref_newer: convert to use struct object_id push_refs_with_export: convert to struct object_id get_remote_heads: convert to struct object_id parse_fetch: convert to use struct object_id add_sought_entry_mem: convert to struct object_id Convert struct ref to use object_id. sha1_file: introduce has_object_file helper. | 10 December 2015, 20:36:13 UTC |
| b12a966 | Junio C Hamano | 10 December 2015, 20:36:12 UTC | Merge branch 'dt/fsck-verify-pack-error' The exit code of git-fsck didnot reflect some types of errors found in packed objects, which has been corrected. * dt/fsck-verify-pack-error: verify_pack: do not ignore return value of verification function | 10 December 2015, 20:36:12 UTC |
| 9eb2449 | Junio C Hamano | 10 December 2015, 20:36:12 UTC | Merge branch 'ls/travis-yaml' The necessary infrastructure to build topics using the free Travis CI has been added. Developers forking from this topic (and enabling Travis) can do their own builds, and we can turn on auto-builds for git/git (including build-status for pull requests that people open). * ls/travis-yaml: Add Travis CI support | 10 December 2015, 20:36:12 UTC |
| bc49712 | Christian Couder | 25 November 2015, 09:30:02 UTC | Documentation/git-update-index: add missing opts to synopsis Split index related options should appear in the 'SYNOPSIS' section. These options are already documented in the 'OPTIONS' section. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2015, 20:21:26 UTC |
| 545299f | Junio C Hamano | 08 December 2015, 22:14:50 UTC | Merge branch 'ep/ident-with-getaddrinfo' A build without NO_IPv6 used to use gethostbyname() when guessing user's hostname, instead of getaddrinfo() that is used in other codepaths in such a build. * ep/ident-with-getaddrinfo: ident.c: add support for IPv6 | 08 December 2015, 22:14:50 UTC |
| 2b597f3 | Junio C Hamano | 08 December 2015, 22:14:49 UTC | Merge branch 'ls/test-must-fail-sigpipe' Fix some racy client/server tests by treating SIGPIPE the same as a normal non-zero exit. * ls/test-must-fail-sigpipe: add "ok=sigpipe" to test_must_fail and use it to fix flaky tests implement test_might_fail using a refactored test_must_fail | 08 December 2015, 22:14:49 UTC |
| b1cda70 | Junio C Hamano | 08 December 2015, 22:14:49 UTC | Merge branch 'dt/refs-backend-pre-vtable' Code preparation for pluggable ref backends. * dt/refs-backend-pre-vtable: refs: break out ref conflict checks files_log_ref_write: new function initdb: make safe_create_dir public refs: split filesystem-based refs code into a new file refs/refs-internal.h: new header file refname_is_safe(): improve docstring pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref() copy_msg(): rename to copy_reflog_msg() verify_refname_available(): new function verify_refname_available(): rename function | 08 December 2015, 22:14:49 UTC |
| fa5f239 | Junio C Hamano | 08 December 2015, 22:13:52 UTC | Sync with 2.6.4 | 08 December 2015, 22:13:52 UTC |
| bdfc6b3 | Junio C Hamano | 08 December 2015, 22:07:30 UTC | Git 2.6.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2015, 22:12:45 UTC |
| 4d0069f | Junio C Hamano | 08 December 2015, 22:11:32 UTC | Merge branch 'rs/status-detached-head-memcmp' into maint Fix some string-matching corner cases when digging in the reflog for "git status". * rs/status-detached-head-memcmp: wt-status: correct and simplify check for detached HEAD | 08 December 2015, 22:11:32 UTC |
| b5d2d8e | Junio C Hamano | 08 December 2015, 22:05:03 UTC | Merge branch 'ad/sha1-update-chunked' into maint Apple's common crypto implementation of SHA1_Update() does not take more than 4GB at a time, and we now have a compile-time workaround for it. * ad/sha1-update-chunked: sha1: allow limiting the size of the data passed to SHA1_Update() sha1: provide another level of indirection for the SHA-1 functions | 08 December 2015, 22:05:03 UTC |
| e6ed5a4 | Junio C Hamano | 08 December 2015, 22:05:02 UTC | Merge branch 'sg/bash-prompt-dirty-orphan' into maint Produce correct "dirty" marker for shell prompts, even when we are on an orphan or an unborn branch. * sg/bash-prompt-dirty-orphan: bash prompt: indicate dirty index even on orphan branches bash prompt: remove a redundant 'git diff' option bash prompt: test dirty index and worktree while on an orphan branch | 08 December 2015, 22:05:02 UTC |
| 22386ad | Junio C Hamano | 08 December 2015, 22:05:02 UTC | Merge branch 'jk/interpret-trailers-outside-a-repository' into maint Allow "git interpret-trailers" to run outside of a Git repository. * jk/interpret-trailers-outside-a-repository: interpret-trailers: allow running outside a repository | 08 December 2015, 22:05:02 UTC |
| 697bd28 | Junio C Hamano | 08 December 2015, 22:05:00 UTC | Merge branch 'jk/rebase-no-autostash' into maint There was no way to defeat a configured rebase.autostash variable from the command line, as "git rebase --no-autostash" was missing. * jk/rebase-no-autostash: Documentation/git-rebase: fix --no-autostash formatting rebase: support --no-autostash | 08 December 2015, 22:05:01 UTC |
| 56a8aea | Nguyễn Thái Ngọc Duy | 04 December 2015, 18:09:32 UTC | git-check-ref-format.txt: typo, s/avoids/avoid/ Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2015, 21:09:48 UTC |
| e5da865 | Junio C Hamano | 04 December 2015, 19:39:56 UTC | Sync with maint * maint: Prepare for 2.6.4 | 04 December 2015, 19:39:56 UTC |
| 9a8c740 | Junio C Hamano | 04 December 2015, 19:39:19 UTC | Prepare for 2.6.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2015, 19:39:19 UTC |
| aa0b4c3 | Junio C Hamano | 04 December 2015, 19:34:24 UTC | Merge branch 'da/difftool' into maint The code to prepare the working tree side of temporary directory for the "dir-diff" feature forgot that symbolic links need not be copied (or symlinked) to the temporary area, as the code already special cases and overwrites them. Besides, it was wrong to try computing the object name of the target of symbolic link, which may not even exist or may be a directory. * da/difftool: difftool: ignore symbolic links in use_wt_file | 04 December 2015, 19:34:24 UTC |
| b50ceab | Junio C Hamano | 04 December 2015, 19:33:07 UTC | Merge branch 'dk/gc-idx-wo-pack' into maint Having a leftover .idx file without corresponding .pack file in the repository hurts performance; "git gc" learned to prune them. We may want to do the same for .bitmap (and notice but not prune .keep) without corresponding .pack, but that can be a separate topic. * dk/gc-idx-wo-pack: gc: remove garbage .idx files from pack dir t5304: test cleaning pack garbage prepare_packed_git(): refactor garbage reporting in pack directory | 04 December 2015, 19:33:08 UTC |
| 9ed86a5 | Junio C Hamano | 04 December 2015, 19:31:28 UTC | RelNotes update for 2.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2015, 19:31:28 UTC |
| 80c17ca | Junio C Hamano | 04 December 2015, 19:19:12 UTC | Merge branch 'sg/bash-prompt-dirty-orphan' Produce correct "dirty" marker for shell prompts, even when we are on an orphan or an unborn branch. * sg/bash-prompt-dirty-orphan: bash prompt: indicate dirty index even on orphan branches bash prompt: remove a redundant 'git diff' option bash prompt: test dirty index and worktree while on an orphan branch | 04 December 2015, 19:19:12 UTC |
| 3a5b6ee | Junio C Hamano | 04 December 2015, 19:19:11 UTC | Merge branch 'np/credential-cache-sighup' Workaround for using credential-cache with emacs. * np/credential-cache-sighup: credential-cache: new option to ignore sighup | 04 December 2015, 19:19:11 UTC |
| 2d80807 | Junio C Hamano | 04 December 2015, 19:19:11 UTC | Merge branch 'rs/parseopt-short-help' Make "-h" command line option work more consistently in all commands. * rs/parseopt-short-help: show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP grep: stop using PARSE_OPT_NO_INTERNAL_HELP parse-options: allow -h as a short option parse-options: inline parse_options_usage() at its only remaining caller parse-options: deduplicate parse_options_usage() calls | 04 December 2015, 19:19:11 UTC |
| c69d08d | Junio C Hamano | 04 December 2015, 19:19:10 UTC | Merge branch 'jk/send-email-complete-aliases' Teach send-email to dump mail aliases, so that we can do tab completion on the command line. * jk/send-email-complete-aliases: completion: add support for completing email aliases sendemail: teach git-send-email to dump alias names | 04 December 2015, 19:19:11 UTC |
| 2e5adec | Junio C Hamano | 04 December 2015, 19:19:10 UTC | Merge branch 'jk/filter-branch-no-index' Speed up filter-branch for cases where we only care about rewriting commits, not tree data. * jk/filter-branch-no-index: filter-branch: skip index read/write when possible | 04 December 2015, 19:19:10 UTC |
| 4672123 | Junio C Hamano | 04 December 2015, 19:19:09 UTC | Merge branch 'ad/sha1-update-chunked' Apple's common crypto implementation of SHA1_Update() does not take more than 4GB at a time, and we now have a compile-time workaround for it. * ad/sha1-update-chunked: sha1: allow limiting the size of the data passed to SHA1_Update() sha1: provide another level of indirection for the SHA-1 functions | 04 December 2015, 19:19:10 UTC |
| fd13a2e | Jeff King | 01 December 2015, 23:54:58 UTC | Merge branch 'mk/blame-first-parent' Regression fix for a topic already in master. * mk/blame-first-parent: blame: fix object casting regression | 01 December 2015, 23:54:58 UTC |
| 43ed382 | Jeff King | 01 December 2015, 23:54:54 UTC | Merge branch 'jk/send-email-ca-path' Use a safer behavior when we hit errors verifying remote certificates. * jk/send-email-ca-path: send-email: die if CA path doesn't exist | 01 December 2015, 23:54:54 UTC |
| e2187fe | Jeff King | 01 December 2015, 23:54:47 UTC | Merge branch 'rs/fsck-nul-header' Fsck did not correctly detect a NUL-truncated header in a tag. * rs/fsck-nul-header: fsck: treat a NUL in a tag header as an error t1450: add tests for NUL in headers of commits and tags | 01 December 2015, 23:54:47 UTC |
| fa7095e | Jeff King | 01 December 2015, 23:54:40 UTC | Merge branch 'ls/p4-test-timeouts' Work around some test flakiness with p4d. * ls/p4-test-timeouts: git-p4: add trap to kill p4d on test exit git-p4: add p4d timeout in tests git-p4: retry kill/cleanup operations in tests with timeout | 01 December 2015, 23:54:40 UTC |
| e0dd81b | Jeff King | 01 December 2015, 23:54:37 UTC | Merge branch 'js/test-modernize-t9300' Clean up style in an ancient test. * js/test-modernize-t9300: modernize t9300: move test preparations into test_expect_success modernize t9300: mark here-doc words to ignore tab indentation modernize t9300: use test_when_finished for clean-up modernize t9300: wrap lines after && modernize t9300: use test_must_be_empty modernize t9300: use test_must_fail modernize t9300: single-quote placement and indentation | 01 December 2015, 23:54:37 UTC |
| d0e8377 | Jeff King | 01 December 2015, 23:54:34 UTC | Merge branch 'jk/send-email-expand-paths' Expand paths in some send-email config variables. * jk/send-email-expand-paths: send-email: expand path in sendemail.smtpsslcertpath config | 01 December 2015, 23:54:34 UTC |
| 30fe9b2 | Jeff King | 01 December 2015, 23:54:31 UTC | Merge branch 'dg/subtree-test-cleanup' Test cleanups for the subtree project. * dg/subtree-test-cleanup: contrib/subtree: Handle '--prefix' argument with a slash appended contrib/subtree: Make each test self-contained contrib/subtree: Add split tests contrib/subtree: Add merge tests contrib/subtree: Add tests for subtree add contrib/subtree: Add test for missing subtree contrib/subtree: Clean and refactor test code | 01 December 2015, 23:54:31 UTC |
| 23bc35f | Jeff King | 01 December 2015, 23:54:28 UTC | Merge branch 'dt/http-range' Portability fix for a topic already in 'master'. * dt/http-range: http: fix some printf format warnings | 01 December 2015, 23:54:28 UTC |
| 8c24d83 | David Turner | 30 November 2015, 22:47:42 UTC | verify_pack: do not ignore return value of verification function In verify_pack, a caller-supplied verification function is called. The function returns an int. If that return value is non-zero, verify_pack should fail. The only caller of verify_pack is in builtin/fsck.c, whose verify_fn returns a meaningful error code (which was then ignored). Now, fsck might return a different error code (with more detail). This would happen in the unlikely event that a commit or tree that is a valid git object but not a valid instance of its type gets into a pack. Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Jeff King <peff@peff.net> | 01 December 2015, 23:19:35 UTC |
| 40fdcc5 | Jeff King | 01 December 2015, 22:32:38 UTC | Merge branch 'maint' * maint: http: treat config options sslCAPath and sslCAInfo as paths Documentation/diff: give --word-diff-regex=. example filter-branch: deal with object name vs. pathname ambiguity in tree-filter check-ignore: correct documentation about output git-p4: clean up after p4 submit failure git-p4: work with a detached head git-p4: add option to system() to return subshell status git-p4: add failing test for submit from detached head remote-http(s): support SOCKS proxies t5813: avoid creating urls that break on cygwin Escape Git's exec path in contrib/rerere-train.sh script allow hooks to ignore their standard input stream rebase-i-exec: Allow space in SHELL_PATH Documentation: make environment variable formatting more consistent | 01 December 2015, 22:32:38 UTC |
| 908a6e4 | Jeff King | 01 December 2015, 22:24:20 UTC | Merge branch 'eg/p4-submit-catch-failure' into maint Just like the working tree is cleaned up when the user cancelled submission in P4Submit.applyCommit(), clean up the mess if "p4 submit" fails. * eg/p4-submit-catch-failure: git-p4: clean up after p4 submit failure | 01 December 2015, 22:24:21 UTC |
| 35f2635 | Jeff King | 01 December 2015, 22:21:31 UTC | Merge branch 'dk/check-ignore-docs' into maint Documentation clarification for "check-ignore" without "--verbose". * dk/check-ignore-docs: check-ignore: correct documentation about output | 01 December 2015, 22:21:32 UTC |
| 5b228f9 | Jeff King | 01 December 2015, 22:21:29 UTC | Merge branch 'ld/p4-detached-head' into maint Make git-p4 work on a detached head. * ld/p4-detached-head: git-p4: work with a detached head git-p4: add option to system() to return subshell status git-p4: add failing test for submit from detached head | 01 December 2015, 22:21:29 UTC |
| 978b576 | Jeff King | 01 December 2015, 22:21:17 UTC | Merge branch 'sg/filter-branch-dwim-ambiguity' into maint Fix for a corner case in filter-branch. * sg/filter-branch-dwim-ambiguity: filter-branch: deal with object name vs. pathname ambiguity in tree-filter | 01 December 2015, 22:21:17 UTC |
| 2cc3640 | Jeff King | 01 December 2015, 22:21:11 UTC | Merge branch 'mg/doc-word-diff-example' into maint * mg/doc-word-diff-example: Documentation/diff: give --word-diff-regex=. example | 01 December 2015, 22:21:11 UTC |
| 712a12e | Jeff King | 01 December 2015, 22:21:01 UTC | Merge branch 'cb/ssl-config-pathnames' into maint Allow tilde-expansion in some http config variables. * cb/ssl-config-pathnames: http: treat config options sslCAPath and sslCAInfo as paths | 01 December 2015, 22:21:01 UTC |
| 76fdb06 | Jeff King | 01 December 2015, 22:20:52 UTC | Merge branch 'dk/t5813-unc-paths' into maint Test portability fix for a topic in v2.6.1. * dk/t5813-unc-paths: t5813: avoid creating urls that break on cygwin | 01 December 2015, 22:20:52 UTC |
| 3840d2d | Jeff King | 01 December 2015, 22:20:46 UTC | Merge branch 'dk/rerere-train-quoting' into maint Fix shell quoting in contrib script. * dk/rerere-train-quoting: Escape Git's exec path in contrib/rerere-train.sh script | 01 December 2015, 22:20:46 UTC |
| 347acea | Jeff King | 01 December 2015, 22:19:52 UTC | Merge branch 'cb/hook-sigpipe' into maint We now consistently allow all hooks to ignore their standard input, rather than having git complain of SIGPIPE. * cb/hook-sigpipe: allow hooks to ignore their standard input stream | 01 December 2015, 22:19:52 UTC |
| 45e330f | Jeff King | 01 December 2015, 22:19:37 UTC | Merge branch 'fm/shell-path-whitespace' into maint Portability fix for Windows, which may rewrite $SHELL variable using non-POSIX paths. * fm/shell-path-whitespace: rebase-i-exec: Allow space in SHELL_PATH | 01 December 2015, 22:19:37 UTC |
| 2945adc | Jeff King | 01 December 2015, 22:19:33 UTC | Merge branch 'ar/doc-env-variable-format' into maint Minor documentation fixup. * ar/doc-env-variable-format: Documentation: make environment variable formatting more consistent | 01 December 2015, 22:19:33 UTC |
| 92b9bf4 | Jeff King | 01 December 2015, 22:19:12 UTC | Merge branch 'pt/http-socks-proxy' into maint Add support for talking http/https over socks proxy. * pt/http-socks-proxy: remote-http(s): support SOCKS proxies | 01 December 2015, 22:19:12 UTC |
| cd76778 | Jeff King | 01 December 2015, 22:19:06 UTC | Merge branch 'rc/configure-use-libs-when-checking-a-lib' into maint The "configure" script did not test for -lpthread correctly, which upset some linkers. * rc/configure-use-libs-when-checking-a-lib: configure.ac: use $LIBS not $CFLAGS when testing -lpthread | 01 December 2015, 22:19:06 UTC |
| 904de44 | René Scharfe | 25 November 2015, 14:10:18 UTC | wt-status: correct and simplify check for detached HEAD If a branch name is longer than four characters then memcmp() reads over the end of the static string "HEAD". This causes the following test failures with AddressSanitizer: t3203-branch-output.sh (Wstat: 256 Tests: 18 Failed: 4) Failed tests: 12, 15-17 Non-zero exit status: 1 t3412-rebase-root.sh (Wstat: 256 Tests: 31 Failed: 3) Failed tests: 28-29, 31 Non-zero exit status: 1 t3507-cherry-pick-conflict.sh (Wstat: 256 Tests: 31 Failed: 4) Failed tests: 14, 29-31 Non-zero exit status: 1 t3510-cherry-pick-sequence.sh (Wstat: 256 Tests: 39 Failed: 14) Failed tests: 17, 22-26, 28-30, 34-35, 37-39 Non-zero exit status: 1 t3420-rebase-autostash.sh (Wstat: 256 Tests: 28 Failed: 4) Failed tests: 24-27 Non-zero exit status: 1 t3404-rebase-interactive.sh (Wstat: 256 Tests: 91 Failed: 57) Failed tests: 17, 19, 21-42, 44, 46-74, 77, 81-82 Non-zero exit status: 1 t3900-i18n-commit.sh (Wstat: 256 Tests: 34 Failed: 1) Failed test: 34 Non-zero exit status: 1 t5407-post-rewrite-hook.sh (Wstat: 256 Tests: 14 Failed: 6) Failed tests: 9-14 Non-zero exit status: 1 t7001-mv.sh (Wstat: 256 Tests: 46 Failed: 5) Failed tests: 39-43 Non-zero exit status: 1 t7509-commit.sh (Wstat: 256 Tests: 12 Failed: 2) Failed tests: 11-12 Non-zero exit status: 1 t7512-status-help.sh (Wstat: 256 Tests: 39 Failed: 35) Failed tests: 5-39 Non-zero exit status: 1 t6030-bisect-porcelain.sh (Wstat: 256 Tests: 70 Failed: 1) Failed test: 13 Non-zero exit status: 1 And if a branch is named "H", "HE", or "HEA" then the current if clause erroneously considers it as matching "HEAD" because it only compares up to the end of the branch name. Fix that by doing the comparison using strcmp() and only after the branch name is extracted. This way neither too less nor too many characters are checked. While at it call strchrnul() to find the end of the branch name instead of open-coding it. Helped-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> | 28 November 2015, 17:30:18 UTC |
| 00bce77 | Elia Pinto | 27 November 2015, 14:08:27 UTC | ident.c: add support for IPv6 Add IPv6 support by implementing name resolution with the protocol agnostic getaddrinfo(3) API. The old gethostbyname(3) code is still available when git is compiled with NO_IPV6. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Helped-by: Jeff King <peff@peff.net> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Jeff King <peff@peff.net> | 28 November 2015, 17:20:42 UTC |
| 522354d | Lars Schneider | 27 November 2015, 09:23:27 UTC | Add Travis CI support The tests are currently executed on "Ubuntu 12.04 LTS Server Edition 64 bit" and on "OS X Mavericks" using gcc and clang. Perforce and Git-LFS are installed and therefore available for the respective tests. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Jeff King <peff@peff.net> | 28 November 2015, 17:11:12 UTC |
| 8bf4bec | Lars Schneider | 27 November 2015, 09:15:14 UTC | add "ok=sigpipe" to test_must_fail and use it to fix flaky tests t5516 "75 - deny fetch unreachable SHA1, allowtipsha1inwant=true" is flaky in the following case: 1. remote upload-pack finds out "not our ref" 2. remote sends a response and closes the pipe 3. fetch-pack still tries to write commands to the remote upload-pack 4. write call in wrapper.c dies with SIGPIPE The test is flaky because the sending fetch-pack may or may not have finished writing its output by step (3). If it did, then we see a closed pipe on the next read() call. If it didn't, then we get the SIGPIPE from step (4) above. Both are fine, but the latter fools test_must_fail. t5504 "9 - push with transfer.fsckobjects" is flaky, too, and returns SIGPIPE once in a while. I had to remove the final "To dst..." output check because there is no output if the process dies with SIGPIPE. Accept such a death-with-sigpipe also as OK when we are expecting a failure. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Jeff King <peff@peff.net> | 28 November 2015, 17:06:14 UTC |
| bbfe530 | Lars Schneider | 27 November 2015, 09:15:13 UTC | implement test_might_fail using a refactored test_must_fail Add an (optional) first parameter "ok=<special case>" to test_must_fail and return success for "<special case>". Add "success" as "<special case>" and use it to implement "test_might_fail". This removes redundancies in test-lib-function.sh. You can pass multiple <special case> arguments divided by comma (e.g. "test_must_fail ok=success,something") Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Jeff King <peff@peff.net> | 28 November 2015, 17:04:28 UTC |
| 1bc8fea | Jeff King | 25 November 2015, 00:06:54 UTC | Merge branch 'fp/subtree-todo-update' Cross completed task off of subtree project's todo list. * fp/subtree-todo-update: contrib/subtree: remove "push" command from the "todo" file | 25 November 2015, 00:06:54 UTC |
| a3824e7 | Jeff King | 25 November 2015, 00:06:33 UTC | Merge branch 'rc/configure-use-libs-when-checking-a-lib' The "configure" script did not test for -lpthread correctly, which upset some linkers. * rc/configure-use-libs-when-checking-a-lib: configure.ac: use $LIBS not $CFLAGS when testing -lpthread | 25 November 2015, 00:06:33 UTC |
| 718a9e6 | Jeff King | 25 November 2015, 00:04:41 UTC | Merge branch 'maint' * maint: Documentation/git-update-index: add missing opts to synopsys | 25 November 2015, 00:04:41 UTC |
| bf9acba | Charles Bailey | 23 November 2015, 12:02:40 UTC | http: treat config options sslCAPath and sslCAInfo as paths This enables ~ and ~user expansion for these config options. Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 23:51:00 UTC |
| 2c15c00 | Michael J Gruber | 20 November 2015, 13:36:14 UTC | Documentation/diff: give --word-diff-regex=. example It's just so useful. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 23:38:46 UTC |
| 4d2a364 | SZEDER Gábor | 23 November 2015, 12:23:16 UTC | filter-branch: deal with object name vs. pathname ambiguity in tree-filter 'git filter-branch' fails complaining about an ambiguous argument, if a tree-filter renames a path and the new pathname happens to match an existing object name. After the tree-filter has been applied, 'git filter-branch' looks for changed paths by running: git diff-index -r --name-only --ignore-submodules $commit which then, because of the lack of disambiguating double-dash, can't decide whether to treat '$commit' as revision or path and errors out. Add that disambiguating double-dash after 'git diff-index's revision argument to make sure that '$commit' is interpreted as a revision. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 23:37:50 UTC |
| c55d65f | John Keeping | 24 November 2015, 23:31:40 UTC | send-email: die if CA path doesn't exist If the CA path isn't found it's most likely to indicate a misconfiguration, in which case accepting any certificate is unlikely to be the correct thing to do. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 23:35:55 UTC |
| 219cbf0 | Dennis Kaarsemaker | 20 November 2015, 20:30:48 UTC | check-ignore: correct documentation about output By default git check-ignore shows only the filenames that will be ignored, not the pattern that causes their exclusion. Instead of moving the partial exclude pattern precendence information to the -v option where it belongs, link to gitignore(5) which describes this more thoroughly. Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 22:13:36 UTC |
| 7cb5f7c | Jeff King | 17 November 2015, 23:22:37 UTC | blame: fix object casting regression Commit 1b0d400 refactored the prepare_final() function so that it could be reused in multiple places. Originally, the loop had two outputs: a commit to stuff into sb->final, and the name of the commit from the rev->pending array. After the refactor, that loop is put in its own function with a single return value: the object_array_entry from the rev->pending array. This contains both the name and the object, but with one important difference: the object is the _original_ object found by the revision parser, not the dereferenced commit. If one feeds a tag to "git blame", we end up casting the tag object to a "struct commit", which causes a segfault. Instead, let's return the commit (properly casted) directly from the function, and take the "name" as an optional out-parameter. This does the right thing, and actually simplifies the callers, who no longer need to cast or dereference the object_array_entry themselves. [test case by Max Kirillov <max@max630.net>] Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 22:07:04 UTC |
| 5cb2e16 | Christian Couder | 24 November 2015, 11:55:07 UTC | Documentation/git-update-index: add missing opts to synopsys Untracked cache related options should appear in the synopsis. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 20:44:40 UTC |
| b7638fe | GIRARD Etienne | 24 November 2015, 07:43:59 UTC | git-p4: clean up after p4 submit failure When "p4 submit" command fails in P4Submit.applyCommit, the workspace is left with the changes. We already have code to revert the changes to the workspace when the user decides to cancel submission by aborting the editor that edits the change description, and we should treat the "p4 submit" failure the same way. Clean the workspace if p4_write_pipe raised SystemExit, so that the user don't have to do it themselves. Signed-off-by: GIRARD Etienne <egirard@murex.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 20:41:59 UTC |
| c26f70c | SZEDER Gábor | 21 November 2015, 11:30:09 UTC | bash prompt: indicate dirty index even on orphan branches __git_ps1() doesn't indicate dirty index while on an orphan branch. To check the dirtiness of the index, __git_ps1() runs 'git diff-index --cached ... HEAD', which doesn't work on an orphan branch, because HEAD doesn't point to a valid commit. Run 'git diff ... --cached' instead, as it does the right thing both on valid and invalid HEAD, i.e. compares the index to the existing HEAD in the former case and to the empty tree in the latter. This fixes the two failing tests added in the first commit of this series. The dirtiness of the worktree is already checked with 'git diff' and is displayed correctly even on an orphan branch. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 20:27:01 UTC |
| 0af9f7e | SZEDER Gábor | 21 November 2015, 14:46:40 UTC | bash prompt: remove a redundant 'git diff' option To get the dirty state indicator __git_ps1() runs 'git diff' with '--quiet --exit-code' options. '--quiet' already implies '--exit-code', so the latter is unnecessary and can be removed. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 20:27:01 UTC |
| a30d11e | SZEDER Gábor | 21 November 2015, 11:30:07 UTC | bash prompt: test dirty index and worktree while on an orphan branch There is only a single test exercising the dirty state indicator on an orphan branch, and in that test neither the index nor the worktree are dirty. Add two failing tests to check the dirty state indicator while either the index is dirty or while both the index and the worktree are dirty on an orphan branch, and to show that the dirtiness of the index is not displayed in these cases (the fourth combination, i.e. clean index and dirty worktree are impossible on an orphan branch). Update the existing dirty state indicator on clean orphan branch test to match the style of the two new tests, most importantly to use 'git checkout --orphan' instead of cd-ing into a repository that just happens to be empty and clean. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 20:27:01 UTC |
| 00ad6e3 | Luke Diamand | 21 November 2015, 09:54:41 UTC | git-p4: work with a detached head When submitting, git-p4 finds the current branch in order to know if it is allowed to submit (configuration "git-p4.allowSubmit"). On a detached head, detecting the branch would fail, and git-p4 would report a cryptic error. This change teaches git-p4 to recognise a detached head and submit successfully. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 20:20:15 UTC |
| cbff4b2 | Luke Diamand | 21 November 2015, 09:54:40 UTC | git-p4: add option to system() to return subshell status Add an optional parameter ignore_error to the git-p4 system() function. If used, it will return the subshell exit status rather than throwing an exception. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 20:20:15 UTC |
| 74b6fe9 | Luke Diamand | 21 November 2015, 09:54:39 UTC | git-p4: add failing test for submit from detached head git-p4 can't submit from a detached head. This test case demonstrates the problem. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> | 24 November 2015, 20:20:15 UTC |
| 42fdf86 | René Scharfe | 17 November 2015, 10:26:05 UTC | show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP The flag PARSE_OPT_NO_INTERNAL_HELP is set to allow overriding the option -h, except when it's the only one given. This is the default behavior now, so remove the flag and the hand-rolled --help-all handling. The internal --help-all handler now actually shows hidden options, i.e. -h in this case. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:07 UTC |
| 4441549 | René Scharfe | 17 November 2015, 10:25:53 UTC | grep: stop using PARSE_OPT_NO_INTERNAL_HELP The flag PARSE_OPT_NO_INTERNAL_HELP is set to allow overriding the option -h, except when it's the only one given. This is the default behavior now, so remove the flag and the hand-rolled --help-all handling. The internal --help-all handler now actually shows hidden options, i.e. --debug in this case. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:07 UTC |
| 5ad0d3d | René Scharfe | 17 November 2015, 10:25:38 UTC | parse-options: allow -h as a short option Let callers provide their own handler for the short option -h even without the flag PARSE_OPT_NO_INTERNAL_HELP, but call the internal handler (showing usage information) if that is the only parameter. Implement the first part by checking for -h only if parse_short_opt() can't find it and returns -2. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:07 UTC |
| 7f4d474 | Noam Postavsky | 10 November 2015, 00:26:29 UTC | credential-cache: new option to ignore sighup Introduce new option "credentialCache.ignoreSIGHUP" which stops git-credential-cache--daemon from quitting on SIGHUP. This is useful when "git push" is started from Emacs, because all child processes (including the daemon) will receive a SIGHUP when "git push" exits. Signed-off-by: Noam Postavsky <npostavs@users.sourceforge.net> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:07 UTC |
| 8a272f2 | René Scharfe | 19 November 2015, 16:25:31 UTC | fsck: treat a NUL in a tag header as an error We check the return value of verify_header() for commits already, so do the same for tags as well. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:07 UTC |
| 80c7f5a | René Scharfe | 19 November 2015, 16:20:14 UTC | t1450: add tests for NUL in headers of commits and tags Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:07 UTC |
| d3d1f8c | René Scharfe | 17 November 2015, 10:25:27 UTC | parse-options: inline parse_options_usage() at its only remaining caller Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:07 UTC |
| ac20ff6 | René Scharfe | 17 November 2015, 10:25:14 UTC | parse-options: deduplicate parse_options_usage() calls Avoid long lines and repeating parse_options_usage() calls with their duplicate parameters by providing labels with speaking names to jump to. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:07 UTC |
| 68297e0 | Johannes Sixt | 19 November 2015, 19:09:49 UTC | modernize t9300: move test preparations into test_expect_success Our usual style these days is to execute everything inside test_expect_success. Make it so. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| 0ca2972 | Johannes Sixt | 19 November 2015, 19:09:48 UTC | modernize t9300: mark here-doc words to ignore tab indentation In the next commit, we will indent test case preparations. This will require that here-documents ignore the tab indentation. Prepare for this change by marking the here-doc words accordingly. This does not have an effect now, but will remove some noise from the git diff -b output of the next commit. The change here is entirely automated with this perl command: perl -i -lpe 's/(cat.*<<) *((EOF|(EXPECT|INPUT)_END).*$)/$1-$2 &&/' t/t9300-fast-import.sh i.e., inserts a dash between << and the EOF word (and removes blanks that our style guide abhors) and appends the && that will become necessary. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| 6e07a3b | John Keeping | 17 November 2015, 22:01:05 UTC | send-email: expand path in sendemail.smtpsslcertpath config As it says in the name, the SSL certificate path is a path so treat it as one and support tilde-expansion. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| 93e911f | Johannes Sixt | 19 November 2015, 19:09:47 UTC | modernize t9300: use test_when_finished for clean-up A number of clean-ups of test cases are performed outside of test_expect_success. Replace these cases by using test_when_finished. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| dfbe5ee | Jacob Keller | 19 November 2015, 22:52:12 UTC | completion: add support for completing email aliases Using the new --dump-aliases option from git-send-email, add completion for --to, --cc, --bcc, and --from with the available configured aliases. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| 17b7a83 | Jacob Keller | 19 November 2015, 22:52:11 UTC | sendemail: teach git-send-email to dump alias names Add an option "--dump-aliases" which changes the default behavior of git-send-email. This mode will simply read the alias files configured by sendemail.aliasesfile and sendemail.aliasfiletype and dump a list of all configured aliases, one per line. The intended use case for this option is the bash-completion script which will use it to autocomplete aliases on the options which take addresses. Add some tests for the new option using various alias file formats. A possible future extension to the alias dump format could be done by extending the --dump-aliases to take an optional argument defining the format to display. This has not been done in this patch as no user of this information has been identified. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| dfe90e8 | Lars Schneider | 19 November 2015, 08:58:10 UTC | git-p4: add trap to kill p4d on test exit Sometimes the "prove" test runner hangs on test exit because p4d is still running. Add a trap to always kill "p4d" on test exit. You can reproduce the problem by commenting "P4D_TIMEOUT" in "lib-git-p4.sh" and running "prove ./t9800-git-p4-basic.sh". Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| 842adde | Lars Schneider | 19 November 2015, 08:58:09 UTC | git-p4: add p4d timeout in tests In rare cases p4d seems to hang. This watchdog will kill the p4d process after 300s in any case. That means each individual git p4 test needs to finish before 300s or it will fail. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| 23aee41 | Lars Schneider | 19 November 2015, 08:58:08 UTC | git-p4: retry kill/cleanup operations in tests with timeout In rare cases kill/cleanup operations in tests fail. Retry these operations with a timeout to make the test less flaky. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| ec2c10b | Johannes Sixt | 19 November 2015, 19:09:46 UTC | modernize t9300: wrap lines after && It is customary to have each command in test snippets on its own line. Fix those instances that do not follow this guideline. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| acf3af2 | Johannes Sixt | 19 November 2015, 19:09:45 UTC | modernize t9300: use test_must_be_empty Instead of comparing actual output to an empty file, use test_must_be_empty. In addition to the better error message provided by the helper, allocation of an empty file during the setup sequence can be avoided. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| b08d82f | Johannes Sixt | 19 November 2015, 19:09:44 UTC | modernize t9300: use test_must_fail One test case open-codes a test for an expected failure. Replace it by test_must_fail. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| d67824f | Johannes Sixt | 19 November 2015, 19:09:43 UTC | modernize t9300: single-quote placement and indentation Many test cases do not follow our modern style that places the single-quotes that surround the shell code snippets before and after the shell code. Make it so. Many of the lines changed in this way are indented other than by a single tab. Change them (and some additional lines) to be indented with a tab. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:06 UTC |
| fcd30b1 | brian m. carlson | 10 November 2015, 02:22:30 UTC | remote: convert functions to struct object_id Convert several unsigned char arrays to use struct object_id instead, and change hard-coded 40-based constants to use GIT_SHA1_HEXSZ as well. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:05 UTC |
| ed1c997 | brian m. carlson | 10 November 2015, 02:22:29 UTC | Remove get_object_hash. Convert all instances of get_object_hash to use an appropriate reference to the hash member of the oid member of struct object. This provides no functional change, as it is essentially a macro substitution. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:05 UTC |
| f2fd076 | brian m. carlson | 10 November 2015, 02:22:28 UTC | Convert struct object to object_id struct object is one of the major data structures dealing with object IDs. Convert it to use struct object_id instead of an unsigned char array. Convert get_object_hash to refer to the new member as well. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:05 UTC |
| 7999b2c | brian m. carlson | 10 November 2015, 02:22:27 UTC | Add several uses of get_object_hash. Convert most instances where the sha1 member of struct object is dereferenced to use get_object_hash. Most instances that are passed to functions that have versions taking struct object_id, such as get_sha1_hex/get_oid_hex, or instances that can be trivially converted to use struct object_id instead, are not converted. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Jeff King <peff@peff.net> | 20 November 2015, 13:02:05 UTC |
