| f900c83 | Junio C Hamano | 15 December 2015, 17:47:11 UTC | Git 2.7-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2015, 17:47:11 UTC |
| bdb32a8 | Junio C Hamano | 15 December 2015, 17:45:06 UTC | Sync with maint | 15 December 2015, 17:45:16 UTC |
| 1aaf149 | Junio C Hamano | 15 December 2015, 17:43:01 UTC | Update draft release notes to 2.6.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2015, 17:44:54 UTC |
| a61fd3f | Junio C Hamano | 15 December 2015, 17:42:16 UTC | Merge branch 'dt/fsck-verify-pack-error' into maint 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 | 15 December 2015, 17:42:20 UTC |
| de301c5 | Junio C Hamano | 15 December 2015, 17:42:01 UTC | Merge branch 'ep/ident-with-getaddrinfo' into maint A fix-up for recent topic. * ep/ident-with-getaddrinfo: ident: fix undefined variable when NO_IPV6 is set ident.c: add support for IPv6 | 15 December 2015, 17:42:01 UTC |
| f97f2e5 | Junio C Hamano | 15 December 2015, 17:34:18 UTC | Merge branch 'ls/p4-keep-empty-commits' into maint "git p4" used to import Perforce CLs that touch only paths outside the client spec as empty commits. It has been corrected to ignore them instead, with a new configuration git-p4.keepEmptyCommits as a backward compatibility knob. * ls/p4-keep-empty-commits: git-p4: add option to keep empty commits | 15 December 2015, 17:34:19 UTC |
| 9c69f77 | Junio C Hamano | 15 December 2015, 17:33:19 UTC | Merge branch 'jk/send-email-complete-aliases' A fix-up for recent topic. * jk/send-email-complete-aliases: completion: fix completing unstuck email alias arguments | 15 December 2015, 17:33:19 UTC |
| 47be26d | Junio C Hamano | 15 December 2015, 17:33:19 UTC | Merge branch 'ep/ident-with-getaddrinfo' A fix-up for recent topic. * ep/ident-with-getaddrinfo: ident: fix undefined variable when NO_IPV6 is set | 15 December 2015, 17:33:19 UTC |
| 3b65c24 | Junio C Hamano | 15 December 2015, 17:27:11 UTC | Merge branch 'jk/prune-mtime' into maint The helper used to iterate over loose object directories to prune stale objects did not closedir() immediately when it is done with a directory--a callback such as the one used for "git prune" may want to do rmdir(), but it would fail on open directory on platforms such as WinXP. * jk/prune-mtime: prune: close directory earlier during loose-object directory traversal | 15 December 2015, 17:27:12 UTC |
| a899d50 | Junio C Hamano | 15 December 2015, 16:02:18 UTC | Merge branch 'ls/p4-keep-empty-commits' "git p4" used to import Perforce CLs that touch only paths outside the client spec as empty commits. It has been corrected to ignore them instead, with a new configuration git-p4.keepEmptyCommits as a backward compatibility knob. * ls/p4-keep-empty-commits: git-p4: add option to keep empty commits | 15 December 2015, 16:02:19 UTC |
| 897b185 | Junio C Hamano | 15 December 2015, 16:02:13 UTC | Merge branch 'jk/prune-mtime' The helper used to iterate over loose object directories to prune stale objects did not closedir() immediately when it is done with a directory--a callback such as the one used for "git prune" may want to do rmdir(), but it would fail on open directory on platforms such as WinXP. * jk/prune-mtime: prune: close directory earlier during loose-object directory traversal | 15 December 2015, 16:02:16 UTC |
| ccab28a | SZEDER Gábor | 12 December 2015, 00:18:18 UTC | completion: fix completing unstuck email alias arguments Completing unstuck form of email aliases doesn't quite work: $ git send-email --to <TAB> alice bob cecil $ git send-email --to a<TAB> alice bob cecil While listing email aliases works as expected, the second case should just complete to 'alice', but it keeps offering all email aliases instead. The cause for this behavior is that in this case we mistakenly tell __gitcomp() explicitly that the current word to be completed is empty, while in reality it is not. As a result __gitcomp() doesn't filter out non-matching aliases, so all aliases end up being offered over and over again. Fix this by not passing the current word to be completed to __gitcomp() and letting it go the default route and grab it from the '$cur' variable. Don't pass empty prefix either, because it's assumed to be empty when unspecified, so it's not necessary. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2015, 22:01:37 UTC |
| 58d29ec | Jeff King | 14 December 2015, 20:52:41 UTC | ident: fix undefined variable when NO_IPV6 is set Commit 00bce77 (ident.c: add support for IPv6, 2015-11-27) moved the "gethostbyname" call out of "add_domainname" and into the helper function "canonical_name". But when moving the code, it forgot that the "buf" variable is passed as "host" in the helper. Reported-by: johan defries <johandefries@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2015, 21:06:00 UTC |
| 4b9ab0e | Junio C Hamano | 11 December 2015, 18:45:44 UTC | Update release notes to 2.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2015, 19:20:23 UTC |
| 52b2e6b | Junio C Hamano | 11 December 2015, 19:19:43 UTC | Merge branch 'maint' * maint: Prepare for 2.6.5 | 11 December 2015, 19:19:43 UTC |
| 49e863b | Junio C Hamano | 11 December 2015, 19:17:47 UTC | Prepare for 2.6.5 This back-merges hopefully the last batch of trivially correct fixes to the 2.6.x maintenance track from the master branch. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2015, 19:17:47 UTC |
| 58e3dd2 | Junio C Hamano | 11 December 2015, 19:14:38 UTC | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maint mark_tree_uninteresting() has code to handle the case where it gets passed a NULL pointer in its 'tree' parameter, but the function had 'object = &tree->object' assignment before checking if tree is NULL. This gives a compiler an excuse to declare that tree will never be NULL and apply a wrong optimization. Avoid it. * sn/null-pointer-arith-in-mark-tree-uninteresting: revision.c: fix possible null pointer arithmetic | 11 December 2015, 19:14:38 UTC |
| abca668 | Junio C Hamano | 11 December 2015, 19:14:18 UTC | Merge branch 'sg/lock-file-commit-error' into maint Cosmetic improvement to lock-file error messages. * sg/lock-file-commit-error: Make error message after failing commit_lock_file() less confusing | 11 December 2015, 19:14:18 UTC |
| 7605881 | Junio C Hamano | 11 December 2015, 19:14:18 UTC | Merge branch 'cb/t3404-shellquote' into maint * cb/t3404-shellquote: t3404: fix quoting of redirect for some versions of bash | 11 December 2015, 19:14:18 UTC |
| 17e5bca | Junio C Hamano | 11 December 2015, 19:14:17 UTC | Merge branch 'sb/doc-submodule-sync-recursive' into maint * sb/doc-submodule-sync-recursive: document submodule sync --recursive | 11 December 2015, 19:14:17 UTC |
| 63b3db7 | Junio C Hamano | 11 December 2015, 19:14:15 UTC | Merge branch 'nd/doc-check-ref-format-typo' into maint * nd/doc-check-ref-format-typo: git-check-ref-format.txt: typo, s/avoids/avoid/ | 11 December 2015, 19:14:15 UTC |
| 288fe0c | Junio C Hamano | 11 December 2015, 19:14:13 UTC | Merge branch 'rs/show-branch-argv-array' into maint Code simplification. * rs/show-branch-argv-array: show-branch: use argv_array for default arguments | 11 December 2015, 19:14:14 UTC |
| 0af22d6 | Junio C Hamano | 11 December 2015, 19:14:12 UTC | Merge branch 'rs/pop-commit' into maint Code simplification. * rs/pop-commit: use pop_commit() for consuming the first entry of a struct commit_list | 11 December 2015, 19:14:13 UTC |
| 8c0a546 | Junio C Hamano | 11 December 2015, 19:14:11 UTC | Merge branch 'as/subtree-with-spaces' into maint Update "git subtree" (in contrib/) so that it can take whitespaces in the pathnames, not only in the in-tree pathname but the name of the directory that the repository is in. * as/subtree-with-spaces: contrib/subtree: respect spaces in a repository path t7900-subtree: test the "space in a subdirectory name" case | 11 December 2015, 19:14:11 UTC |
| 4cb5488 | Junio C Hamano | 11 December 2015, 19:14:09 UTC | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint Because "test_when_finished" in our test framework queues the clean-up tasks to be done in a shell variable, it should not be used inside a subshell. Add a mechanism to allow 'bash' to catch such uses, and fix the ones that were found. * jk/test-lint-forbid-when-finished-in-subshell: test-lib-functions: detect test_when_finished in subshell t7800: don't use test_config in a subshell test-lib-functions: support "test_config -C <dir> ..." t5801: don't use test_when_finished in a subshell t7610: don't use test_config in a subshell | 11 December 2015, 19:14:10 UTC |
| 782ca8c | Junio C Hamano | 11 December 2015, 18:41:01 UTC | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' mark_tree_uninteresting() has code to handle the case where it gets passed a NULL pointer in its 'tree' parameter, but the function had 'object = &tree->object' assignment before checking if tree is NULL. This gives a compiler an excuse to declare that tree will never be NULL and apply a wrong optimization. Avoid it. * sn/null-pointer-arith-in-mark-tree-uninteresting: revision.c: fix possible null pointer arithmetic | 11 December 2015, 18:41:01 UTC |
| fa41b05 | Junio C Hamano | 11 December 2015, 18:40:59 UTC | Merge branch 'sb/doc-submodule-sync-recursive' * sb/doc-submodule-sync-recursive: document submodule sync --recursive | 11 December 2015, 18:41:00 UTC |
| c87eec9 | Junio C Hamano | 11 December 2015, 18:40:57 UTC | Merge branch 'cb/t3404-shellquote' * cb/t3404-shellquote: t3404: fix quoting of redirect for some versions of bash | 11 December 2015, 18:40:58 UTC |
| e0048d3 | Junio C Hamano | 11 December 2015, 18:40:54 UTC | Merge branch 'sg/lock-file-commit-error' Cosmetic improvement to lock-file error messages. * sg/lock-file-commit-error: Make error message after failing commit_lock_file() less confusing | 11 December 2015, 18:40:55 UTC |
| 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 |
| 4ae048e | Lars Schneider | 08 December 2015, 09:36:22 UTC | git-p4: add option to keep empty commits A changelist that contains only excluded files due to a client spec was imported as an empty commit. Fix that issue by ignoring these commits. Add option "git-p4.keepEmptyCommits" to make the previous behavior available. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Helped-by: Pete Harlan Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2015, 18:45:02 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 |
| a2678df | Stefan Naewe | 05 December 2015, 15:27:24 UTC | revision.c: fix possible null pointer arithmetic mark_tree_uninteresting() dereferences a tree pointer before checking if the pointer is valid. Fix that by doing the check first. Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2015, 20:32:02 UTC |
| 7966230 | Charles Bailey | 02 December 2015, 20:50:07 UTC | t3404: fix quoting of redirect for some versions of bash As CodingGuidelines says, some versions of bash errors out when $variable substitution is used as the target for redirection without being quoted (even though POSIX may not require such a quote). Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2015, 22:05:18 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 |
| e7220c4 | Stefan Beller | 03 December 2015, 20:41:02 UTC | document submodule sync --recursive The git-submodule(1) is inconsistent. In the synopsis, it says: git submodule [--quiet] sync [--recursive] [--] [<path>...] The description of the sync does not mention --recursive, and the description of --recursive says that it is only available for foreach, update and status. The option was introduced (82f49f294c, Teach --recursive to submodule sync, 2012-10-26) a while ago, so let's document it, too. Reported-by: Per Cederqvist <cederp@opera.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2015, 21:08:05 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 |
| 08a3651 | SZEDER Gábor | 30 November 2015, 11:40:53 UTC | Make error message after failing commit_lock_file() less confusing The error message after a failing commit_lock_file() call sometimes looks like this, causing confusion: $ git remote add remote git@server.com/repo.git error: could not commit config file .git/config # Huh?! # I didn't want to commit anything, especially not my config file! While in the narrow context of the lockfile module using the verb 'commit' in the error message makes perfect sense, in the broader context of git the word 'commit' already has a very specific meaning, hence the confusion. Reword these error messages to say "could not write" instead of "could not commit". While at it, include strerror in the error messages after writing the config file or the credential store fails to provide some information about the cause of the failure, and update the style of the error message after writing the reflog fails to match surrounding error messages (i.e. no '' around the pathname and no () around the error description). Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Jeff King <peff@peff.net> | 01 December 2015, 23:17:23 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 |
