Skip to main content

Browse the archive

swh:1:snp:bb8853bfef8fcf2b1d37fd6404912c7606c98e48
sort by:
Revision Author Date Message Commit Date
3e55249 Junio C Hamano 04 June 2018, 12:41:41 UTC Git 2.18-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 June 2018, 12:41:41 UTC
e66e8f9 Junio C Hamano 04 June 2018, 12:39:50 UTC Merge branch 'bc/t3430-fixup' Test fix. * bc/t3430-fixup: t3430: test clean-up 04 June 2018, 12:39:50 UTC
01cbd9e Junio C Hamano 04 June 2018, 12:39:50 UTC Merge branch 'bw/refspec-api' Hotfix. * bw/refspec-api: refspec-api: avoid uninitialized field in refspec item 04 June 2018, 12:39:50 UTC
7fe48cb Junio C Hamano 04 June 2018, 12:39:49 UTC Merge branch 'tg/doc-sec-list' Doc update. * tg/doc-sec-list: note git-security@googlegroups.com in more places SubmittingPatches: replace numbered attributes with names 04 June 2018, 12:39:49 UTC
c45505d Junio C Hamano 04 June 2018, 12:39:49 UTC Merge branch 'rd/p4-doc-markup-env' Doc markup update. * rd/p4-doc-markup-env: p4.txt: Use backquotes for variable names 04 June 2018, 12:39:49 UTC
643a9ea Junio C Hamano 04 June 2018, 12:39:48 UTC Merge branch 'nd/remote-update-doc' "git remote update" can take both a single remote nickname and a nickname for remote groups, but only one of them was documented. * nd/remote-update-doc: remote: doc typofix remote.txt: update documentation for 'update' command 04 June 2018, 12:39:49 UTC
f635b8d Junio C Hamano 04 June 2018, 12:39:48 UTC Merge branch 'jt/submodule-pull-recurse-rebase' "git pull -recurse-submodules --rebase", when the submodule repository's history did not have anything common between ours and the upstream's, failed to execute. We need to fetch from them to continue even in such a case. * jt/submodule-pull-recurse-rebase: submodule: do not pass null OID to setup_revisions 04 June 2018, 12:39:48 UTC
a97447a Duy Nguyen 30 May 2018, 15:37:01 UTC remote: doc typofix Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 June 2018, 11:04:33 UTC
0c5a779 brian m. carlson 01 June 2018, 17:46:39 UTC t3430: test clean-up Remove unnecessary test_tick etc... Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 04 June 2018, 02:21:28 UTC
c2c7d17 Junio C Hamano 01 June 2018, 06:16:15 UTC A bit more topics before -rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2018, 06:16:15 UTC
026b8ef Junio C Hamano 01 June 2018, 06:15:35 UTC Merge branch 'bw/ref-prefix-for-configured-refspec' * bw/ref-prefix-for-configured-refspec: fetch: do not pass ref-prefixes for fetch by exact SHA1 01 June 2018, 06:15:35 UTC
6c301ad Jonathan Nieder 31 May 2018, 07:23:39 UTC fetch: do not pass ref-prefixes for fetch by exact SHA1 When v2.18.0-rc0~10^2~1 (refspec: consolidate ref-prefix generation logic, 2018-05-16) factored out the ref-prefix generation code for reuse, it left out the 'if (!item->exact_sha1)' test in the original ref-prefix generation code. As a result, fetches by SHA-1 generate ref-prefixes as though the SHA-1 being fetched were an abbreviated ref name: $ GIT_TRACE_PACKET=1 bin-wrappers/git -c protocol.version=2 \ fetch origin 12039e008f9a4e3394f3f94f8ea897785cb09448 [...] packet: fetch> ref-prefix 12039e008f9a4e3394f3f94f8ea897785cb09448 packet: fetch> ref-prefix refs/12039e008f9a4e3394f3f94f8ea897785cb09448 packet: fetch> ref-prefix refs/tags/12039e008f9a4e3394f3f94f8ea897785cb09448 packet: fetch> ref-prefix refs/heads/12039e008f9a4e3394f3f94f8ea897785cb09448 packet: fetch> ref-prefix refs/remotes/12039e008f9a4e3394f3f94f8ea897785cb09448 packet: fetch> ref-prefix refs/remotes/12039e008f9a4e3394f3f94f8ea897785cb09448/HEAD packet: fetch> 0000 If there is another ref name on the command line or the object being fetched is already available locally, then that's mostly harmless. But otherwise, we error out with fatal: no matching remote head since the server did not send any refs we are interested in. Filter out the exact_sha1 refspecs to avoid this. This patch adds a test to check this behavior that notices another behavior difference between protocol v0 and v2 in the process. Add a NEEDSWORK comment to clear it up. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2018, 06:15:22 UTC
d6e5484 Junio C Hamano 01 June 2018, 06:06:41 UTC Merge branch 'cc/tests-without-assuming-ref-files-backend' Quite a many tests assumed that newly created refs are made as loose refs using the files backend, which have been updated to use proper plumbing like rev-parse and update-ref, to avoid breakage once we start using different ref backends. * cc/tests-without-assuming-ref-files-backend: t990X: use '.git/objects' as 'deep inside .git' path t: make many tests depend less on the refs being files 01 June 2018, 06:06:41 UTC
ba928e9 Junio C Hamano 01 June 2018, 06:06:40 UTC Merge branch 'rd/init-typo' Message fix. * rd/init-typo: init: fix grammar in "templates not found" msg 01 June 2018, 06:06:40 UTC
95dd4b2 Junio C Hamano 01 June 2018, 06:06:40 UTC Merge branch 'js/rebase-recreate-merge' Hotfixes. * js/rebase-recreate-merge: sequencer: ensure labels that are object IDs are rewritten git-rebase--interactive: fix copy-paste mistake 01 June 2018, 06:06:40 UTC
cbb408e Junio C Hamano 01 June 2018, 06:06:39 UTC Merge branch 'rd/tag-doc-lightweight' Docfix. * rd/tag-doc-lightweight: tag: clarify in the doc that a tag can refer to a non-commit object 01 June 2018, 06:06:39 UTC
7659bda Junio C Hamano 01 June 2018, 06:06:39 UTC Merge branch 'rd/doc-options-placeholder' Docfix. * rd/doc-options-placeholder: Use proper syntax for replaceables in command docs 01 June 2018, 06:06:39 UTC
7cb4a97 Junio C Hamano 01 June 2018, 06:06:39 UTC Merge branch 'en/rev-parse-invalid-range' "git rev-parse Y..." etc. misbehaved when given endpoints were not committishes. * en/rev-parse-invalid-range: rev-parse: check lookup'ed commit references for NULL 01 June 2018, 06:06:39 UTC
caf0c98 Junio C Hamano 01 June 2018, 06:06:38 UTC Merge branch 'ld/p4-unshelve' "git p4" learned to "unshelve" shelved commit from P4. * ld/p4-unshelve: git-p4: add unshelve command 01 June 2018, 06:06:38 UTC
e1149fd Junio C Hamano 01 June 2018, 06:06:38 UTC Merge branch 'nd/use-opt-int-set-f' Code simplification. * nd/use-opt-int-set-f: Use OPT_SET_INT_F() for cmdline option specification 01 June 2018, 06:06:38 UTC
2bd108f Junio C Hamano 01 June 2018, 06:06:38 UTC Merge branch 'pa/import-tars-long-names' The import-tars script (in contrib/) has been taught to handle tarballs with overly long paths that use PAX extended headers. * pa/import-tars-long-names: import-tars: read overlong names from pax extended header 01 June 2018, 06:06:38 UTC
2289880 Junio C Hamano 01 June 2018, 06:06:37 UTC Merge branch 'nd/command-list' The list of commands with their various attributes were spread across a few places in the build procedure, but it now is getting a bit more consolidated to allow more automation. * nd/command-list: completion: allow to customize the completable command list completion: add and use --list-cmds=alias completion: add and use --list-cmds=nohelpers Move declaration for alias.c to alias.h completion: reduce completable command list completion: let git provide the completable command list command-list.txt: documentation and guide line help: use command-list.txt for the source of guides help: add "-a --verbose" to list all commands with synopsis git: support --list-cmds=list-<category> completion: implement and use --list-cmds=main,others git --list-cmds: collect command list in a string_list git.c: convert --list-* to --list-cmds=* Remove common-cmds.h help: use command-list.h for common command list generate-cmds.sh: export all commands to command-list.h generate-cmds.sh: factor out synopsis extract code 01 June 2018, 06:06:37 UTC
c3072c6 Junio C Hamano 01 June 2018, 02:33:19 UTC refspec-api: avoid uninitialized field in refspec item When parse_refspec() function was created at 3eec3700 ("refspec: factor out parsing a single refspec", 2018-05-16) to take a caller supplied piece of memory to fill parsed refspec_item, it forgot that a refspec without colon must set item->dst to NULL to let the users of refspec know that the result of the fetch does not get stored in an ref on our side. Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2018, 02:46:07 UTC
f156a09 Robert P. J. Day 30 May 2018, 13:04:00 UTC p4.txt: Use backquotes for variable names For consistency, use backquotes when referring to environment variables, as is done in other man pages. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2018, 01:47:05 UTC
86f0b37 Duy Nguyen 30 May 2018, 15:37:01 UTC remote.txt: update documentation for 'update' command Commit b344e1614b (git remote update: Fallback to remote if group does not exist - 2009-04-06) lets "git remote update" accept individual remotes as well. Previously this command only accepted remote groups. The commit updates the command syntax but not the actual document of this subcommand. Update it. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2018, 01:46:03 UTC
2161ed8 Elijah Newren 31 May 2018, 03:24:14 UTC RelNotes: remove duplicate release note In the 2.18 cycle, directory rename detection was merged, then reverted, then reworked in such a way to fix another prominent bug in addition to the original problem causing it to be reverted. When the reworked series was merged, we ended up with two nearly duplicate release notes. Remove the second copy, but preserve the information about the extra bug fix. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2018, 01:08:53 UTC
2a00502 Thomas Gummerer 30 May 2018, 20:52:55 UTC note git-security@googlegroups.com in more places Add a mention of the security mailing list to the README, and to Documentation/SubmittingPatches.. 2caa7b8d27 ("git manpage: note git-security@googlegroups.com", 2018-03-08) already added it to the man page, but for developers either the README, or the documentation on how to contribute (SubmittingPatches) may be the first place to look. Use the same wording as we already have on the git-scm.com website and in the man page for the README, while the wording is adjusted in SubmittingPatches to match the surrounding document better. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2018, 00:24:11 UTC
a27cd1a Thomas Gummerer 30 May 2018, 20:52:54 UTC SubmittingPatches: replace numbered attributes with names Use names instead of numbers for the AsciiDoc attributes that are used for the footnotes. We will add more footnotes in subsequent commits, and attributes should ideally all be unique. Having named attributes will help ensure uniqueness, and we won't have to re-number the attributes if we add a footnote earlier in the document. In addition it also clarifies that the attribute name/number is not related to the number the footnote will get in the output. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 June 2018, 00:24:11 UTC
12039e0 Junio C Hamano 30 May 2018, 12:51:57 UTC Git 2.18-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2018, 12:51:57 UTC
13e8be9 Junio C Hamano 30 May 2018, 12:51:29 UTC Merge branch 'bw/remote-curl-compressed-responses' Our HTTP client code used to advertise that we accept gzip encoding from the other side; instead, just let cURL library to advertise and negotiate the best one. * bw/remote-curl-compressed-responses: remote-curl: accept compressed responses with protocol v2 remote-curl: accept all encodings supported by curl 30 May 2018, 12:51:29 UTC
e47dbec Junio C Hamano 30 May 2018, 12:51:29 UTC Merge branch 'ma/unpack-trees-free-msgs' Leak plugging. * ma/unpack-trees-free-msgs: unpack_trees_options: free messages when done argv-array: return the pushed string from argv_push*() merge-recursive: provide pair of `unpack_trees_{start,finish}()` merge: setup `opts` later in `checkout_fast_forward()` 30 May 2018, 12:51:29 UTC
9472b13 Junio C Hamano 30 May 2018, 12:51:28 UTC Merge branch 'bc/hash-independent-tests' Many tests hardcode the raw object names, which would change once we migrate away from SHA-1. While some of them must test against exact object names, most of them do not have to use hardcoded constants in the test. The latter kind of tests have been updated to test the moral equivalent of the original without hardcoding the actual object names. * bc/hash-independent-tests: (28 commits) t5300: abstract away SHA-1-specific constants t4208: abstract away SHA-1-specific constants t4045: abstract away SHA-1-specific constants t4042: abstract away SHA-1-specific constants t4205: sort log output in a hash-independent way t/lib-diff-alternative: abstract away SHA-1-specific constants t4030: abstract away SHA-1-specific constants t4029: abstract away SHA-1-specific constants t4029: fix test indentation t4022: abstract away SHA-1-specific constants t4020: abstract away SHA-1-specific constants t4014: abstract away SHA-1-specific constants t4008: abstract away SHA-1-specific constants t4007: abstract away SHA-1-specific constants t3905: abstract away SHA-1-specific constants t3702: abstract away SHA-1-specific constants t3103: abstract away SHA-1-specific constants t2203: abstract away SHA-1-specific constants t: skip pack tests if not using SHA-1 t4044: skip test if not using SHA-1 ... 30 May 2018, 12:51:28 UTC
d89f124 Junio C Hamano 30 May 2018, 12:51:28 UTC Merge branch 'ma/regex-no-regfree-after-comp-fail' We used to call regfree() after regcomp() failed in some codepaths, which have been corrected. * ma/regex-no-regfree-after-comp-fail: regex: do not call `regfree()` if compilation fails 30 May 2018, 12:51:28 UTC
3f384aa Junio C Hamano 30 May 2018, 12:51:28 UTC Merge branch 'ma/config-store-data-clear' Leak plugging. * ma/config-store-data-clear: config: let `config_store_data_clear()` handle `key` config: let `config_store_data_clear()` handle `value_regex` config: free resources of `struct config_store_data` 30 May 2018, 12:51:28 UTC
7c3d15f Junio C Hamano 30 May 2018, 12:51:27 UTC Merge branch 'jk/snprintf-truncation' Avoid unchecked snprintf() to make future code auditing easier. * jk/snprintf-truncation: fmt_with_err: add a comment that truncation is OK shorten_unambiguous_ref: use xsnprintf fsmonitor: use internal argv_array of struct child_process log_write_email_headers: use strbufs http: use strbufs instead of fixed buffers 30 May 2018, 12:51:28 UTC
b2fd659 Junio C Hamano 30 May 2018, 12:51:27 UTC Merge branch 'jk/config-blob-sans-repo' Error codepath fix. * jk/config-blob-sans-repo: config: die when --blob is used outside a repository 30 May 2018, 12:51:27 UTC
0821b73 Junio C Hamano 30 May 2018, 12:51:27 UTC Merge branch 'sb/submodule-merge-in-merge-recursive' By code restructuring of submodule merge in merge-recursive, informational messages from the codepath are now given using the same mechanism as other output, and honor the merge.verbosity configuration. The code also learned to give a few new messages when a submodule three-way merge resolves cleanly when one side records a descendant of the commit chosen by the other side. * sb/submodule-merge-in-merge-recursive: merge-recursive: give notice when submodule commit gets fast-forwarded merge-recursive: i18n submodule merge output and respect verbosity submodule.c: move submodule merging to merge-recursive.c 30 May 2018, 12:51:27 UTC
2305770 Junio C Hamano 30 May 2018, 12:51:26 UTC Merge branch 'js/empty-config-section-fix' Error codepath fix. * js/empty-config-section-fix: config: a user-provided invalid section is not a BUG 30 May 2018, 12:51:26 UTC
e12cbea Junio C Hamano 30 May 2018, 12:51:26 UTC Merge branch 'bw/ref-prefix-for-configured-refspec' "git fetch $there $refspec" that talks over protocol v2 can take advantage of server-side ref filtering; the code has been extended so that this mechanism triggers also when fetching with configured refspec. * bw/ref-prefix-for-configured-refspec: (38 commits) fetch: generate ref-prefixes when using a configured refspec refspec: consolidate ref-prefix generation logic submodule: convert push_unpushed_submodules to take a struct refspec remote: convert check_push_refs to take a struct refspec remote: convert match_push_refs to take a struct refspec http-push: store refspecs in a struct refspec transport: remove transport_verify_remote_names send-pack: store refspecs in a struct refspec transport: convert transport_push to take a struct refspec push: convert to use struct refspec push: check for errors earlier remote: convert match_explicit_refs to take a struct refspec remote: convert get_ref_match to take a struct refspec remote: convert query_refspecs to take a struct refspec remote: convert apply_refspecs to take a struct refspec remote: convert get_stale_heads to take a struct refspec fetch: convert prune_refs to take a struct refspec fetch: convert get_ref_map to take a struct refspec fetch: convert do_fetch to take a struct refspec refspec: remove the deprecated functions ... 30 May 2018, 12:51:26 UTC
6ac5aca Junio C Hamano 30 May 2018, 12:51:26 UTC Merge branch 'sb/grep-die-on-unreadable-index' Error behaviour of "git grep" when it cannot read the index was inconsistent with other commands that uses the index, which has been corrected to error out early. * sb/grep-die-on-unreadable-index: grep: handle corrupt index files early 30 May 2018, 12:51:26 UTC
f15a486 Junio C Hamano 30 May 2018, 05:10:34 UTC The seventh batch for 2.18 Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2018, 05:10:34 UTC
a173ddd Junio C Hamano 30 May 2018, 05:04:12 UTC Merge branch 'sb/submodule-update-try-harder' "git submodule update" attempts two different kinds of "git fetch" against the upstream repository to grab a commit bound at the submodule's path, but it incorrectly gave up if the first kind (i.e. a normal fetch) failed, making the second "last resort" one (i.e. fetching an exact commit object by object name) ineffective. This has been corrected. * sb/submodule-update-try-harder: git-submodule.sh: try harder to fetch a submodule 30 May 2018, 05:04:12 UTC
017b7c5 Junio C Hamano 30 May 2018, 05:04:11 UTC Merge branch 'lm/credential-netrc' Update credential-netrc helper (in contrib/) to allow customizing the GPG used to decrypt the encrypted .netrc file. * lm/credential-netrc: git-credential-netrc: accept gpg option git-credential-netrc: adapt to test framework for git 30 May 2018, 05:04:11 UTC
ab48bc0 Junio C Hamano 30 May 2018, 05:04:11 UTC Merge branch 'ab/get-short-oid' When a short hexadecimal string is used to name an object but there are multiple objects that share the string as the prefix of their names, the code lists these ambiguous candidates in a help message. These object names are now sorted according to their types for easier eyeballing. * ab/get-short-oid: get_short_oid: sort ambiguous objects by type, then SHA-1 sha1-name.c: move around the collect_ambiguous() function git-p4: change "commitish" typo to "committish" sha1-array.h: align function arguments sha1-name.c: remove stray newline 30 May 2018, 05:04:11 UTC
54db5c0 Junio C Hamano 30 May 2018, 05:04:10 UTC Merge branch 'jt/partial-clone-proto-v2' Transfer protocol v2 learned to support the partial clone. * jt/partial-clone-proto-v2: {fetch,upload}-pack: support filter in protocol v2 upload-pack: read config when serving protocol v2 upload-pack: fix error message typo 30 May 2018, 05:04:10 UTC
42c8ce1 Junio C Hamano 30 May 2018, 05:04:10 UTC Merge branch 'bc/object-id' Conversion from uchar[20] to struct object_id continues. * bc/object-id: (42 commits) merge-one-file: compute empty blob object ID add--interactive: compute the empty tree value Update shell scripts to compute empty tree object ID sha1_file: only expose empty object constants through git_hash_algo dir: use the_hash_algo for empty blob object ID sequencer: use the_hash_algo for empty tree object ID cache-tree: use is_empty_tree_oid sha1_file: convert cached object code to struct object_id builtin/reset: convert use of EMPTY_TREE_SHA1_BIN builtin/receive-pack: convert one use of EMPTY_TREE_SHA1_HEX wt-status: convert two uses of EMPTY_TREE_SHA1_HEX submodule: convert several uses of EMPTY_TREE_SHA1_HEX sequencer: convert one use of EMPTY_TREE_SHA1_HEX merge: convert empty tree constant to the_hash_algo builtin/merge: switch tree functions to use object_id builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algo sha1-file: add functions for hex empty tree and blob OIDs builtin/receive-pack: avoid hard-coded constants for push certs diff: specify abbreviation size in terms of the_hash_algo upload-pack: replace use of several hard-coded constants ... 30 May 2018, 05:04:10 UTC
3d24129 Junio C Hamano 30 May 2018, 05:04:09 UTC Merge branch 'sb/blame-color' "git blame" learns to unhighlight uninteresting metadata from the originating commit on lines that are the same as the previous one, and also paint lines in different colors depending on the age of the commit. * sb/blame-color: builtin/blame: add new coloring scheme config builtin/blame: highlight recently changed lines builtin/blame: dim uninteresting metadata lines 30 May 2018, 05:04:09 UTC
2a98a87 Junio C Hamano 30 May 2018, 05:04:09 UTC Merge branch 'cf/submodule-progress-dissociate' "git submodule update" and "git submodule add" supported the "--reference" option to borrow objects from a neighbouring local repository like "git clone" does, but lacked the more recent invention "--dissociate". Also "git submodule add" has been taught to take the "--progress" option. * cf/submodule-progress-dissociate: submodule: add --dissociate option to add/update commands submodule: add --progress option to add command submodule: clean up substitutions in script 30 May 2018, 05:04:09 UTC
4ce7218 Junio C Hamano 30 May 2018, 05:04:08 UTC Merge branch 'sg/complete-paths' Command line completion (in contrib/) learned to complete pathnames for various commands better. * sg/complete-paths: t9902-completion: exercise __git_complete_index_file() directly completion: don't return with error from __gitcomp_file_direct() completion: fill COMPREPLY directly when completing paths completion: improve handling quoted paths in 'git ls-files's output completion: remove repeated dirnames with 'awk' during path completion t9902-completion: ignore COMPREPLY element order in some tests completion: use 'awk' to strip trailing path components completion: let 'ls-files' and 'diff-index' filter matching paths completion: improve handling quoted paths on the command line completion: support completing non-ASCII pathnames completion: simplify prefix path component handling during path completion completion: move __git_complete_index_file() next to its helpers t9902-completion: add tests demonstrating issues with quoted pathnames 30 May 2018, 05:04:08 UTC
6105fee Junio C Hamano 30 May 2018, 05:04:08 UTC Merge branch 'nd/travis-gcc-8' Developer support. Use newer GCC on one of the builds done at TravisCI.org to get more warnings and errors diagnosed. * nd/travis-gcc-8: travis-ci: run gcc-8 on linux-gcc jobs 30 May 2018, 05:04:08 UTC
a4eae17 Junio C Hamano 30 May 2018, 05:04:08 UTC Merge branch 'nd/pack-struct-commit' Memory optimization. * nd/pack-struct-commit: commit.h: rearrange 'index' to shrink struct commit 30 May 2018, 05:04:08 UTC
26597cb Junio C Hamano 30 May 2018, 05:04:08 UTC Merge branch 'ma/create-pseudoref-with-null-old-oid' "git update-ref A B" is supposed to ensure that ref A does not yet exist when B is a NULL OID, but this check was not done correctly for pseudo-refs outside refs/ hierarchy, e.g. MERGE_HEAD. * ma/create-pseudoref-with-null-old-oid: refs: handle zero oid for pseudorefs t1400: add tests around adding/deleting pseudorefs refs.c: refer to "object ID", not "sha1", in error messages 30 May 2018, 05:04:08 UTC
cf31579 Junio C Hamano 30 May 2018, 05:04:07 UTC Merge branch 'jk/unavailable-can-be-missing' Code clean-up to turn history traversal more robust in a semi-corrupt repository. * jk/unavailable-can-be-missing: mark_parents_uninteresting(): avoid most allocation mark_parents_uninteresting(): replace list with stack mark_parents_uninteresting(): drop missing object check mark_tree_contents_uninteresting(): drop missing object check 30 May 2018, 05:04:08 UTC
5da4847 Junio C Hamano 30 May 2018, 05:04:07 UTC Merge branch 'bp/status-rename-config' "git status" learned to honor a new status.renames configuration to skip rename detection, which could be useful for those who want to do so without disabling the default rename detection done by the "git diff" command. * bp/status-rename-config: add status config and command line options for rename detection 30 May 2018, 05:04:07 UTC
50f08db Junio C Hamano 30 May 2018, 05:04:07 UTC Merge branch 'js/use-bug-macro' Developer support update, by using BUG() macro instead of die() to mark codepaths that should not happen more clearly. * js/use-bug-macro: BUG_exit_code: fix sparse "symbol not declared" warning Convert remaining die*(BUG) messages Replace all die("BUG: ...") calls by BUG() ones run-command: use BUG() to report bugs, not die() test-tool: help verifying BUG() code paths 30 May 2018, 05:04:07 UTC
bef896e Junio C Hamano 30 May 2018, 05:04:06 UTC Merge branch 'rs/no-null-ptr-arith-in-fast-export' Code clean-up to avoid non-standard-conformant pointer arithmetic. * rs/no-null-ptr-arith-in-fast-export: fast-export: avoid NULL pointer arithmetic 30 May 2018, 05:04:06 UTC
0abb962 Junio C Hamano 30 May 2018, 05:04:05 UTC Merge branch 'nd/repo-clear-keep-the-index' the_repository->index is not a allocated piece of memory but repo_clear() indiscriminately attempted to free(3) it, which has been corrected. * nd/repo-clear-keep-the-index: repository: fix free problem with repo_clear(the_repository) 30 May 2018, 05:04:05 UTC
2f76ebc Junio C Hamano 30 May 2018, 05:04:05 UTC Merge branch 'ma/lockfile-cleanup' Code clean-up to adjust to a more recent lockfile API convention that allows lockfile instances kept on the stack. * ma/lockfile-cleanup: lock_file: move static locks into functions lock_file: make function-local locks non-static refs.c: do not die if locking fails in `delete_pseudoref()` refs.c: do not die if locking fails in `write_pseudoref()` t/helper/test-write-cache: clean up lock-handling 30 May 2018, 05:04:05 UTC
0e7af5f Junio C Hamano 30 May 2018, 05:04:04 UTC Merge branch 'sg/t6500-no-redirect-of-stdin' Test cleanup. * sg/t6500-no-redirect-of-stdin: t6050-replace: don't disable stdin for the whole test script 30 May 2018, 05:04:04 UTC
6e2ba77 Junio C Hamano 30 May 2018, 05:04:04 UTC Merge branch 'bp/merge-rename-config' With merge.renames configuration set to false, the recursive merge strategy can be told not to spend cycles trying to find renamed paths and merge them accordingly. * bp/merge-rename-config: merge: pass aggressive when rename detection is turned off merge: add merge.renames config setting merge: update documentation for {merge,diff}.renameLimit 30 May 2018, 05:04:04 UTC
c5aa4bc Junio C Hamano 30 May 2018, 05:04:04 UTC Merge branch 'js/sequencer-and-root-commits' The implementation of "git rebase -i --root" has been updated to use the sequencer machinery more. * js/sequencer-and-root-commits: rebase --rebase-merges: root commits can be cousins, too rebase --rebase-merges: a "merge" into a new root is a fast-forward sequencer: allow introducing new root commits rebase -i --root: let the sequencer handle even the initial part sequencer: learn about the special "fake root commit" handling sequencer: extract helper to update active_cache_tree 30 May 2018, 05:04:04 UTC
89be19d Junio C Hamano 30 May 2018, 05:04:03 UTC Merge branch 'dd/send-email-reedit' "git send-email" can sometimes offer confirmation dialog "Send this email?" with choices 'Yes', 'No', 'Quit', and 'All'. A new action 'Edit' has been added to this dialog's choice. * dd/send-email-reedit: git-send-email: allow re-editing of message 30 May 2018, 05:04:03 UTC
44f560f Robert P. J. Day 29 May 2018, 12:14:35 UTC init: fix grammar in "templates not found" msg Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2018, 04:32:40 UTC
5971b08 brian m. carlson 29 May 2018, 16:32:36 UTC sequencer: ensure labels that are object IDs are rewritten When writing the todo script for --rebase-merges, we try to find a label for certain commits. If the label ends up being a valid object ID, such as when we merge a detached commit, we want to rewrite it so it is no longer a valid object ID. However, the code path that does this checks for its length to be equivalent to GIT_SHA1_RAWSZ, which isn't correct, since what we are reading is a hex object ID. Instead, check for the length being equivalent to that of a hex object ID. Use the_hash_algo so this code works regardless of the hash size. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2018, 04:32:16 UTC
5340d47 Christian Couder 26 May 2018, 06:47:45 UTC t990X: use '.git/objects' as 'deep inside .git' path Tests t9902-completion.sh and t9903-bash-prompt.sh each have tests that check what happens when we are "in the '.git' directory" and when we are "deep inside the '.git' directory". To test the case when we are "deep inside the '.git' directory" the test scripts used to perform a `cd .git/refs/heads`. As there are plans to implement other ref storage systems, let's use '.git/objects' instead of '.git/refs/heads' as the "deep inside the '.git' directory" path. This makes it clear to readers that these tests do not depend on which ref backend is used. The internals of the loose refs backend are still tested in t1400-update-ref.sh. Helped-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 May 2018, 03:55:53 UTC
7913f53 Junio C Hamano 29 May 2018, 08:09:58 UTC Sync with Git 2.17.1 * maint: (25 commits) Git 2.17.1 Git 2.16.4 Git 2.15.2 Git 2.14.4 Git 2.13.7 fsck: complain when .gitmodules is a symlink index-pack: check .gitmodules files with --strict unpack-objects: call fsck_finish() after fscking objects fsck: call fsck_finish() after fscking objects fsck: check .gitmodules content fsck: handle promisor objects in .gitmodules check fsck: detect gitmodules files fsck: actually fsck blob data fsck: simplify ".git" check index-pack: make fsck error message more specific verify_path: disallow symlinks in .gitmodules update-index: stat updated files earlier verify_dotfile: mention case-insensitivity in comment verify_path: drop clever fallthrough skip_prefix: add case-insensitive variant ... 29 May 2018, 08:10:05 UTC
590551c Robert P. J. Day 25 May 2018, 09:45:09 UTC tag: clarify in the doc that a tag can refer to a non-commit object Reword "man git-tag" to clarify that a tag can refer directly to an arbitrary object, not just a commit object. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 May 2018, 02:55:34 UTC
35d515b Orgad Shaneh 27 May 2018, 06:51:27 UTC git-rebase--interactive: fix copy-paste mistake exec argument is a command, not a commit. Signed-off-by: Orgad Shaneh <orgads@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 May 2018, 14:29:32 UTC
de61305 Robert P. J. Day 24 May 2018, 20:11:39 UTC Use proper syntax for replaceables in command docs The standard for command documentation synopses appears to be: [...] means optional <...> means replaceable [<...>] means both optional and replaceable So fix a number of doc pages that use incorrect variations of the above. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 May 2018, 08:16:47 UTC
4d36f88 Jonathan Tan 24 May 2018, 20:47:29 UTC submodule: do not pass null OID to setup_revisions If "git pull --recurse-submodules --rebase" is invoked when the current branch and its corresponding remote-tracking branch have no merge base, a "bad object" fatal error occurs. This issue was introduced with commit a6d7eb2c7a ("pull: optionally rebase submodules (remote submodule changes only)", 2017-06-23), which also introduced this feature. This is because cmd_pull() in builtin/pull.c thus invokes submodule_touches_in_range() with a null OID as the first parameter. Ensure that this case works, and document what happens in this case. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 May 2018, 06:25:42 UTC
0ed556d Elijah Newren 24 May 2018, 06:27:33 UTC rev-parse: check lookup'ed commit references for NULL Commits 2122f8b963d4 ("rev-parse: Add support for the ^! and ^@ syntax", 2008-07-26) and 3dd4e7320d ("Teach rev-parse the ... syntax.", 2006-07-04) taught rev-parse new syntax, and used lookup_commit_reference() as part of their logic. Neither usage checked the returned commit to see if it was non-NULL before using it. Check for NULL and ensure an appropriate error is reported to the user. Reported by Florian Weimer and Todd Zullinger. Helped-by: Jeff King <peff@peff.net> Signed-off-by: Elijah Newren <newren@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 May 2018, 01:46:42 UTC
3e4a67b Nguyễn Thái Ngọc Duy 20 May 2018, 15:42:58 UTC Use OPT_SET_INT_F() for cmdline option specification The only thing these commands need is extra parseopt flag which can be passed in by OPT_SET_INT_F() and it is a bit more compact than full struct initialization. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 May 2018, 07:12:29 UTC
123f631 Luke Diamand 23 May 2018, 22:20:26 UTC git-p4: add unshelve command This can be used to "unshelve" a shelved P4 commit into a git commit. For example: $ git p4 unshelve 12345 The resulting commit ends up in the branch: refs/remotes/p4/unshelved/12345 If that branch already exists, it is renamed - for example the above branch would be saved as p4/unshelved/12345.1. git-p4 checks that the shelved changelist is based on files which are at the same Perforce revision as the origin branch being used for the unshelve (HEAD by default). If they are not, it will refuse to unshelve. This is to ensure that the unshelved change does not contain other changes mixed-in. The reference branch can be changed manually with the "--origin" option. The change adds a new Unshelve command class. This just runs the existing P4Sync code tweaked to handle a shelved changelist. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 May 2018, 23:58:28 UTC
12ecea4 Pedro Alvarez Piedehierro 23 May 2018, 22:54:17 UTC import-tars: read overlong names from pax extended header Importing gcc tarballs[1] with import-tars script (in contrib) fails when hitting a pax extended header. Make sure we always read the extended attributes from the pax entries, and store the 'path' value if found to be used in the next ustar entry. The code to parse pax extended headers was written consulting the Pax Pax Interchange Format documentation [2]. [1] http://ftp.gnu.org/gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz [2] https://www.freebsd.org/cgi/man.cgi?manpath=FreeBSD+8-current&query=tar&sektion=5 Signed-off-by: Pedro Alvarez <palvarez89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 May 2018, 23:35:51 UTC
cbc5cf7 David Turner 23 May 2018, 05:25:17 UTC t: make many tests depend less on the refs being files Many tests are very focused on the file system representation of the loose and packed refs code. As there are plans to implement other ref storage systems, let's migrate these tests to a form that test the intent of the refs storage system instead of it internals. This will make clear to readers that these tests do not depend on which ref backend is used. The internals of the loose refs backend are still tested in t1400-update-ref.sh, whereas the tests changed in this patch focus on testing other aspects. This patch just takes care of many low hanging fruits. It does not try to completely solves the issue. Helped-by: Stefan Beller <sbeller@google.com> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 May 2018, 05:59:38 UTC
e144d12 Junio C Hamano 23 May 2018, 05:45:34 UTC The sixth batch for 2.18 Signed-off-by: Junio C Hamano <gitster@pobox.com> 23 May 2018, 05:45:34 UTC
fb3a0ca Junio C Hamano 23 May 2018, 05:38:25 UTC Merge branch 'fg/completion-external' The command line completion mechanism (in contrib/) learned to load custom completion file for "git $command" where $command is a custom "git-$command" that the end user has on the $PATH when using newer version of bash. * fg/completion-external: completion: load completion file for external subcommand 23 May 2018, 05:38:25 UTC
d7e9611 Junio C Hamano 23 May 2018, 05:38:25 UTC Merge branch 'bc/asciidoctor-tab-width' Asciidoctor gives a reasonable imitation for AsciiDoc, but does not render illustration in a literal block correctly when indented with HT by default. The problem is fixed by forcing 8-space tabs. * bc/asciidoctor-tab-width: Documentation: render revisions correctly under Asciidoctor Documentation: use 8-space tabs with Asciidoctor 23 May 2018, 05:38:25 UTC
5a97e7b Junio C Hamano 23 May 2018, 05:38:24 UTC Merge branch 'nd/pack-unreachable-objects-doc' Doc update. * nd/pack-unreachable-objects-doc: pack-objects: validation and documentation about unreachable options 23 May 2018, 05:38:24 UTC
df20b62 Junio C Hamano 23 May 2018, 05:38:24 UTC Merge branch 'nd/completion-aliasfiletype-typofix' Typofix. * nd/completion-aliasfiletype-typofix: completion: fix misspelled config key aliasesfiletype 23 May 2018, 05:38:24 UTC
1e174fd Junio C Hamano 23 May 2018, 05:38:23 UTC Merge branch 'em/status-rename-config' "git status" learned to pay attention to UI related diff configuration variables such as diff.renames. * em/status-rename-config: wt-status: use settings from git_diff_ui_config 23 May 2018, 05:38:23 UTC
02d11bb Junio C Hamano 23 May 2018, 05:38:23 UTC Merge branch 'cc/perf-bisect' Performance test updates. * cc/perf-bisect: perf/bisect_run_script: disable codespeed 23 May 2018, 05:38:23 UTC
be75d12 Junio C Hamano 23 May 2018, 05:38:23 UTC Merge branch 'ah/misc-doc-updates' Misc doc fixes. * ah/misc-doc-updates: doc: normalize [--options] to [options] in git-diff doc: add note about shell quoting to revision.txt git-svn: remove ''--add-author-from' for 'commit-diff' doc: add '-d' and '-o' for 'git push' doc: clarify ignore rules for git ls-files doc: align 'diff --no-index' in text and synopsis doc: improve formatting in githooks.txt 23 May 2018, 05:38:23 UTC
fda537a Junio C Hamano 23 May 2018, 05:38:22 UTC Merge branch 'bp/test-drop-caches' Code simplification. * bp/test-drop-caches: test-drop-caches: simplify delay loading of NtSetSystemInformation 23 May 2018, 05:38:22 UTC
d658196 Junio C Hamano 23 May 2018, 05:38:22 UTC Merge branch 'en/unpack-trees-split-index-fix' The split-index feature had a long-standing and dormant bug in certain use of the in-core merge machinery, which has been fixed. * en/unpack-trees-split-index-fix: unpack_trees: fix breakage when o->src_index != o->dst_index 23 May 2018, 05:38:22 UTC
6b0f1d9 Junio C Hamano 23 May 2018, 05:38:21 UTC Merge branch 'nd/doc-header' Doc formatting fix. * nd/doc-header: doc: keep first level section header in upper case 23 May 2018, 05:38:22 UTC
4e0086b Junio C Hamano 23 May 2018, 05:38:21 UTC Merge branch 'bc/format-patch-cover-no-attach' "git format-patch --cover --attach" created a broken MIME multipart message for the cover letter, which has been fixed by keeping the cover letter as plain text file. * bc/format-patch-cover-no-attach: format-patch: make cover letters always text/plain 23 May 2018, 05:38:21 UTC
71cdbb3 Junio C Hamano 23 May 2018, 05:38:21 UTC Merge branch 'tb/test-apfs-utf8-normalization' A test to see if the filesystem normalizes UTF-8 filename has been updated to check what we need to know in a more direct way, i.e. a path created in NFC form can be accessed with NFD form (or vice versa) to cope with APFS as well as HFS. * tb/test-apfs-utf8-normalization: test: correct detection of UTF8_NFD_TO_NFC for APFS 23 May 2018, 05:38:21 UTC
2c18e6a Junio C Hamano 23 May 2018, 05:38:20 UTC Merge branch 'js/rebase-recreate-merge' "git rebase" learned "--rebase-merges" to transplant the whole topology of commit graph elsewhere. * js/rebase-recreate-merge: rebase -i --rebase-merges: add a section to the man page rebase -i: introduce --rebase-merges=[no-]rebase-cousins pull: accept --rebase=merges to recreate the branch topology rebase --rebase-merges: avoid "empty merges" sequencer: handle post-rewrite for merge commands sequencer: make refs generated by the `label` command worktree-local rebase --rebase-merges: add test for --keep-empty rebase: introduce the --rebase-merges option rebase-helper --make-script: introduce a flag to rebase merges sequencer: fast-forward `merge` commands, if possible sequencer: introduce the `merge` command sequencer: introduce new commands to reset the revision git-rebase--interactive: clarify arguments sequencer: offer helpful advice when a command was rescheduled sequencer: refactor how original todo list lines are accessed sequencer: make rearrange_squash() a bit more obvious sequencer: avoid using errno clobbered by rollback_lock_file() 23 May 2018, 05:38:20 UTC
ad635e8 Junio C Hamano 23 May 2018, 05:38:19 UTC Merge branch 'nd/pack-objects-pack-struct' "git pack-objects" needs to allocate tons of "struct object_entry" while doing its work, and shrinking its size helps the performance quite a bit. * nd/pack-objects-pack-struct: ci: exercise the whole test suite with uncommon code in pack-objects pack-objects: reorder members to shrink struct object_entry pack-objects: shrink delta_size field in struct object_entry pack-objects: shrink size field in struct object_entry pack-objects: clarify the use of object_entry::size pack-objects: don't check size when the object is bad pack-objects: shrink z_delta_size field in struct object_entry pack-objects: refer to delta objects by index instead of pointer pack-objects: move in_pack out of struct object_entry pack-objects: move in_pack_pos out of struct object_entry pack-objects: use bitfield for object_entry::depth pack-objects: use bitfield for object_entry::dfs_state pack-objects: turn type and in_pack_type to bitfields pack-objects: a bit of document about struct object_entry read-cache.c: make $GIT_TEST_SPLIT_INDEX boolean 23 May 2018, 05:38:19 UTC
c67de74 Junio C Hamano 23 May 2018, 05:38:19 UTC Merge branch 'en/rename-directory-detection-reboot' Rename detection logic in "diff" family that is used in "merge" has learned to guess when all of x/a, x/b and x/c have moved to z/a, z/b and z/c, it is likely that x/d added in the meantime would also want to move to z/d by taking the hint that the entire directory 'x' moved to 'z'. A bug causing dirty files involved in a rename to be overwritten during merge has also been fixed as part of this work. Incidentally, this also avoids updating a file in the working tree after a (non-trivial) merge whose result matches what our side originally had. * en/rename-directory-detection-reboot: (36 commits) merge-recursive: fix check for skipability of working tree updates merge-recursive: make "Auto-merging" comment show for other merges merge-recursive: fix remainder of was_dirty() to use original index merge-recursive: fix was_tracked() to quit lying with some renamed paths t6046: testcases checking whether updates can be skipped in a merge merge-recursive: avoid triggering add_cacheinfo error with dirty mod merge-recursive: move more is_dirty handling to merge_content merge-recursive: improve add_cacheinfo error handling merge-recursive: avoid spurious rename/rename conflict from dir renames directory rename detection: new testcases showcasing a pair of bugs merge-recursive: fix remaining directory rename + dirty overwrite cases merge-recursive: fix overwriting dirty files involved in renames merge-recursive: avoid clobbering untracked files with directory renames merge-recursive: apply necessary modifications for directory renames merge-recursive: when comparing files, don't include trees merge-recursive: check for file level conflicts then get new name merge-recursive: add computation of collisions due to dir rename & merging merge-recursive: check for directory level conflicts merge-recursive: add get_directory_renames() merge-recursive: make a helper function for cleanup for handle_renames ... 23 May 2018, 05:38:19 UTC
c9aac55 Junio C Hamano 23 May 2018, 05:38:18 UTC Merge branch 'js/no-pager-shorthand' "git --no-pager cmd" did not have short-and-sweet single letter option. Now it does. * js/no-pager-shorthand: git: add -P as a short option for --no-pager 23 May 2018, 05:38:18 UTC
4a3bf32 Junio C Hamano 23 May 2018, 05:38:18 UTC Merge branch 'js/rebase-i-clean-msg-after-fixup-continue' "git rebase -i" sometimes left intermediate "# This is a combination of N commits" message meant for the human consumption inside an editor in the final result in certain corner cases, which has been fixed. * js/rebase-i-clean-msg-after-fixup-continue: rebase --skip: clean up commit message after a failed fixup/squash sequencer: always commit without editing when asked for rebase -i: Handle "combination of <n> commits" with GETTEXT_POISON rebase -i: demonstrate bugs with fixup!/squash! commit messages 23 May 2018, 05:38:18 UTC
10174da Junio C Hamano 23 May 2018, 05:38:18 UTC Merge branch 'tg/worktree-add-existing-branch' "git worktree add" learned to check out an existing branch. * tg/worktree-add-existing-branch: worktree: teach "add" to check out existing branches worktree: factor out dwim_branch function worktree: improve message when creating a new worktree worktree: remove extra members from struct add_opts 23 May 2018, 05:38:18 UTC
352cf6c Junio C Hamano 23 May 2018, 05:38:17 UTC Merge branch 'js/deprecate-grafts' The functionality of "$GIT_DIR/info/grafts" has been superseded by the "refs/replace/" mechanism for some time now, but the internal code had support for it in many places, which has been cleaned up in order to drop support of the "grafts" mechanism. * js/deprecate-grafts: Remove obsolete script to convert grafts to replace refs technical/shallow: describe why shallow cannot use replace refs technical/shallow: stop referring to grafts filter-branch: stop suggesting to use grafts Deprecate support for .git/info/grafts Add a test for `git replace --convert-graft-file` replace: introduce --convert-graft-file replace: prepare create_graft() for converting graft files wholesale replace: "libify" create_graft() and callees replace: avoid using die() to indicate a bug commit: Let the callback of for_each_mergetag return on error argv_array: offer to split a string by whitespace 23 May 2018, 05:38:17 UTC
5002702 Junio C Hamano 23 May 2018, 05:38:17 UTC Merge branch 'js/test-unset-prereq' Test debugging aid. * js/test-unset-prereq: tests: introduce test_unset_prereq, for debugging 23 May 2018, 05:38:17 UTC
e3ab3e8 Junio C Hamano 23 May 2018, 05:38:16 UTC Merge branch 'ab/perl-python-attrs' We learned that our source files with ".pl" and ".py" extensions are Perl and Python files respectively and changes to them are better viewed as such with appropriate diff drivers. * ab/perl-python-attrs: .gitattributes: add a diff driver for Python .gitattributes: use the "perl" differ for Perl .gitattributes: add *.pl extension for Perl 23 May 2018, 05:38:16 UTC
fcb6df3 Junio C Hamano 23 May 2018, 05:38:16 UTC Merge branch 'sb/oid-object-info' The codepath around object-info API has been taught to take the repository object (which in turn tells the API which object store the objects are to be located). * sb/oid-object-info: cache.h: allow oid_object_info to handle arbitrary repositories packfile: add repository argument to cache_or_unpack_entry packfile: add repository argument to unpack_entry packfile: add repository argument to read_object packfile: add repository argument to packed_object_info packfile: add repository argument to packed_to_object_type packfile: add repository argument to retry_bad_packed_offset cache.h: add repository argument to oid_object_info cache.h: add repository argument to oid_object_info_extended 23 May 2018, 05:38:16 UTC
d0f7b22 Junio C Hamano 23 May 2018, 05:38:15 UTC Merge branch 'cc/perf-aggregate-unknown-option' Perf-test helper updates. * cc/perf-aggregate-unknown-option: perf/aggregate: use Getopt::Long for option parsing 23 May 2018, 05:38:15 UTC
89753dc Junio C Hamano 23 May 2018, 05:38:15 UTC Merge branch 'en/git-debugger' Dev support. * en/git-debugger: Make running git under other debugger-like programs easy 23 May 2018, 05:38:15 UTC
back to top