Skip to main content

Browse the archive

https://github.com/git/git
05 April 2024, 19:32:26 UTC
sort by:
Revision Author Date Message Commit Date
217f276 Junio C Hamano 05 October 2017, 04:49:07 UTC Git 2.15-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 05 October 2017, 04:49:07 UTC
af66399 Junio C Hamano 05 October 2017, 04:48:21 UTC Merge branch 'ar/request-pull-phrasofix' Spell the name of our system as "Git" in the output from request-pull script. * ar/request-pull-phrasofix: request-pull: capitalise "Git" to make it a proper noun 05 October 2017, 04:48:21 UTC
d5d5295 Junio C Hamano 05 October 2017, 04:48:20 UTC Merge branch 'rs/run-command-use-alloc-array' Code clean-up. * rs/run-command-use-alloc-array: run-command: use ALLOC_ARRAY 05 October 2017, 04:48:20 UTC
6551e69 Junio C Hamano 05 October 2017, 04:48:20 UTC Merge branch 'sb/git-clang-format' Add comment to clarify that the style file is meant to be used with clang-5 and the rules are still work in progress. * sb/git-clang-format: clang-format: add a comment about the meaning/status of the 05 October 2017, 04:48:20 UTC
e3c677f Junio C Hamano 05 October 2017, 04:48:20 UTC Merge branch 'rs/use-free-and-null' Code clean-up. * rs/use-free-and-null: repository: use FREE_AND_NULL 05 October 2017, 04:48:20 UTC
1d4a1f6 Junio C Hamano 05 October 2017, 04:48:19 UTC Merge branch 'rs/tag-null-pointer-arith-fix' Code clean-up. * rs/tag-null-pointer-arith-fix: tag: avoid NULL pointer arithmetic 05 October 2017, 04:48:20 UTC
ac67aa5 Junio C Hamano 05 October 2017, 04:48:19 UTC Merge branch 'rs/cocci-de-paren-call-params' Code clean-up. * rs/cocci-de-paren-call-params: coccinelle: remove parentheses that become unnecessary 05 October 2017, 04:48:19 UTC
e46ebc2 Junio C Hamano 05 October 2017, 04:48:19 UTC Merge branch 'rs/cleanup-strbuf-users' Code clean-up. * rs/cleanup-strbuf-users: graph: use strbuf_addchars() to add spaces use strbuf_addstr() for adding strings to strbufs path: use strbuf_add_real_path() 05 October 2017, 04:48:19 UTC
efe9d6c Junio C Hamano 05 October 2017, 04:48:19 UTC Merge branch 'rs/resolve-ref-optional-result' Code clean-up. * rs/resolve-ref-optional-result: refs: pass NULL to resolve_refdup() if hash is not needed refs: pass NULL to refs_resolve_refdup() if hash is not needed 05 October 2017, 04:48:19 UTC
29a67cc Junio C Hamano 05 October 2017, 04:48:19 UTC Merge branch 'er/fast-import-dump-refs-on-checkpoint' The checkpoint command "git fast-import" did not flush updates to refs and marks unless at least one object was created since the last checkpoint, which has been corrected, as these things can happen without any new object getting created. * er/fast-import-dump-refs-on-checkpoint: fast-import: checkpoint: dump branches/tags/marks even if object_count==0 05 October 2017, 04:48:19 UTC
8fb8a94 Junio C Hamano 03 October 2017, 06:50:31 UTC The twelfth batch for 2.15 Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 October 2017, 06:50:31 UTC
4812340 Junio C Hamano 03 October 2017, 06:42:50 UTC Merge branch 'bw/git-clang-format' Adjust clang-format penalty parameters. * bw/git-clang-format: clang-format: adjust line break penalties 03 October 2017, 06:42:50 UTC
8f2733a Junio C Hamano 03 October 2017, 06:42:50 UTC Merge branch 'ad/doc-markup-fix' Docfix. * ad/doc-markup-fix: doc: correct command formatting 03 October 2017, 06:42:50 UTC
1a2e1a7 Junio C Hamano 03 October 2017, 06:42:50 UTC Merge branch 'mh/mmap-packed-refs' Operations that do not touch (majority of) packed refs have been optimized by making accesses to packed-refs file lazy; we no longer pre-parse everything, and an access to a single ref in the packed-refs does not touch majority of irrelevant refs, either. * mh/mmap-packed-refs: (21 commits) packed-backend.c: rename a bunch of things and update comments mmapped_ref_iterator: inline into `packed_ref_iterator` ref_cache: remove support for storing peeled values packed_ref_store: get rid of the `ref_cache` entirely ref_store: implement `refs_peel_ref()` generically packed_read_raw_ref(): read the reference from the mmapped buffer packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator` read_packed_refs(): ensure that references are ordered when read packed_ref_cache: keep the `packed-refs` file mmapped if possible packed-backend.c: reorder some definitions mmapped_ref_iterator_advance(): no peeled value for broken refs mmapped_ref_iterator: add iterator over a packed-refs file packed_ref_cache: remember the file-wide peeling state read_packed_refs(): read references with minimal copying read_packed_refs(): make parsing of the header line more robust read_packed_refs(): only check for a header at the top of the file read_packed_refs(): use mmap to read the `packed-refs` file die_unterminated_line(), die_invalid_line(): new functions packed_ref_cache: add a backlink to the associated `packed_ref_store` prefix_ref_iterator: break when we leave the prefix ... 03 October 2017, 06:42:50 UTC
9124cca Junio C Hamano 03 October 2017, 06:42:50 UTC Merge branch 'mr/doc-negative-pathspec' Doc updates. * mr/doc-negative-pathspec: docs: improve discoverability of exclude pathspec 03 October 2017, 06:42:50 UTC
9257d3d Junio C Hamano 03 October 2017, 06:42:49 UTC Merge branch 'sb/submodule-diff-header-fix' Error message tweak. * sb/submodule-diff-header-fix: submodule: correct error message for missing commits 03 October 2017, 06:42:49 UTC
98c57ea Junio C Hamano 03 October 2017, 06:42:49 UTC Merge branch 'sb/diff-color-move' The output from "git diff --summary" was broken in a recent topic that has been merged to 'master' and lost a LF after reporting of mode change. This has been fixed. * sb/diff-color-move: diff: correct newline in summary for renamed files 03 October 2017, 06:42:49 UTC
5a5b8c1 Junio C Hamano 03 October 2017, 06:42:49 UTC Merge branch 'sb/test-submodule-update-config' * sb/test-submodule-update-config: t7406: submodule.<name>.update command must not be run from .gitmodules 03 October 2017, 06:42:49 UTC
bb3afad Junio C Hamano 03 October 2017, 06:42:49 UTC Merge branch 'jk/validate-headref-fix' Code clean-up. * jk/validate-headref-fix: validate_headref: use get_oid_hex for detached HEADs validate_headref: use skip_prefix for symref parsing validate_headref: NUL-terminate HEAD buffer 03 October 2017, 06:42:49 UTC
cb1083c Junio C Hamano 03 October 2017, 06:42:49 UTC Merge branch 'jk/read-in-full' Code clean-up to prevent future mistakes by copying and pasting code that checks the result of read_in_full() function. * jk/read-in-full: worktree: check the result of read_in_full() worktree: use xsize_t to access file size distinguish error versus short read from read_in_full() avoid looking at errno for short read_in_full() returns prefer "!=" when checking read_in_full() result notes-merge: drop dead zero-write code files-backend: prefer "0" for write_in_full() error check 03 October 2017, 06:42:49 UTC
d4e9383 Junio C Hamano 03 October 2017, 06:42:48 UTC Merge branch 'jk/no-optional-locks' Some commands (most notably "git status") makes an opportunistic update when performing a read-only operation to help optimize later operations in the same repository. The new "--no-optional-locks" option can be passed to Git to disable them. * jk/no-optional-locks: git: add --no-optional-locks option 03 October 2017, 06:42:49 UTC
d9ec072 Junio C Hamano 03 October 2017, 06:42:48 UTC Merge branch 'hn/string-list-doc' Doc reorg. * hn/string-list-doc: string-list.h: move documentation from Documentation/api/ into header 03 October 2017, 06:42:48 UTC
9de7ae6 Junio C Hamano 03 October 2017, 06:42:48 UTC Merge branch 'hn/path-ownership-comment' Add comment to a few functions that use a short-lived buffer the caller can peek and copy out of. * hn/path-ownership-comment: read_gitfile_gently: clarify return value ownership. real_path: clarify return value ownership 03 October 2017, 06:42:48 UTC
2f777fa Junio C Hamano 03 October 2017, 06:42:48 UTC Merge branch 'hn/submodule-comment' * hn/submodule-comment: submodule.c: describe submodule_to_gitdir() in a new comment 03 October 2017, 06:42:48 UTC
3b48045 Junio C Hamano 03 October 2017, 06:42:48 UTC Merge branch 'sd/branch-copy' "git branch" learned "-c/-C" to create a new branch by copying an existing one. * sd/branch-copy: branch: fix "copy" to never touch HEAD branch: add a --copy (-c) option to go with --move (-m) branch: add test for -m renaming multiple config sections config: create a function to format section headers 03 October 2017, 06:42:48 UTC
b2a2c4d Junio C Hamano 03 October 2017, 06:42:47 UTC Merge branch 'bc/rev-parse-parseopt-fix' Recent versions of "git rev-parse --parseopt" did not parse the option specification that does not have the optional flags (*=?!) correctly, which has been corrected. * bc/rev-parse-parseopt-fix: parse-options: only insert newline in help text if needed parse-options: write blank line to correct output stream t0040,t1502: Demonstrate parse_options bugs git-rebase: don't ignore unexpected command line arguments rev-parse parseopt: interpret any whitespace as start of help text rev-parse parseopt: do not search help text for flag chars t1502: demonstrate rev-parse --parseopt option mis-parsing 03 October 2017, 06:42:47 UTC
5f3108b Junio C Hamano 03 October 2017, 06:42:47 UTC Merge branch 'js/rebase-i-final' The final batch to "git rebase -i" updates to move more code from the shell script to C. * js/rebase-i-final: rebase -i: rearrange fixup/squash lines using the rebase--helper t3415: test fixup with wrapped oneline rebase -i: skip unnecessary picks using the rebase--helper rebase -i: check for missing commits in the rebase--helper t3404: relax rebase.missingCommitsCheck tests rebase -i: also expand/collapse the SHA-1s via the rebase--helper rebase -i: do not invent onelines when expanding/collapsing SHA-1s rebase -i: remove useless indentation rebase -i: generate the script via rebase--helper t3415: verify that an empty instructionFormat is handled as before 03 October 2017, 06:42:47 UTC
e66d7c3 Ann T Ropea 03 October 2017, 00:08:38 UTC request-pull: capitalise "Git" to make it a proper noun Of the many ways to spell the three-letter word, the variant "Git" should be used when referring to a repository in a description; or, in general, when it is used as a proper noun. We thus change the pull-request template message so that it reads "...in the Git repository at:" Besides, this brings us in line with the documentation, see Documentation/howto/using-signed-tag-in-pull-request.txt Signed-off-by: Ann T Ropea <bedhanger@gmx.de> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 03 October 2017, 04:11:57 UTC
0e187d7 René Scharfe 01 October 2017, 15:14:31 UTC run-command: use ALLOC_ARRAY Use the macro ALLOC_ARRAY to allocate an array. This is shorter and easier, as it automatically infers the size of elements. Patch generated with Coccinelle and contrib/coccinelle/array.cocci. Signeg-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 October 2017, 23:42:57 UTC
1bf0259 Stephan Beyer 01 October 2017, 23:37:14 UTC clang-format: add a comment about the meaning/status of the Having a .clang-format file in a project can be understood in a way that code has to be in the style defined by the .clang-format file, i.e., you just have to run clang-format over all code and you are set. This unfortunately is not yet the case in the Git project, as the format file is still work in progress. Explain it with a comment in the beginning of the file. Additionally, the working clang-format version is mentioned because the config directives change from time to time (in a compatibility-breaking way). Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 October 2017, 04:17:48 UTC
90dd04a René Scharfe 01 October 2017, 14:44:46 UTC repository: use FREE_AND_NULL Use the macro FREE_AND_NULL to release allocated objects and clear their pointers. This is shorter and documents the intent better by combining the two related operations into one. Patch generated with Coccinelle and contrib/coccinelle/free.cocci. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 October 2017, 04:15:59 UTC
7099153 René Scharfe 01 October 2017, 14:45:13 UTC tag: avoid NULL pointer arithmetic lookup_blob() etc. can return NULL if the referenced object isn't of the expected type. In theory it's wrong to reference the object member in that case. In practice it's OK because it's located at offset 0 for all types, so the pointer arithmetic (NULL + 0) is optimized out by the compiler. The issue is reported by Clang's AddressSanitizer, though. Avoid the ASan error by casting the results of the lookup functions to struct object pointers. That works fine with NULL pointers as well. We already rely on the object member being first in all object types in other places in the code. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 October 2017, 04:14:33 UTC
38bdf62 René Scharfe 01 October 2017, 14:45:45 UTC graph: use strbuf_addchars() to add spaces strbuf_addf() can be used to add a specific number of space characters by using the format "%*s" with an empty string and specifying the desired width. Use strbuf_addchars() instead as it's shorter, makes the intent clearer and is a bit more efficient. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 October 2017, 04:14:07 UTC
72d4a9a René Scharfe 01 October 2017, 14:44:20 UTC use strbuf_addstr() for adding strings to strbufs Use strbuf_addstr() instead of strbuf_addf() for adding strings. That's simpler and makes the intent clearer. Patch generated by Coccinelle and contrib/coccinelle/strbuf.cocci; adjusted indentation in refs/packed-backend.c manually. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 October 2017, 04:13:46 UTC
fa2bb34 René Scharfe 01 October 2017, 14:44:06 UTC path: use strbuf_add_real_path() Avoid a string copy to a static buffer by using strbuf_add_real_path() instead of combining strbuf_addstr() and real_path(). Patch generated by Coccinelle and contrib/coccinelle/strbuf.cocci. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 October 2017, 04:13:41 UTC
9ca356f René Scharfe 01 October 2017, 15:12:08 UTC coccinelle: remove parentheses that become unnecessary Transformations that hide multiplications can end up with an pair of parentheses that is no longer needed. E.g. with a rule like this: @@ expression E; @@ - E * 2 + double(E) ... we might get a patch like this: - x = (a + b) * 2; + x = double((a + b)); Add a pair of parentheses to the preimage side of such rules. Coccinelle will generate patches that remove them if they are present, and it will still match expressions that lack them. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 October 2017, 04:02:26 UTC
efbd4fd René Scharfe 01 October 2017, 07:29:03 UTC refs: pass NULL to resolve_refdup() if hash is not needed This allows us to get rid of several write-only variables. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 October 2017, 08:27:14 UTC
872ccb2 René Scharfe 01 October 2017, 07:28:50 UTC refs: pass NULL to refs_resolve_refdup() if hash is not needed This gets us rid of a write-only variable. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 October 2017, 08:26:58 UTC
42efde4 Johannes Schindelin 29 September 2017, 18:26:44 UTC clang-format: adjust line break penalties We really, really, really want to limit the columns to 80 per line: One of the few consistent style comments on the Git mailing list is that the lines should not have more than 80 columns/line (even if 79 columns/line would make more sense, given that the code is frequently viewed as diff, and diffs adding an extra character). The penalty of 5 for excess characters is way too low to guarantee that, though, as pointed out by Brandon Williams. From the existing clang-format examples and documentation, it appears that 100 is a penalty deemed appropriate for Stuff You Really Don't Want, so let's assign that as the penalty for "excess characters", i.e. overly long lines. While at it, adjust the penalties further: we are actually not that keen on preventing new line breaks within comments or string literals, so the penalty of 100 seems awfully high. Likewise, we are not all that adamant about keeping line breaks away from assignment operators (a lot of Git's code breaks immediately after the `=` character just to keep that 80 columns/line limit). We do frown a little bit more about functions' return types being on their own line than the penalty 0 would suggest, so this was adjusted, too. Finally, we do not particularly fancy breaking before the first parameter in a call, but if it keeps the line shorter than 80 columns/line, that's what we do, so lower the penalty for breaking before a call's first parameter, but not quite as much as introducing new line breaks to comments. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 October 2017, 02:39:30 UTC
30e215a Eric Rannaud 29 September 2017, 03:09:36 UTC fast-import: checkpoint: dump branches/tags/marks even if object_count==0 The checkpoint command cycles packfiles if object_count != 0, a sensible test or there would be no pack files to write. Since 820b931012, the command also dumps branches, tags and marks, but still conditionally. However, it is possible for a command stream to modify refs or create marks without creating any new objects. For example, reset a branch (and keep fast-import running): $ git fast-import reset refs/heads/master from refs/heads/master^ checkpoint but refs/heads/master remains unchanged. Other example: a commit command that re-creates an object that already exists in the object database. The man page also states that checkpoint "updates the refs" and that "placing a progress command immediately after a checkpoint will inform the reader when the checkpoint has been completed and it can safely access the refs that fast-import updated". This wasn't always true without this patch. This fix unconditionally calls dump_{branches,tags,marks}() for all checkpoint commands. dump_branches() and dump_tags() are cheap to call in the case of a no-op. Add tests to t9300 that observe the (non-packfiles) effects of checkpoint. Signed-off-by: Eric Rannaud <e@nanocritical.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 September 2017, 09:35:42 UTC
ea220ee Junio C Hamano 29 September 2017, 02:25:46 UTC The eleventh batch for 2.15 Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 September 2017, 02:25:46 UTC
d5eec90 Junio C Hamano 29 September 2017, 02:23:44 UTC Merge branch 'sb/doc-config-submodule-update' * sb/doc-config-submodule-update: Documentation/config: clarify the meaning of submodule.<name>.update 29 September 2017, 02:23:44 UTC
69c54c7 Junio C Hamano 29 September 2017, 02:23:43 UTC Merge branch 'ma/leakplugs' Memory leaks in various codepaths have been plugged. * ma/leakplugs: pack-bitmap[-write]: use `object_array_clear()`, don't leak object_array: add and use `object_array_pop()` object_array: use `object_array_clear()`, not `free()` leak_pending: use `object_array_clear()`, not `free()` commit: fix memory leak in `reduce_heads()` builtin/commit: fix memory leak in `prepare_index()` 29 September 2017, 02:23:43 UTC
14a8168 Junio C Hamano 29 September 2017, 02:23:42 UTC Merge branch 'rj/no-sign-compare' Many codepaths have been updated to squelch -Wsign-compare warnings. * rj/no-sign-compare: ALLOC_GROW: avoid -Wsign-compare warnings cache.h: hex2chr() - avoid -Wsign-compare warnings commit-slab.h: avoid -Wsign-compare warnings git-compat-util.h: xsize_t() - avoid -Wsign-compare warnings 29 September 2017, 02:23:42 UTC
d4d262d Junio C Hamano 29 September 2017, 02:23:42 UTC Merge branch 'sb/merge-commit-msg-hook' As "git commit" to conclude a conflicted "git merge" honors the commit-msg hook, "git merge" that records a merge commit that cleanly auto-merges should, but it didn't. * sb/merge-commit-msg-hook (2017-09-22) 1 commit (merged to 'next' on 2017-09-25 at 096e0502a8) + Documentation/githooks: mention merge in commit-msg hook Add documentation for a topic that has recently graduated to the 'master' branch. * sb/merge-commit-msg-hook: Documentation/githooks: mention merge in commit-msg hook 29 September 2017, 02:23:42 UTC
8096e1d Junio C Hamano 29 September 2017, 02:23:42 UTC Merge branch 'jt/fast-export-copy-modify-fix' "git fast-export" with -M/-C option issued "copy" instruction on a path that is simultaneously modified, which was incorrect. * jt/fast-export-copy-modify-fix: fast-export: do not copy from modified file 29 September 2017, 02:23:42 UTC
8c1bc7c Junio C Hamano 29 September 2017, 02:23:41 UTC Merge branch 'mk/describe-match-with-all' "git describe --match <pattern>" has been taught to play well with the "--all" option. * mk/describe-match-with-all: describe: teach --match to handle branches and remotes 29 September 2017, 02:23:41 UTC
075bc9c Junio C Hamano 29 September 2017, 02:23:40 UTC Merge branch 'jm/status-ignored-directory-optim' "git status --ignored", when noticing that a directory without any tracked path is ignored, still enumerated all the ignored paths in the directory, which is unnecessary. The codepath has been optimized to avoid this overhead. * jm/status-ignored-directory-optim: Improve performance of git status --ignored 29 September 2017, 02:23:40 UTC
5e63332 Adam Dinwoodie 28 September 2017, 14:06:48 UTC doc: correct command formatting Leaving spaces around the `-delimeters for commands means asciidoc fails to parse them as the start of a literal string. Remove an extraneous space that is causing a literal to not be formatted as such. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Acked-by: Andreas Heiduk <asheiduk@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 29 September 2017, 01:54:38 UTC
20fed7c Junio C Hamano 28 September 2017, 05:51:45 UTC The tenth batch for 2.15 Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 September 2017, 05:51:45 UTC
3b6e73a Junio C Hamano 28 September 2017, 05:47:57 UTC Merge branch 'js/win32-lazyload-dll' Add a helper in anticipation for its need in a future topic RSN. * js/win32-lazyload-dll: Win32: simplify loading of DLL functions 28 September 2017, 05:47:57 UTC
4da3e23 Junio C Hamano 28 September 2017, 05:47:57 UTC Merge branch 'jc/merge-x-theirs-docfix' The documentation for '-X<option>' for merges was misleadingly written to suggest that "-s theirs" exists, which is not the case. * jc/merge-x-theirs-docfix: merge-strategies: avoid implying that "-s theirs" exists 28 September 2017, 05:47:57 UTC
47d26f0 Junio C Hamano 28 September 2017, 05:47:56 UTC Merge branch 'ks/doc-use-camelcase-for-config-name' Doc update. * ks/doc-use-camelcase-for-config-name: doc: camelCase the config variables to improve readability 28 September 2017, 05:47:56 UTC
fdbe2ac Junio C Hamano 28 September 2017, 05:47:56 UTC Merge branch 'mk/diff-delta-avoid-large-offset' The delta format used in the packfile cannot reference data at offset larger than what can be expressed in 4-byte, but the generator for the data failed to make sure the offset does not overflow. This has been corrected. * mk/diff-delta-avoid-large-offset: diff-delta: do not allow delta offset truncation 28 September 2017, 05:47:56 UTC
3d09e79 Junio C Hamano 28 September 2017, 05:47:56 UTC Merge branch 'mk/diff-delta-uint-may-be-shorter-than-ulong' The machinery to create xdelta used in pack files received the sizes of the data in size_t, but lost the higher bits of them by storing them in "unsigned int" during the computation, which is fixed. * mk/diff-delta-uint-may-be-shorter-than-ulong: diff-delta: fix encoding size that would not fit in "unsigned int" 28 September 2017, 05:47:56 UTC
73ecdc6 Junio C Hamano 28 September 2017, 05:47:56 UTC Merge branch 'rs/resolve-ref-optional-result' Code clean-up. * rs/resolve-ref-optional-result: refs: pass NULL to resolve_ref_unsafe() if hash is not needed refs: pass NULL to refs_resolve_ref_unsafe() if hash is not needed refs: make sha1 output parameter of refs_resolve_ref_unsafe() optional 28 September 2017, 05:47:56 UTC
2812ca7 Junio C Hamano 28 September 2017, 05:47:55 UTC Merge branch 'rs/mailinfo-qp-decode-fix' "git mailinfo" was loose in decoding quoted printable and produced garbage when the two letters after the equal sign are not hexadecimal. This has been fixed. * rs/mailinfo-qp-decode-fix: mailinfo: don't decode invalid =XY quoted-printable sequences 28 September 2017, 05:47:56 UTC
1ba75ff Junio C Hamano 28 September 2017, 05:47:55 UTC Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' A docfix. * jk/doc-read-tree-table-asciidoctor-fix: doc: put literal block delimiter around table 28 September 2017, 05:47:55 UTC
376a1da Junio C Hamano 28 September 2017, 05:47:54 UTC Merge branch 'ik/userdiff-html-h-element-fix' The built-in pattern to detect the "function header" for HTML did not match <H1>..<H6> elements without any attributes, which has been fixed. * ik/userdiff-html-h-element-fix: userdiff: fix HTML hunk header regexp 28 September 2017, 05:47:54 UTC
59373a4 Junio C Hamano 28 September 2017, 05:47:53 UTC Merge branch 'jk/fallthrough' Many codepaths have been updated to squelch -Wimplicit-fallthrough warnings from Gcc 7 (which is a good code hygiene). * jk/fallthrough: consistently use "fallthrough" comments in switches curl_trace(): eliminate switch fallthrough test-line-buffer: simplify command parsing 28 September 2017, 05:47:53 UTC
bfbc2fc Junio C Hamano 28 September 2017, 05:47:53 UTC Merge branch 'jk/diff-blob' "git cat-file --textconv" started segfaulting recently, which has been corrected. * jk/diff-blob: cat-file: handle NULL object_context.path 28 September 2017, 05:47:53 UTC
8174645 Junio C Hamano 28 September 2017, 05:47:52 UTC Merge branch 'hn/typofix' * hn/typofix: submodule.h: typofix 28 September 2017, 05:47:52 UTC
386dd12 Junio C Hamano 28 September 2017, 05:47:52 UTC Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger' "git filter-branch" cannot reproduce a history with a tag without the tagger field, which only ancient versions of Git allowed to be created. This has been corrected. * ic/fix-filter-branch-to-handle-tag-without-tagger: filter-branch: use hash-object instead of mktag filter-branch: stash away ref map in a branch filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_* filter-branch: reset $GIT_* before cleaning up 28 September 2017, 05:47:52 UTC
a515136 Junio C Hamano 28 September 2017, 05:47:52 UTC Merge branch 'jk/describe-omit-some-refs' "git describe --match" learned to take multiple patterns in v2.13 series, but the feature ignored the patterns after the first one and did not work at all. This has been fixed. * jk/describe-omit-some-refs: describe: fix matching to actually match all patterns 28 September 2017, 05:47:52 UTC
2d94dd2 Stefan Beller 26 September 2017, 18:27:56 UTC submodule: correct error message for missing commits When a submodule diff should be displayed we currently just add the submodule objects to the main object store and then e.g. walk the revision graph and create a summary for that submodule. It is possible that we are missing the submodule either completely or partially, which we currently differentiate with different error messages depending on whether (1) the whole submodule object store is missing or (2) just the needed for this particular diff. (1) is reported as "not initialized", and (2) is reported as "commits not present". If a submodule is deinit'ed its repository data is still around inside the superproject, such that the diff can still be produced. In that way the error message (1) is misleading as we can have a diff despite the submodule being not initialized. Downgrade the error message (1) to be the same as (2) and just say the commits are not present, as that is the true reason why the diff cannot be shown. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 September 2017, 05:15:20 UTC
58aaced Stefan Beller 27 September 2017, 22:51:26 UTC diff: correct newline in summary for renamed files In 146fdb0dfe (diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARY, 2017-06-29), the conversion from direct printing to the symbol emission dropped the new line character for renamed, copied and rewritten files. Add the emission of a newline, add a test for this case. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 28 September 2017, 04:15:59 UTC
27344d6 Jeff King 27 September 2017, 06:54:30 UTC git: add --no-optional-locks option Some tools like IDEs or fancy editors may periodically run commands like "git status" in the background to keep track of the state of the repository. Some of these commands may refresh the index and write out the result in an opportunistic way: if they can get the index lock, then they update the on-disk index with any updates they find. And if not, then their in-core refresh is lost and just has to be recomputed by the next caller. But taking the index lock may conflict with other operations in the repository. Especially ones that the user is doing themselves, which _aren't_ opportunistic. In other words, "git status" knows how to back off when somebody else is holding the lock, but other commands don't know that status would be happy to drop the lock if somebody else wanted it. There are a couple possible solutions: 1. Have some kind of "pseudo-lock" that allows other commands to tell status that they want the lock. This is likely to be complicated and error-prone to implement (and maybe even impossible with just dotlocks to work from, as it requires some inter-process communication). 2. Avoid background runs of commands like "git status" that want to do opportunistic updates, preferring instead plumbing like diff-files, etc. This is awkward for a couple of reasons. One is that "status --porcelain" reports a lot more about the repository state than is available from individual plumbing commands. And two is that we actually _do_ want to see the refreshed index. We just don't want to take a lock or write out the result. Whereas commands like diff-files expect us to refresh the index separately and write it to disk so that they can depend on the result. But that write is exactly what we're trying to avoid. 3. Ask "status" not to lock or write the index. This is easy to implement. The big downside is that any work done in refreshing the index for such a call is lost when the process exits. So a background process may end up re-hashing a changed file multiple times until the user runs a command that does an index refresh themselves. This patch implements the option 3. The idea (and the test) is largely stolen from a Git for Windows patch by Johannes Schindelin, 67e5ce7f63 (status: offer *not* to lock the index and update it, 2016-08-12). The twist here is that instead of making this an option to "git status", it becomes a "git" option and matching environment variable. The reason there is two-fold: 1. An environment variable is carried through to sub-processes. And whether an invocation is a background process or not should apply to the whole process tree. So you could do "git --no-optional-locks foo", and if "foo" is a script or alias that calls "status", you'll still get the effect. 2. There may be other programs that want the same treatment. I've punted here on finding more callers to convert, since "status" is the obvious one to call as a repeated background job. But "git diff"'s opportunistic refresh of the index may be a good candidate. The test is taken from 67e5ce7f63, and it's worth repeating Johannes's explanation: Note that the regression test added in this commit does not *really* verify that no index.lock file was written; that test is not possible in a portable way. Instead, we verify that .git/index is rewritten *only* when `git status` is run without `--no-optional-locks`. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 07:11:01 UTC
0bca165 Jeff King 27 September 2017, 06:17:36 UTC validate_headref: use get_oid_hex for detached HEADs If a candidate HEAD isn't a symref, we check that it contains a viable sha1. But in a post-sha1 world, we should be checking whether it has any plausible object-id. We can do that by switching to get_oid_hex(). Note that both before and after this patch, we only check for a plausible object id at the start of the file, and then call that good enough. We ignore any content _after_ the hex, so a string like: 0123456789012345678901234567890123456789 foo is accepted. Though we do put extra bytes like this into some pseudorefs (e.g., FETCH_HEAD), we don't typically do so with HEAD. We could tighten this up by using parse_oid_hex(), like: if (!parse_oid_hex(buffer, &oid, &end) && *end++ == '\n' && *end == '\0') return 0; But we're probably better to remain on the loose side. We're just checking here for a plausible-looking repository directory, so heuristics are acceptable (if we really want to be meticulous, we should use the actual ref code to parse HEAD). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 07:07:22 UTC
7eb4b9d Jeff King 27 September 2017, 06:17:26 UTC validate_headref: use skip_prefix for symref parsing Since the previous commit guarantees that our symref buffer is NUL-terminated, we can just use skip_prefix() and friends to parse it. This is shorter and saves us having to deal with magic numbers and keeping the "len" counter up to date. While we're at it, let's name the rather obscure "buf" to "refname", since that is the thing we are parsing with it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 07:06:31 UTC
6e68c91 Jeff King 27 September 2017, 06:17:23 UTC validate_headref: NUL-terminate HEAD buffer When we are checking to see if we have a git repo, we peek into the HEAD file and see if it's a plausible symlink, symref, or detached HEAD. For the latter two, we read the contents with read_in_full(), which means they aren't NUL-terminated. The symref check is careful to respect the length we got, but the sha1 check will happily parse up to 40 bytes, even if we read fewer. E.g.,: echo 1234 >.git/HEAD git rev-parse will parse 36 uninitialized bytes from our stack buffer. This isn't a big deal in practice. Our buffer is 256 bytes, so we know we'll never read outside of it. The worst case is that the uninitialized bytes look like valid hex, and we claim a bogus HEAD file is valid. The chances of this happening randomly are quite slim, but let's be careful. One option would be to check that "len == 41" before feeding the buffer to get_sha1_hex(). But we'd like to eventually prepare for a world with variable-length hashes. Let's NUL-terminate as soon as we've read the buffer (we already even leave a spare byte to do so!). That fixes this problem without depending on the size of an object id. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 07:01:24 UTC
8a1a8d2 Jeff King 27 September 2017, 06:02:27 UTC worktree: check the result of read_in_full() We try to read "len" bytes into a buffer and just assume that it happened correctly. In practice this should usually be the case, since we just stat'd the file to get the length. But we could be fooled by transient errors or by other processes racily truncating the file. Let's be more careful. There's a slim chance this could catch a real error, but it also prevents people and tools from getting worried while reading the code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 06:46:05 UTC
228740b Jeff King 27 September 2017, 06:02:21 UTC worktree: use xsize_t to access file size To read the "gitdir" file into memory, we stat the file and allocate a buffer. But we store the size in an "int", which may be truncated. We should use a size_t and xsize_t(), which will detect truncation. An overflow is unlikely for a "gitdir" file, but it's a good practice to model. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 06:45:57 UTC
41dcc4d Jeff King 27 September 2017, 06:02:11 UTC distinguish error versus short read from read_in_full() Many callers of read_in_full() expect to see the exact number of bytes requested, but their error handling lumps together true read errors and short reads due to unexpected EOF. We can give more specific error messages by separating these cases (showing errno when appropriate, and otherwise describing the short read). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 06:45:24 UTC
90dca67 Jeff King 27 September 2017, 06:01:07 UTC avoid looking at errno for short read_in_full() returns When a caller tries to read a particular set of bytes via read_in_full(), there are three possible outcomes: 1. An error, in which case -1 is returned and errno is set. 2. A short read, in which fewer bytes are returned and errno is unspecified (we never saw a read error, so we may have some random value from whatever syscall failed last). 3. The full read completed successfully. Many callers handle cases 1 and 2 together by just checking the result against the requested size. If their combined error path looks at errno (e.g., by calling die_errno), they may report a nonsense value. Let's fix these sites by having them distinguish between the two error cases. That avoids the random errno confusion, and lets us give more detailed error messages. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 06:45:24 UTC
61d3633 Jeff King 27 September 2017, 06:00:28 UTC prefer "!=" when checking read_in_full() result Comparing the result of read_in_full() using less-than is potentially dangerous, as a negative return value may be converted to an unsigned type and be considered a success. This is discussed further in 561598cfcf (read_pack_header: handle signed/unsigned comparison in read result, 2017-09-13). Each of these instances is actually fine in practice: - in get-tar-commit-id, the HEADERSIZE macro expands to a signed integer. If it were switched to an unsigned type (e.g., a size_t), then it would be a bug. - the other two callers check for a short read only after handling a negative return separately. This is a fine practice, but we'd prefer to model "!=" as a general rule. So all of these cases can be considered cleanups and not actual bugfixes. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 06:45:24 UTC
83a17fa Stefan Beller 26 September 2017, 19:54:13 UTC t7406: submodule.<name>.update command must not be run from .gitmodules submodule.<name>.update can be assigned an arbitrary command via setting it to "!command". When this command is found in the regular config, Git ought to just run that command instead of other update mechanisms. However if that command is just found in the .gitmodules file, it is potentially untrusted, which is why we do not run it. Add a test confirming the behavior. Suggested-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 03:22:01 UTC
4f665f2 Han-Wen Nienhuys 26 September 2017, 11:21:50 UTC string-list.h: move documentation from Documentation/api/ into header This mirrors commit 'bdfdaa497 ("strbuf.h: integrate api-strbuf.txt documentation, 2015-01-16") which did the same for strbuf.h: * API documentation uses /** */ to set it apart from other comments. * Function names were stripped from the comments. * Ordering of the header was adjusted to follow the one from the text file. * Edited some existing comments from string-list.h for consistency. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 00:14:34 UTC
ea1d875 Han-Wen Nienhuys 26 September 2017, 11:21:49 UTC read_gitfile_gently: clarify return value ownership. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 00:14:02 UTC
d83d846 Han-Wen Nienhuys 26 September 2017, 11:21:48 UTC real_path: clarify return value ownership Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 27 September 2017, 00:13:47 UTC
7451fcd Junio C Hamano 26 September 2017, 05:15:55 UTC Sync with 2.14.2 * maint: Git 2.14.2 Git 2.13.6 Git 2.12.5 Git 2.11.4 Git 2.10.5 cvsimport: shell-quote variable used in backticks archimport: use safe_pipe_capture for user input shell: drop git-cvsserver support by default cvsserver: use safe_pipe_capture for `constant commands` as well cvsserver: use safe_pipe_capture instead of backticks cvsserver: move safe_pipe_capture() to the main package 26 September 2017, 05:15:55 UTC
3ce0854 Han-Wen Nienhuys 25 September 2017, 15:59:26 UTC submodule.c: describe submodule_to_gitdir() in a new comment Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 September 2017, 05:08:23 UTC
a1f3515 Jeff King 25 September 2017, 20:27:57 UTC notes-merge: drop dead zero-write code We call write_in_full() with a size that we know is greater than zero. The return value can never be zero, then, since write_in_full() converts such a failed write() into ENOSPC and returns -1. We can just drop this branch of the error handling entirely. Suggested-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 September 2017, 03:55:59 UTC
88780c3 Jeff King 25 September 2017, 20:27:17 UTC files-backend: prefer "0" for write_in_full() error check Commit 06f46f237a (avoid "write_in_full(fd, buf, len) != len" pattern, 2017-09-13) converted this callsite from: write_in_full(...) != 1 to write_in_full(...) < 0 But during the conflict resolution in c50424a6f0 (Merge branch 'jk/write-in-full-fix', 2017-09-25), this morphed into write_in_full(...) < 1 This behaves as we want, but we prefer to avoid modeling the "less than length" error-check which can be subtly buggy, as shown in efacf609c8 (config: avoid "write_in_full(fd, buf, len) < len" pattern, 2017-09-13). Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 September 2017, 03:54:43 UTC
db2f7c4 Johannes Schindelin 25 September 2017, 16:06:24 UTC Win32: simplify loading of DLL functions Dynamic loading of DLL functions is duplicated in several places in Git for Windows' source code. This patch adds a pair of macros to simplify the process: the DECLARE_PROC_ADDR(<dll>, <return-type>, <function-name>, ...<function-parameter-types>...) macro to be used at the beginning of a code block, and the INIT_PROC_ADDR(<function-name>) macro to call before using the declared function. The return value of the INIT_PROC_ADDR() call has to be checked; If it is NULL, the function was not found in the specified DLL. Example: DECLARE_PROC_ADDR(kernel32.dll, BOOL, CreateHardLinkW, LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES); if (!INIT_PROC_ADDR(CreateHardLinkW)) return error("Could not find CreateHardLinkW() function"; if (!CreateHardLinkW(source, target, NULL)) return error("could not create hardlink from %S to %S", source, target); return 0; Signed-off-by: Karsten Blees <blees@dcon.de> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 September 2017, 02:02:49 UTC
cff28ca Michael Haggerty 25 September 2017, 08:00:18 UTC packed-backend.c: rename a bunch of things and update comments We've made huge changes to this file, and some of the old names and comments are no longer very fitting. So rename a bunch of things: * `struct packed_ref_cache` → `struct snapshot` * `acquire_packed_ref_cache()` → `acquire_snapshot()` * `release_packed_ref_buffer()` → `clear_snapshot_buffer()` * `release_packed_ref_cache()` → `release_snapshot()` * `clear_packed_ref_cache()` → `clear_snapshot()` * `struct packed_ref_entry` → `struct snapshot_record` * `cmp_packed_ref_entries()` → `cmp_packed_ref_records()` * `cmp_entry_to_refname()` → `cmp_record_to_refname()` * `sort_packed_refs()` → `sort_snapshot()` * `read_packed_refs()` → `create_snapshot()` * `validate_packed_ref_cache()` → `validate_snapshot()` * `get_packed_ref_cache()` → `get_snapshot()` * Renamed local variables and struct members accordingly. Also update a bunch of comments to reflect the renaming and the accumulated changes that the code has undergone. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:46 UTC
523ee2d Michael Haggerty 25 September 2017, 08:00:17 UTC mmapped_ref_iterator: inline into `packed_ref_iterator` Since `packed_ref_iterator` is now delegating to `mmapped_ref_iterator` rather than `cache_ref_iterator` to do the heavy lifting, there is no need to keep the two iterators separate. So "inline" `mmapped_ref_iterator` into `packed_ref_iterator`. This removes a bunch of boilerplate. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:46 UTC
a6e19bc Michael Haggerty 25 September 2017, 08:00:16 UTC ref_cache: remove support for storing peeled values Now that the `packed-refs` backend doesn't use `ref_cache`, there is nobody left who might want to store peeled values of references in `ref_cache`. So remove that feature. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:46 UTC
9dd389f Michael Haggerty 25 September 2017, 08:00:15 UTC packed_ref_store: get rid of the `ref_cache` entirely Now that everything has been changed to read what it needs directly out of the `packed-refs` file, `packed_ref_store` doesn't need to maintain a `ref_cache` at all. So get rid of it. First of all, this will save a lot of memory and lots of little allocations. Instead of needing to store complicated parsed data structures in memory, we just mmap the file (potentially sharing memory with other processes) and parse only what we need. Moreover, since the mmapped access to the file reads only the parts of the file that it needs, this might save reading all of the data from disk at all (at least if the file starts out sorted). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:46 UTC
ba1c052 Michael Haggerty 25 September 2017, 08:00:14 UTC ref_store: implement `refs_peel_ref()` generically We're about to stop storing packed refs in a `ref_cache`. That means that the only way we have left to optimize `peel_ref()` is by checking whether the reference being peeled is the one currently being iterated over (in `current_ref_iter`), and if so, using `ref_iterator_peel()`. But this can be done generically; it doesn't have to be implemented per-backend. So implement `refs_peel_ref()` in `refs.c` and remove the `peel_ref()` method from the refs API. This removes the last callers of a couple of functions, so delete them. More cleanup to come... Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:46 UTC
f3987ab Michael Haggerty 25 September 2017, 08:00:13 UTC packed_read_raw_ref(): read the reference from the mmapped buffer Instead of reading the reference from the `ref_cache`, read it directly from the mmapped buffer. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:45 UTC
d1cf155 Michael Haggerty 25 September 2017, 08:00:12 UTC packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator` Now that we have an efficient way to iterate, in order, over the mmapped contents of the `packed-refs` file, we can use that directly to implement reference iteration for the `packed_ref_store`, rather than iterating over the `ref_cache`. This is the next step towards getting rid of the `ref_cache` entirely. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:45 UTC
02b920f Michael Haggerty 25 September 2017, 08:00:11 UTC read_packed_refs(): ensure that references are ordered when read It doesn't actually matter now, because the references are only iterated over to fill the associated `ref_cache`, which itself puts them in the correct order. But we want to get rid of the `ref_cache`, so we want to be able to iterate directly over the `packed-refs` buffer, and then the iteration will need to be ordered correctly. In fact, we already write the `packed-refs` file sorted, but it is possible that other Git clients don't get it right. So let's not assume that a `packed-refs` file is sorted unless it is explicitly declared to be so via a `sorted` trait in its header line. If it is *not* declared to be sorted, then scan quickly through the file to check. If it is found to be out of order, then sort the records into a new memory-only copy. This checking and sorting is done quickly, without parsing the full file contents. However, it needs a little bit of care to avoid reading past the end of the buffer even if the `packed-refs` file is corrupt. Since *we* always write the file correctly sorted, include that trait when we write or rewrite a `packed-refs` file. This means that the scan described in the previous paragraph should only have to be done for `packed-refs` files that were written by older versions of the Git command-line client, or by other clients that haven't yet learned to write the `sorted` trait. If `packed-refs` was already sorted, then (if the system allows it) we can use the mmapped file contents directly. But if the system doesn't allow a file that is currently mmapped to be replaced using `rename()`, then it would be bad for us to keep the file mmapped for any longer than necessary. So, on such systems, always make a copy of the file contents, either as part of the sorting process, or afterwards. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:45 UTC
5b63361 Michael Haggerty 25 September 2017, 08:00:10 UTC packed_ref_cache: keep the `packed-refs` file mmapped if possible Keep a copy of the `packed-refs` file contents in memory for as long as a `packed_ref_cache` object is in use: * If the system allows it, keep the `packed-refs` file mmapped. * If not (either because the system doesn't support `mmap()` at all, or because a file that is currently mmapped cannot be replaced via `rename()`), then make a copy of the file's contents in heap-allocated space, and keep that around instead. We base the choice of behavior on a new build-time switch, `MMAP_PREVENTS_DELETE`. By default, this switch is set for Windows variants. After this commit, `MMAP_NONE` and `MMAP_TEMPORARY` are still handled identically. But the next commit will introduce a difference. This whole change is still pointless, because we only read the `packed-refs` file contents immediately after instantiating the `packed_ref_cache`. But that will soon change. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:45 UTC
14b3c34 Michael Haggerty 25 September 2017, 08:00:09 UTC packed-backend.c: reorder some definitions No code has been changed. This will make subsequent patches more self-contained. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:45 UTC
81b9b5a Michael Haggerty 25 September 2017, 08:00:08 UTC mmapped_ref_iterator_advance(): no peeled value for broken refs If a reference is broken, suppress its peeled value. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:45 UTC
9cfb3dc Michael Haggerty 25 September 2017, 08:00:07 UTC mmapped_ref_iterator: add iterator over a packed-refs file Add a new `mmapped_ref_iterator`, which can iterate over the references in an mmapped `packed-refs` file directly. Use this iterator from `read_packed_refs()` to fill the packed refs cache. Note that we are not yet willing to promise that the new iterator generates its output in order. That doesn't matter for now, because the packed refs cache doesn't care what order it is filled. This change adds a lot of boilerplate without providing any obvious benefits. The benefits will come soon, when we get rid of the `ref_cache` for packed references altogether. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:45 UTC
daa4540 Michael Haggerty 25 September 2017, 08:00:06 UTC packed_ref_cache: remember the file-wide peeling state Rather than store the peeling state (i.e., the one defined by traits in the `packed-refs` file header line) in a local variable in `read_packed_refs()`, store it permanently in `packed_ref_cache`. This will be needed when we stop reading all packed refs at once. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:45 UTC
6a9bc40 Michael Haggerty 25 September 2017, 08:00:05 UTC read_packed_refs(): read references with minimal copying Instead of copying data from the `packed-refs` file one line at time and then processing it, process the data in place as much as possible. Also, instead of processing one line per iteration of the main loop, process a reference line plus its corresponding peeled line (if present) together. Note that this change slightly tightens up the parsing of the `packed-refs` file. Previously, the parser would have accepted multiple "peeled" lines for a single reference (ignoring all but the last one). Now it would reject that. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 09:02:45 UTC
93dbefb Manav Rathi 25 September 2017, 08:09:00 UTC docs: improve discoverability of exclude pathspec The ability to exclude paths with a negative pathspec is not mentioned in the man pages for git grep and other commands where it might be useful. Add an example and a pointer to the pathspec glossary entry in the man page for git grep to help the user to discover this ability. Add similar pointers from the git-add and git-status man pages. Additionally, - Add a test for the behaviour when multiple exclusions are present. - Add a test for the ^ alias. - Improve name of existing test. - Improve grammar in glossary description of the exclude pathspec. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Manav Rathi <mnvrth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 08:54:36 UTC
c3342b3 Kaartic Sivaraam 23 September 2017, 04:56:17 UTC doc: camelCase the config variables to improve readability References to multi-word configuration variable names in our documentation must consistently use camelCase to highlight where the word boundaries are, even though these are treated case insensitively. Fix a few places that spell them in all lowercase, which makes them harder to read. Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 25 September 2017, 07:11:56 UTC
back to top