Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
sort by:
Revision Author Date Message Commit Date
6a2c2f8 Junio C Hamano 20 April 2017, 04:42:08 UTC Git 2.13-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 April 2017, 04:42:08 UTC
8377f34 Junio C Hamano 20 April 2017, 04:37:25 UTC Merge branch 'jh/memihash-opt' Hotfix for a topic that is already in 'master'. * jh/memihash-opt: p0004: make perf test executable t3008: skip lazy-init test on a single-core box test-online-cpus: helper to return cpu count name-hash: fix buffer overrun 20 April 2017, 04:37:25 UTC
5feb8b8 Junio C Hamano 20 April 2017, 04:37:25 UTC Merge branch 'vn/revision-shorthand-for-side-branch-log' Doc cleanup. * vn/revision-shorthand-for-side-branch-log: doc/revisions: remove brackets from rev^-n shorthand 20 April 2017, 04:37:25 UTC
c96e3ce Junio C Hamano 20 April 2017, 04:37:24 UTC Merge branch 'sf/putty-w-args' * sf/putty-w-args: connect.c: handle errors from split_cmdline 20 April 2017, 04:37:24 UTC
c2cbb30 Junio C Hamano 20 April 2017, 04:37:23 UTC Merge branch 'ld/p4-current-branch-fix' "git p4" used "name-rev HEAD" when it wants to learn what branch is checked out; it should use "symbolic-ref HEAD". * ld/p4-current-branch-fix: git-p4: don't use name-rev to get current branch git-p4: add read_pipe_text() internal function git-p4: add failing test for name-rev rather than symbolic-ref 20 April 2017, 04:37:23 UTC
442136f Junio C Hamano 20 April 2017, 04:37:22 UTC Merge branch 'dt/gc-ignore-old-gc-logs' * dt/gc-ignore-old-gc-logs: t6500: wait for detached auto gc at the end of the test script 20 April 2017, 04:37:22 UTC
2f9dfb8 Junio C Hamano 20 April 2017, 04:37:21 UTC Merge branch 'bw/attr-pathspec' * bw/attr-pathspec: pathspec: fix segfault in clear_pathspec 20 April 2017, 04:37:21 UTC
df3b119 Junio C Hamano 20 April 2017, 04:37:21 UTC Merge branch 'ab/grep-plug-pathspec-leak' Call clear_pathspec() to release resources immediately before the cmd_grep() function returns. * ab/grep-plug-pathspec-leak: grep: plug a trivial memory leak 20 April 2017, 04:37:21 UTC
eb3af74 Junio C Hamano 20 April 2017, 04:37:20 UTC Merge branch 'jk/no-looking-at-dotgit-outside-repo' Clean up fallouts from recent tightening of the set-up sequence, where Git barfs when repository information is accessed without first ensuring that it was started in a repository. * jk/no-looking-at-dotgit-outside-repo: test-read-cache: setup git dir has_sha1_file: don't bother if we are not in a repository 20 April 2017, 04:37:20 UTC
5ab8f22 Junio C Hamano 20 April 2017, 04:37:19 UTC Merge branch 'nd/files-backend-git-dir' The "submodule" specific field in the ref_store structure is replaced with a more generic "gitdir" that can later be used also when dealing with ref_store that represents the set of refs visible from the other worktrees. * nd/files-backend-git-dir: (28 commits) refs.h: add a note about sorting order of for_each_ref_* t1406: new tests for submodule ref store t1405: some basic tests on main ref store t/helper: add test-ref-store to test ref-store functions refs: delete pack_refs() in favor of refs_pack_refs() files-backend: avoid ref api targeting main ref store refs: new transaction related ref-store api refs: add new ref-store api refs: rename get_ref_store() to get_submodule_ref_store() and make it public files-backend: replace submodule_allowed check in files_downcast() refs: move submodule code out of files-backend.c path.c: move some code out of strbuf_git_path_submodule() refs.c: make get_main_ref_store() public and use it refs.c: kill register_ref_store(), add register_submodule_ref_store() refs.c: flatten get_ref_store() a bit refs: rename lookup_ref_store() to lookup_submodule_ref_store() refs.c: introduce get_main_ref_store() files-backend: remove the use of git_path() files-backend: add and use files_ref_path() files-backend: add and use files_reflog_path() ... 20 April 2017, 04:37:19 UTC
52d77af Junio C Hamano 20 April 2017, 04:37:18 UTC Merge branch 'bw/submodule-is-active' Error message fix. * bw/submodule-is-active: submodule--helper: fix typo in is_active error message 20 April 2017, 04:37:18 UTC
34130cc Junio C Hamano 20 April 2017, 04:37:17 UTC Merge branch 'va/i18n-perl-scripts' Message fix. * va/i18n-perl-scripts: git-add--interactive.perl: add missing dot in a message 20 April 2017, 04:37:17 UTC
a06380b Junio C Hamano 20 April 2017, 04:37:17 UTC Merge branch 'sb/submodule-rm-absorb' Error message fix. * sb/submodule-rm-absorb: submodule.c: add missing ' in error messages 20 April 2017, 04:37:17 UTC
7203baf Junio C Hamano 20 April 2017, 04:37:16 UTC Merge branch 'ah/diff-files-ours-theirs-doc' The diff options "--ours", "--theirs" exist for quite some time. But so far they were not documented. Now they are. * ah/diff-files-ours-theirs-doc: diff-files: document --ours etc. 20 April 2017, 04:37:16 UTC
74a74be Junio C Hamano 20 April 2017, 04:37:15 UTC Merge branch 'lt/mailinfo-in-body-header-continuation' If a patch e-mail had its first paragraph after an in-body header indented (even after a blank line after the in-body header line), the indented line was mistook as a continuation of the in-body header. This has been fixed. * lt/mailinfo-in-body-header-continuation: mailinfo: fix in-body header continuations 20 April 2017, 04:37:15 UTC
872e2cf Junio C Hamano 20 April 2017, 04:37:14 UTC Merge branch 'bw/push-options-recursively-to-submodules' "git push --recurse-submodules --push-option=<string>" learned to propagate the push option recursively down to pushes in submodules. * bw/push-options-recursively-to-submodules: push: propagate remote and refspec with --recurse-submodules submodule--helper: add push-check subcommand remote: expose parse_push_refspec function push: propagate push-options with --recurse-submodules push: unmark a local variable as static 20 April 2017, 04:37:14 UTC
b1081e4 Junio C Hamano 20 April 2017, 04:37:13 UTC Merge branch 'bc/object-id' Conversion from unsigned char [40] to struct object_id continues. * bc/object-id: Documentation: update and rename api-sha1-array.txt Rename sha1_array to oid_array Convert sha1_array_for_each_unique and for_each_abbrev to object_id Convert sha1_array_lookup to take struct object_id Convert remaining callers of sha1_array_lookup to object_id Make sha1_array_append take a struct object_id * sha1-array: convert internal storage for struct sha1_array to object_id builtin/pull: convert to struct object_id submodule: convert check_for_new_submodule_commits to object_id sha1_name: convert disambiguate_hint_fn to take object_id sha1_name: convert struct disambiguate_state to object_id test-sha1-array: convert most code to struct object_id parse-options-cb: convert sha1_array_append caller to struct object_id fsck: convert init_skiplist to struct object_id builtin/receive-pack: convert portions to struct object_id builtin/pull: convert portions to struct object_id builtin/diff: convert to struct object_id Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ Define new hash-size constants for allocating memory 20 April 2017, 04:37:13 UTC
c703555 Junio C Hamano 20 April 2017, 04:37:12 UTC Merge branch 'sb/submodule-short-status' The output from "git status --short" has been extended to show various kinds of dirtyness in submodules differently; instead of to "M" for modified, 'm' and '?' can be shown to signal changes only to the working tree of the submodule but not the commit that is checked out. * sb/submodule-short-status: submodule.c: correctly handle nested submodules in is_submodule_modified short status: improve reporting for submodule changes submodule.c: stricter checking for submodules in is_submodule_modified submodule.c: port is_submodule_modified to use porcelain 2 submodule.c: convert is_submodule_modified to use strbuf_getwholeline submodule.c: factor out early loop termination in is_submodule_modified submodule.c: use argv_array in is_submodule_modified 20 April 2017, 04:37:12 UTC
c9d4999 Christian Couder 18 April 2017, 14:24:07 UTC p0004: make perf test executable It looks like in 89c3b0ad43 (name-hash: add perf test for lazy_init_name_hash, 2017-03-23) p0004 was not created with the execute unix rights. Let's fix that. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 April 2017, 02:18:18 UTC
733e064 Kyle Meyer 16 April 2017, 04:07:57 UTC doc/revisions: remove brackets from rev^-n shorthand Given that other instances of "{...}" in the revision documentation represent literal characters of revision specifications, describing the rev^-n shorthand as "<rev>^-{<n>}" incorrectly suggests that something like "master^-{1}" is an acceptable form. Signed-off-by: Kyle Meyer <kyle@kyleam.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 06:42:43 UTC
584f897 Junio C Hamano 17 April 2017, 06:30:49 UTC Twelfth batch for 2.13 Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 06:30:49 UTC
7b612c9 Junio C Hamano 17 April 2017, 06:29:34 UTC Merge branch 'js/difftool-builtin' Code cleanup. * js/difftool-builtin: difftool: fix use-after-free difftool: avoid strcpy 17 April 2017, 06:29:34 UTC
c8a8951 Junio C Hamano 17 April 2017, 06:29:34 UTC Merge branch 'sb/unpack-trees-would-lose-submodule-message-update' Update an error message. * sb/unpack-trees-would-lose-submodule-message-update: unpack-trees.c: align submodule error message to the other error messages 17 April 2017, 06:29:34 UTC
3817d63 Junio C Hamano 17 April 2017, 06:29:33 UTC Merge branch 'ab/regen-perl-mak-with-different-perl' Update the build dependency so that an update to /usr/bin/perl etc. result in recomputation of perl.mak file. * ab/regen-perl-mak-with-different-perl: perl: regenerate perl.mak if perl -V changes 17 April 2017, 06:29:33 UTC
1776a71 Junio C Hamano 17 April 2017, 06:29:32 UTC Merge branch 'sb/show-diff-for-submodule-in-diff-fix' "git diff --submodule=diff" learned to work better in a project with a submodule that in turn has its own submodules. * sb/show-diff-for-submodule-in-diff-fix: diff: submodule inline diff to initialize env array. 17 April 2017, 06:29:32 UTC
263fd04 Junio C Hamano 17 April 2017, 06:29:31 UTC Merge branch 'qp/bisect-docfix' Doc update. * qp/bisect-docfix: git-bisect.txt: add missing word 17 April 2017, 06:29:31 UTC
97d9e97 Junio C Hamano 17 April 2017, 06:29:30 UTC Merge branch 'mm/ls-files-s-doc' Doc update. * mm/ls-files-s-doc: Documentation: document elements in "ls-files -s" output in order 17 April 2017, 06:29:30 UTC
dfe46c5 Junio C Hamano 17 April 2017, 06:29:30 UTC Merge branch 'jk/loose-object-info-report-error' Update error handling for codepath that deals with corrupt loose objects. * jk/loose-object-info-report-error: index-pack: detect local corruption in collision check sha1_loose_object_info: return error for corrupted objects 17 April 2017, 06:29:30 UTC
3c833ca Junio C Hamano 17 April 2017, 06:29:28 UTC Merge branch 'jc/bs-t-is-not-a-tab-for-sed' Code cleanup. * jc/bs-t-is-not-a-tab-for-sed: contrib/git-resurrect.sh: do not write \t for HT in sed scripts 17 April 2017, 06:29:29 UTC
93a96cc Junio C Hamano 17 April 2017, 06:29:27 UTC Merge branch 'jc/unused-symbols' Code cleanup. * jc/unused-symbols: remote.[ch]: parse_push_cas_option() can be static 17 April 2017, 06:29:27 UTC
cb054eb Junio C Hamano 17 April 2017, 06:29:26 UTC Merge branch 'jk/snprintf-cleanups' Code clean-up. * jk/snprintf-cleanups: daemon: use an argv_array to exec children gc: replace local buffer with git_path transport-helper: replace checked snprintf with xsnprintf convert unchecked snprintf into xsnprintf combine-diff: replace malloc/snprintf with xstrfmt replace unchecked snprintf calls with heap buffers receive-pack: print --pack-header directly into argv array name-rev: replace static buffer with strbuf create_branch: use xstrfmt for reflog message create_branch: move msg setup closer to point of use avoid using mksnpath for refs avoid using fixed PATH_MAX buffers for refs fetch: use heap buffer to format reflog tag: use strbuf to format tag header diff: avoid fixed-size buffer for patch-ids odb_mkstemp: use git_path_buf odb_mkstemp: write filename into strbuf do not check odb_mkstemp return value for errors 17 April 2017, 06:29:26 UTC
eff4511 Luke Diamand 15 April 2017, 10:36:09 UTC git-p4: don't use name-rev to get current branch git-p4 was using "git name-rev" to find out the current branch. That is not safe, since if multiple branches or tags point at the same revision, the result obtained might not be what is expected. Instead use "git symbolic-ref". Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 04:13:26 UTC
78871bf Luke Diamand 15 April 2017, 10:36:08 UTC git-p4: add read_pipe_text() internal function The existing read_pipe() function returns an empty string on error, but also returns an empty string if the command returns an empty string. This leads to ugly constructions trying to detect error cases. Add read_pipe_text() which just returns None on error. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 04:13:24 UTC
3d553cc Luke Diamand 15 April 2017, 10:36:07 UTC git-p4: add failing test for name-rev rather than symbolic-ref Using name-rev to find the current git branch means that git-p4 does not correctly get the current branch name if there are multiple branches pointing at HEAD, or a tag. This change adds a test case which demonstrates the problem. Configuring which branches are allowed to be submitted from goes wrong, as git-p4 gets confused about which branch is in use. This appears to be the only place that git-p4 actually cares about the current branch. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 04:13:23 UTC
bccb22c René Scharfe 06 April 2017, 20:41:41 UTC test-read-cache: setup git dir b1ef400e (setup_git_env: avoid blind fall-back to ".git") made programs that tried to access a repository without initializing properly die with a diagnostic message. One offender is test-read-cache, which is used in p0002. Fix it by calling setup_git_directory() before accessing the index. Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 03:05:11 UTC
ef09036 SZEDER Gábor 13 April 2017, 10:31:38 UTC t6500: wait for detached auto gc at the end of the test script The last test in 't6500-gc', 'background auto gc does not run if gc.log is present and recent but does if it is old', added in a831c06a2 (gc: ignore old gc.log files, 2017-02-10), may sporadically trigger an error message from the test harness: rm: cannot remove 'trash directory.t6500-gc/.git/objects': Directory not empty The test in question ends with executing an auto gc in the backround, which occasionally takes so long that it's still running when 'test_done' is about to remove the trash directory. This 'rm -rf $trash' in the foreground might race with the detached auto gc to create and delete files and directories, and gc might (re-)create a path that 'rm' already visited and removed, triggering the above error message when 'rm' attempts to remove its parent directory. Commit bb05510e5 (t5510: run auto-gc in the foreground, 2016-05-01) fixed the same problem in a different test script by simply disallowing background gc. Unfortunately, what worked there is not applicable here, because the purpose of this test is to check the behavior of a detached auto gc. Make sure that the test doesn't continue before the gc is finished in the background with a clever bit of shell trickery: - Open fd 9 in the shell, to be inherited by the background gc process, because our daemonize() only closes the standard fds 0, 1 and 2. - Duplicate this fd 9 to stdout. - Read 'git gc's stdout, and thus fd 9, through a command substitution. We don't actually care about gc's output, but this construct has two useful properties: - This read blocks until stdout or fd 9 are open. While stdout is closed after the main gc process creates the background process and exits, fd 9 remains open until the backround process exits. - The variable assignment from the command substitution gets its exit status from the command executed within the command substitution, i.e. a failing main gc process will cause the test to fail. Note, that this fd trickery doesn't work on Windows, because due to MSYS limitations the git process only inherits the standard fds 0, 1 and 2 from the shell. Luckily, it doesn't matter in this case, because on Windows daemonize() is basically a noop, thus 'git gc --auto' always runs in the foreground. And since we can now continue the test reliably after the detached gc finished, check that there is only a single packfile left at the end, i.e. that the detached gc actually did what it was supposed to do. Also add a comment at the end of the test script to warn developers of future tests about this issue of long running detached gc processes. Helped-by: Jeff King <peff@peff.net> Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 01:06:50 UTC
5ce10c0 Brandon Williams 07 April 2017, 19:29:19 UTC pathspec: fix segfault in clear_pathspec In 'clear_pathspec()' the incorrect index parameter is used to bound an inner-loop which is used to free a 'struct attr_match' value field. Using the incorrect index parameter (in addition to being incorrect) occasionally causes segmentation faults when attempting to free an invalid pointer. Fix this by using the correct index parameter 'i'. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 01:04:06 UTC
7861fa0 Ævar Arnfjörð Bjarmason 09 April 2017, 19:59:00 UTC grep: plug a trivial memory leak Change the cleanup phase for the grep command to free the pathspec struct that's allocated earlier in the same block, and used just a few lines earlier. With "grep hi README.md" valgrind reports a loss of 239 bytes now, down from 351. The relevant --num-callers=40 --leak-check=full --show-leak-kinds=all backtrace is: [...] 187 (112 direct, 75 indirect) bytes in 1 blocks are definitely lost in loss record 70 of 110 [...] at 0x4C2BBAF: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) [...] by 0x60B339: do_xmalloc (wrapper.c:59) [...] by 0x60B2F6: xmalloc (wrapper.c:86) [...] by 0x576B37: parse_pathspec (pathspec.c:652) [...] by 0x4519F0: cmd_grep (grep.c:1215) [...] by 0x4062EF: run_builtin (git.c:371) [...] by 0x40544D: handle_builtin (git.c:572) [...] by 0x4060A2: run_argv (git.c:624) [...] by 0x4051C6: cmd_main (git.c:701) [...] by 0x4C5901: main (common-main.c:43) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 00:56:47 UTC
22e5ae5 Jeff King 11 April 2017, 00:30:23 UTC connect.c: handle errors from split_cmdline Commit e9d9a8a4d (connect: handle putty/plink also in GIT_SSH_COMMAND, 2017-01-02) added a call to split_cmdline(), but checks only for a non-zero return to see if we got any output. Since the function returns negative values (and a NULL argv) on error, we end up dereferencing NULL and segfaulting. Arguably we could report on the parsing error here, but it's probably not worth it. This is a best-effort attempt to see if we are using plink. So we can simply return here with "no, it wasn't plink" and let the shell actually complain about the bogus quoting. Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 April 2017, 00:48:00 UTC
adac811 Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:41 UTC refs.h: add a note about sorting order of for_each_ref_* Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:25 UTC
2269e2a Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:40 UTC t1406: new tests for submodule ref store Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:25 UTC
16feb99 Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:39 UTC t1405: some basic tests on main ref store Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:25 UTC
80f2a60 Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:38 UTC t/helper: add test-ref-store to test ref-store functions Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:25 UTC
7c74478 Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:37 UTC refs: delete pack_refs() in favor of refs_pack_refs() It only has one caller, not worth keeping just for convenience. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:25 UTC
2f40e95 Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:36 UTC files-backend: avoid ref api targeting main ref store A small step towards making files-backend work as a non-main ref store using the newly added store-aware API. For the record, `join` and `nm` on refs.o and files-backend.o tell me that files-backend no longer uses functions that default to get_main_ref_store(). I'm not yet comfortable at the idea of removing files_assert_main_repository() (or converting REF_STORE_MAIN to REF_STORE_WRITE). More staring and testing is required before that can happen. Well, except peel_ref(). I'm pretty sure that function is safe. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:25 UTC
c0fe4e8 Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:35 UTC refs: new transaction related ref-store api The transaction struct now takes a ref store at creation and will operate on that ref store alone. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:25 UTC
7d2df05 Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:34 UTC refs: add new ref-store api This is not meant to cover all existing API. It adds enough to test ref stores with the new test program test-ref-store, coming soon and to be used by files-backend.c. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:25 UTC
18d0002 Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:33 UTC refs: rename get_ref_store() to get_submodule_ref_store() and make it public This function is intended to replace *_submodule() refs API. It provides a ref store for a specific submodule, which can be operated on by a new set of refs API. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:25 UTC
9e7ec63 Nguyễn Thái Ngọc Duy 26 March 2017, 02:42:32 UTC files-backend: replace submodule_allowed check in files_downcast() files-backend.c is unlearning submodules. Instead of having a specific check for submodules to see what operation is allowed, files backend now takes a set of flags at init. Each operation will check if the required flags is present before performing. For now we have four flags: read, write and odb access. Main ref store has all flags, obviously, while submodule stores are read-only and have access to odb (*). The "main" flag stays because many functions in the backend calls frontend ones without a ref store, so these functions always target the main ref store. Ideally the flag should be gone after ref-store-aware api is in place and used by backends. (*) Submodule code needs for_each_ref. Try take REF_STORE_ODB flag out. At least t3404 would fail. The "have access to odb" in submodule is a bit hacky since we don't know from he whether add_submodule_odb() has been called. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 10:53:18 UTC
3e8b7d3 Jonathan Nieder 11 April 2017, 22:47:13 UTC has_sha1_file: don't bother if we are not in a repository Most callers to this function already require that they are in a git repository, but there is an exception: "git apply" uses has_sha1_file to avoid work if the result of applying a binary patch is already present in the repository. When run outside any repository, this produces an error: fatal: BUG: setup_git_env called without repository Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 01:33:11 UTC
9af7ec3 Stefan Beller 13 April 2017, 22:08:54 UTC submodule--helper: fix typo in is_active error message Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 01:05:23 UTC
0301f1f Ralf Thielow 13 April 2017, 16:41:12 UTC git-add--interactive.perl: add missing dot in a message One message appears twice in the translations and the only difference is a dot at the end. So add this dot to make the messages being identical. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 01:01:15 UTC
35ad44c Ralf Thielow 13 April 2017, 16:40:45 UTC submodule.c: add missing ' in error messages Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 April 2017, 00:59:21 UTC
882add1 Johannes Schindelin 13 April 2017, 19:21:58 UTC difftool: fix use-after-free The left and right base directories were pointed to the buf field of two strbufs, which were subject to change. A contrived test case shows the problem where a file with a long enough name to force the strbuf to grow is up-to-date (hence the code path is used where the work tree's version of the file is reused), and then a file that is not up-to-date needs to be written (hence the code path is used where checkout_entry() uses the previously recorded base_dir that is invalid by now). Let's just copy the base_dir strings for use with checkout_entry(), never touch them until the end, and release them then. This is an easily verifiable fix (as opposed to the next-obvious alternative: to re-set base_dir after every loop iteration). This fixes https://github.com/git-for-windows/git/issues/1124 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> 14 April 2017, 00:53:08 UTC
47242cd Andreas Heiduk 11 April 2017, 14:39:50 UTC diff-files: document --ours etc. git-diff understands "--ours", "--theirs" and "--base" for files with conflicts. But so far they were not documented for the central diff command but only for diff-files. Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2017, 23:15:25 UTC
845eec2 Kevin Willford 03 April 2017, 15:16:42 UTC t3008: skip lazy-init test on a single-core box The lazy-init codepath will not be exercised uniless threaded. Skip the entire test on a single-core box. Also replace a hard-coded constant of 2000 (number of cache entries to manifacture for tests) with a variable with a human readable name. Signed-off-by: Kevin Willford <kewillf@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2017, 06:24:36 UTC
e3482cc Jeff Hostetler 03 April 2017, 15:16:41 UTC test-online-cpus: helper to return cpu count Created helper executable to print the value of online_cpus() allowing multi-threaded tests to be skipped when appropriate. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 April 2017, 06:17:19 UTC
fd1062e Linus Torvalds 01 April 2017, 19:14:39 UTC mailinfo: fix in-body header continuations An empty line should stop any pending in-body headers, and start the actual body parsing. This also modifies the original test for the in-body headers to actually have a real commit body that starts with spaces, and changes the test to check that the long line matches _exactly_, and doesn't get extra data from the body. Fixes:6b4b013f1884 ("mailinfo: handle in-body header continuations") Cc: Jonathan Tan <jonathantanmy@google.com> Cc: Jeff King <peff@peff.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 April 2017, 07:49:40 UTC
06bf4ad Brandon Williams 05 April 2017, 17:47:19 UTC push: propagate remote and refspec with --recurse-submodules Teach "push --recurse-submodules" to propagate, if given a name as remote, the provided remote and refspec recursively to the pushes performed in the submodules. The push will therefore only succeed if all submodules have a remote with such a name configured. Note that "push --recurse-submodules" with a path or URL as remote will not propagate the remote or refspec and instead use the default remote and refspec configured in the submodule, preserving the current behavior. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 April 2017, 07:45:26 UTC
93481a6 Brandon Williams 05 April 2017, 17:47:18 UTC submodule--helper: add push-check subcommand Add the 'push-check' subcommand to submodule--helper which is used to check if the provided remote and refspec can be used as part of a push operation in the submodule. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 April 2017, 07:45:25 UTC
c19ae47 Brandon Williams 05 April 2017, 17:47:17 UTC remote: expose parse_push_refspec function A future patch needs access to the 'parse_push_refspec()' function so let's export the function so other modules can use it. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 April 2017, 07:45:22 UTC
2a90556 Brandon Williams 05 April 2017, 17:47:16 UTC push: propagate push-options with --recurse-submodules Teach push --recurse-submodules to propagate push-options recursively to the pushes performed in the submodules. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 April 2017, 07:45:03 UTC
cf11a67 Junio C Hamano 11 April 2017, 07:27:05 UTC Eleventh batch for 2.13 Signed-off-by: Junio C Hamano <gitster@pobox.com> 11 April 2017, 07:27:05 UTC
71e38d4 Junio C Hamano 11 April 2017, 07:21:52 UTC Merge branch 'ls/travis-relays-for-windows-ci' Define a new task in .travis.yml that triggers a test session on Windows run elsewhere. * ls/travis-relays-for-windows-ci: travis-ci: build and test Git on Windows 11 April 2017, 07:21:52 UTC
77a24b7 Junio C Hamano 11 April 2017, 07:21:51 UTC Merge branch 'cc/untracked' Code cleanup. * cc/untracked: update-index: fix xgetcwd() related memory leak 11 April 2017, 07:21:51 UTC
d9758cf Junio C Hamano 11 April 2017, 07:21:51 UTC Merge branch 'ah/log-decorate-default-to-auto' The default behaviour of "git log" in an interactive session has been changed to enable "--decorate". * ah/log-decorate-default-to-auto: log: if --decorate is not given, default to --decorate=auto 11 April 2017, 07:21:51 UTC
d1d3d46 Junio C Hamano 11 April 2017, 07:21:50 UTC Merge branch 'ab/ref-filter-no-contains' "git tag/branch/for-each-ref" family of commands long allowed to filter the refs by "--contains X" (show only the refs that are descendants of X), "--merged X" (show only the refs that are ancestors of X), "--no-merged X" (show only the refs that are not ancestors of X). One curious omission, "--no-contains X" (show only the refs that are not descendants of X) has been added to them. * ab/ref-filter-no-contains: tag: add tests for --with and --without ref-filter: reflow recently changed branch/tag/for-each-ref docs ref-filter: add --no-contains option to tag/branch/for-each-ref tag: change --point-at to default to HEAD tag: implicitly supply --list given another list-like option tag: change misleading --list <pattern> documentation parse-options: add OPT_NONEG to the "contains" option tag: add more incompatibles mode tests for-each-ref: partly change <object> to <commit> in help tag tests: fix a typo in a test description tag: remove a TODO item from the test suite ref-filter: add test for --contains on a non-commit ref-filter: make combining --merged & --no-merged an error tag doc: reword --[no-]merged to talk about commits, not tips tag doc: split up the --[no-]merged documentation tag doc: move the description of --[no-]merged earlier 11 April 2017, 07:21:50 UTC
17b254c Stefan Beller 31 March 2017, 23:17:32 UTC diff: submodule inline diff to initialize env array. David reported: > When I try to run `git diff --submodule=diff` in a submodule which has > it's own submodules that have changes I get the error: fatal: bad > object. This happens, because we do not properly initialize the environment in which the diff is run in the submodule. That means we inherit the environment from the main process, which sets environment variables. (Apparently we do set environment variables which we do not set when not in a submodules, i.e. the .git directory is linked) This commit, just like fd47ae6a5b (diff: teach diff to display submodule difference with an inline diff, 2016-08-31) introduces bad test code (i.e. hard coded hash values), which will be cleanup up in a later patch. Reported-by: David Parrish <daveparrish@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 April 2017, 16:51:03 UTC
54cc8ac Brandon Williams 31 March 2017, 23:56:22 UTC push: unmark a local variable as static There isn't any obvious reason for the 'struct string_list push_options' and 'struct string_list_item *item' to be marked as static, so unmark them as being static. Also, clear the push_options string_list to prevent memory leaking. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02 April 2017, 16:49:24 UTC
60b091c Quentin Pradet 01 April 2017, 06:40:56 UTC git-bisect.txt: add missing word Signed-off-by: Quentin Pradet <quentin.pradet@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 April 2017, 18:35:45 UTC
be6ed14 Mostyn Bramley-Moore 01 April 2017, 07:08:25 UTC Documentation: document elements in "ls-files -s" output in order List the fields in order of appearance in the command output. Signed-off-by: Mostyn Bramley-Moore <mostyn@antipode.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 April 2017, 18:17:11 UTC
5105417 Jeff King 01 April 2017, 08:09:32 UTC index-pack: detect local corruption in collision check When we notice that we have a local copy of an incoming object, we compare the two objects to make sure we haven't found a collision. Before we get to the actual object bytes, though, we compare the type and size from sha1_object_info(). If our local object is corrupted, then the type will be OBJ_BAD, which obviously will not match the incoming type, and we'll report "SHA1 COLLISION FOUND" (with capital letters and everything). This is confusing, as the problem is not a collision but rather local corruption. We should report that instead (just like we do if reading the rest of the object content fails a few lines later). Note that we _could_ just ignore the error and mark it as a non-collision. That would let you "git fetch" to replace a corrupted object. But it's not a very reliable method for repairing a repository. The earlier want/have negotiation tries to get the other side to omit objects we already have, and it would not realize that we are "missing" this corrupted object. So we're better off complaining loudly when we see corruption, and letting the user take more drastic measures to repair (like making a full clone elsewhere and copying the pack into place). Note that the test sets transfer.unpackLimit in the receiving repository so that we use index-pack (which is what does the collision check). Normally for such a small push we'd use unpack-objects, which would simply try to write the loose object, and discard the new one when we see that there's already an old one. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 April 2017, 17:48:11 UTC
93cff9a Jeff King 01 April 2017, 08:05:21 UTC sha1_loose_object_info: return error for corrupted objects When sha1_loose_object_info() finds that a loose object file cannot be stat(2)ed or mmap(2)ed, it returns -1 to signal an error to the caller. However, if it found that the loose object file is corrupt and the object data cannot be used from it, it stuffs OBJ_BAD into "type" field of the object_info, but returns zero (i.e., success), which can confuse callers. This is due to 052fe5eac (sha1_loose_object_info: make type lookup optional, 2013-07-12), which switched the return to a strict success/error, rather than returning the type (but botched the return). Callers of regular sha1_object_info() don't notice the difference, as that function returns the type (which is OBJ_BAD in this case). However, direct callers of sha1_object_info_extended() see the function return success, but without setting any meaningful values in the object_info struct, leading them to access potentially uninitialized memory. The easiest way to see the bug is via "cat-file -s", which will happily ignore the corruption and report whatever value happened to be in the "size" variable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 April 2017, 17:45:16 UTC
fba275d Junio C Hamano 01 April 2017, 04:08:30 UTC contrib/git-resurrect.sh: do not write \t for HT in sed scripts Just like we did in 0d1d6e50 ("t/t7003: replace \t with literal tab in sed expression", 2010-08-12), avoid writing "\t" for HT in sed scripts, which is not portable. Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 April 2017, 04:08:30 UTC
2a1bd45 Kevin Willford 31 March 2017, 17:32:14 UTC name-hash: fix buffer overrun Add check for the end of the entries for the thread partition. Add test for lazy init name hash with specific directory structure The lazy init hash name was causing a buffer overflow when the last entry in the index was multiple folder deep with parent folders that did not have any files in them. This adds a test for the boundary condition of the thread partitions with the folder structure that was triggering the buffer overflow. The fix was to check if it is the last entry for the thread partition in the handle_range_dir and not try to use the next entry in the cache. Signed-off-by: Kevin Willford <kewillf@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 01 April 2017, 03:57:18 UTC
8668976 Junio C Hamano 31 March 2017, 20:20:48 UTC remote.[ch]: parse_push_cas_option() can be static Since 068c77a5 ("builtin/send-pack.c: use parse_options API", 2015-08-19), there is no external user of this helper function. Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 March 2017, 20:20:48 UTC
e239dab brian m. carlson 31 March 2017, 01:40:01 UTC Documentation: update and rename api-sha1-array.txt Since the structure and functions have changed names, update the code examples and the documentation. Rename the file to match the new name of the API. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 March 2017, 15:33:56 UTC
910650d brian m. carlson 31 March 2017, 01:40:00 UTC Rename sha1_array to oid_array Since this structure handles an array of object IDs, rename it to struct oid_array. Also rename the accessor functions and the initialization constant. This commit was produced mechanically by providing non-Documentation files to the following Perl one-liners: perl -pi -E 's/struct sha1_array/struct oid_array/g' perl -pi -E 's/\bsha1_array_/oid_array_/g' perl -pi -E 's/SHA1_ARRAY_INIT/OID_ARRAY_INIT/g' Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 March 2017, 15:33:56 UTC
1b7ba79 brian m. carlson 31 March 2017, 01:39:59 UTC Convert sha1_array_for_each_unique and for_each_abbrev to object_id Make sha1_array_for_each_unique take a callback using struct object_id. Since one of these callbacks is an argument to for_each_abbrev, convert those as well. Rename various functions, replacing "sha1" with "oid". Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 March 2017, 15:33:55 UTC
5d3206d brian m. carlson 31 March 2017, 01:39:58 UTC Convert sha1_array_lookup to take struct object_id Convert this function by changing the declaration and definition and applying the following semantic patch to update the callers: @@ expression E1, E2; @@ - sha1_array_lookup(E1, E2.hash) + sha1_array_lookup(E1, &E2) @@ expression E1, E2; @@ - sha1_array_lookup(E1, E2->hash) + sha1_array_lookup(E1, E2) Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 March 2017, 15:33:55 UTC
4ce3621 brian m. carlson 31 March 2017, 01:39:57 UTC Convert remaining callers of sha1_array_lookup to object_id There are a very small number of callers which don't already use struct object_id. Convert them. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 March 2017, 15:33:55 UTC
98a72dd brian m. carlson 31 March 2017, 01:39:56 UTC Make sha1_array_append take a struct object_id * Convert the callers to pass struct object_id by changing the function declaration and definition and applying the following semantic patch: @@ expression E1, E2; @@ - sha1_array_append(E1, E2.hash) + sha1_array_append(E1, &E2) @@ expression E1, E2; @@ - sha1_array_append(E1, E2->hash) + sha1_array_append(E1, E2) Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 31 March 2017, 15:33:55 UTC
6a97da3 Jeff King 28 March 2017, 19:48:10 UTC daemon: use an argv_array to exec children Our struct child_process already has its own argv_array. Let's use that to avoid having to format options into separate buffers. Note that we'll need to declare the child process outside of the run_service_command() helper to do this. But that opens up a further simplification, which is that the helper can append to our argument list, saving each caller from specifying "." manually. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
07af889 Jeff King 28 March 2017, 19:47:03 UTC gc: replace local buffer with git_path We probe the "17/" loose object directory for auto-gc, and use a local buffer to format the path. We can just use git_path() for this. It handles paths of any length (reducing our error handling). And because we feed the result straight to a system call, we can just use the static variant. Note that git_path also knows the string "objects/" is special, and will replace it with git_object_directory() when necessary. Another alternative would be to use sha1_file_name() for the pretend object "170000...", but that ends up being more hassle for no gain, as we have to truncate the final path component. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
8c5acfb Jeff King 28 March 2017, 19:47:00 UTC transport-helper: replace checked snprintf with xsnprintf We can use xsnprintf to do our truncation check with less code. The error message isn't as specific, but the point is that this isn't supposed to trigger in the first place (because our buffer is big enough to handle any int). Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
1a168e5 Jeff King 28 March 2017, 19:46:56 UTC convert unchecked snprintf into xsnprintf These calls to snprintf should always succeed, because their input is small and fixed. Let's use xsnprintf to make sure this is the case (and to make auditing for actual truncation easier). These could be candidates for turning into heap buffers, but they fall into a few broad categories that make it not worth doing: - formatting single numbers is simple enough that we can see the result should fit - the size of a sha1 is likewise well-known, and I didn't want to cause unnecessary conflicts with the ongoing process to convert these constants to GIT_MAX_HEXSZ - the interface for curl_errorstr is dictated by curl Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
0dc3b03 Jeff King 28 March 2017, 19:46:53 UTC combine-diff: replace malloc/snprintf with xstrfmt There's no need to use the magic "100" when a strbuf can do it for us. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
5b1ef2c Jeff King 28 March 2017, 19:46:50 UTC replace unchecked snprintf calls with heap buffers We'd prefer to avoid unchecked snprintf calls because truncation can lead to unexpected results. These are all cases where truncation shouldn't ever happen, because the input to snprintf is fixed in size. That makes them candidates for xsnprintf(), but it's simpler still to just use the heap, and then nobody has to wonder if "100" is big enough. We'll use xstrfmt() where possible, and a strbuf when we need the resulting size or to reuse the same buffer in a loop. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
446d5d9 Jeff King 28 March 2017, 19:46:47 UTC receive-pack: print --pack-header directly into argv array After receive-pack reads the pack header from the client, it feeds the already-read part to index-pack and unpack-objects via their --pack-header command-line options. To do so, we format it into a fixed buffer, then duplicate it into the child's argv_array. Our buffer is long enough to handle any possible input, so this isn't wrong. But it's more complicated than it needs to be; we can just argv_array_pushf() the final value and avoid the intermediate copy. This drops the magic number and is more efficient, too. Note that we need to push to the argv_array in order, which means we can't do the push until we are in the "unpack-objects versus index-pack" conditional. Rather than duplicate the slightly complicated format specifier, I pushed it into a helper function. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
903fc7d Jeff King 28 March 2017, 19:46:44 UTC name-rev: replace static buffer with strbuf When name-rev needs to format an actual name, we do so into a fixed-size buffer. That includes the actual ref tip, as well as any traversal information. Since refs can exceed 1024 bytes, this means you can get a bogus result. E.g., doing: git tag $(perl -e 'print join("/", 1..1024)') git describe --contains HEAD^ results in ".../282/283", when it should be ".../1023/1024~1". We can solve this by using a heap buffer. We'll use a strbuf, which lets us write into the same buffer from our loop without having to reallocate. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
cddac45 Jeff King 28 March 2017, 19:46:40 UTC create_branch: use xstrfmt for reflog message We generate a reflog message that contains some fixed text plus a branch name, and use a buffer of size PATH_MAX + 20. This mostly works if you assume that refnames are shorter than PATH_MAX, but: 1. That's not necessarily true. PATH_MAX is not always the filesystem's limit. 2. The "20" is not sufficiently large for the fixed text anyway. Let's just switch to a heap buffer so we don't have to even care. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
3818b25 Jeff King 28 March 2017, 19:46:36 UTC create_branch: move msg setup closer to point of use In create_branch() we write the reflog msg into a buffer in the main function, but then use it only inside a conditional. If you carefully follow the logic, you can confirm that we never use the buffer uninitialized nor write when it would not be used. But we can make this a lot more obvious by simply moving the write step inside the conditional. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
6cd4a89 Jeff King 28 March 2017, 19:46:33 UTC avoid using mksnpath for refs Like the previous commit, we'd like to avoid the assumption that refs fit into PATH_MAX-sized buffers. These callsites have an extra twist, though: they write the refnames using mksnpath. This does two things beyond a regular snprintf: 1. It quietly writes "/bad-path/" when truncation occurs. This saves the caller having to check the error code, but if you aren't actually feeding the result to a system call (and we aren't here), it's questionable. 2. It calls cleanup_path(), which removes leading instances of "./". That's questionable when dealing with refnames, as we could silently canonicalize a syntactically bogus refname into a valid one. Let's convert each case to use a strbuf. This is preferable to xstrfmt() because we can reuse the same buffer as we loop. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
7f897b6 Jeff King 28 March 2017, 19:46:30 UTC avoid using fixed PATH_MAX buffers for refs Many functions which handle refs use a PATH_MAX-sized buffer to do so. This is mostly reasonable as we have to write loose refs into the filesystem, and at least on Linux the 4K PATH_MAX is big enough that nobody would care. But: 1. The static PATH_MAX is not always the filesystem limit. 2. On other platforms, PATH_MAX may be much smaller. 3. As we move to alternate ref storage, we won't be bound by filesystem limits. Let's convert these to heap buffers so we don't have to worry about truncation or size limits. We may want to eventually constrain ref lengths for sanity and to prevent malicious names, but we should do so consistently across all platforms, and in a central place (like the ref code). Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
1412f76 Jeff King 28 March 2017, 19:46:26 UTC fetch: use heap buffer to format reflog Part of the reflog content comes from the environment, which can be much larger than our fixed buffer. Let's use a heap buffer so we avoid truncating it. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
b0ceab9 Jeff King 28 March 2017, 19:46:23 UTC tag: use strbuf to format tag header We format the tag header into a fixed 1024-byte buffer. But since the tag-name and tagger ident can be arbitrarily large, we may unceremoniously die with "tag header too big". Let's just use a strbuf instead. Note that it looks at first glance like we can just format this directly into the "buf" strbuf where it will ultimately go. But that buffer may already contain the tag message, and we have no easy way to prepend formatted data to a strbuf (we can only splice in an already-generated buffer). This isn't a performance-critical path, so going through an extra buffer isn't a big deal. Signed-off-by: Jeff King <peff@peff.net> 30 March 2017, 21:59:50 UTC
977db6b Jeff King 30 March 2017, 18:26:05 UTC diff: avoid fixed-size buffer for patch-ids To generate a patch id, we format the diff header into a fixed-size buffer, and then feed the result to our sha1 computation. The fixed buffer has size '4*PATH_MAX + 20', which in theory accommodates the four filenames plus some extra data. Except: 1. The filenames may not be constrained to PATH_MAX. The static value may not be a real limit on the current filesystem. Moreover, we may compute patch-ids for names stored only in git, without touching the current filesystem at all. 2. The 20 bytes is not nearly enough to cover the extra content we put in the buffer. As a result, the data we feed to the sha1 computation may be truncated, and it's possible that a commit with a very long filename could erroneously collide in the patch-id space with another commit. For instance, if one commit modified "really-long-filename/foo" and another modified "bar" in the same directory. In practice this is unlikely. Because the filenames are repeated, and because there's a single cutoff at the end of the buffer, the offending filename would have to be on the order of four times larger than PATH_MAX. We could fix this by moving to a strbuf. However, we can observe that the purpose of formatting this in the first place is to feed it to git_SHA1_Update(). So instead, let's just feed each part of the formatted string directly. This actually ends up more readable, and we can even factor out some duplicated bits from the various conditional branches. Technically this may change the output of patch-id for very long filenames, but it's not worth making an exception for this in the --stable output. It was a bug, and one that only affected an unlikely set of paths. And anyway, the exact value would have varied from platform to platform depending on the value of PATH_MAX, so there is no "stable" value. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 March 2017, 21:58:29 UTC
b14f27f Junio C Hamano 30 March 2017, 21:14:32 UTC Tenth batch for 2.13 Signed-off-by: Junio C Hamano <gitster@pobox.com> 30 March 2017, 21:14:32 UTC
876eb61 Junio C Hamano 30 March 2017, 21:07:19 UTC Merge branch 'jk/make-coccicheck-detect-errors' Build fix. * jk/make-coccicheck-detect-errors: Makefile: detect errors in running spatch 30 March 2017, 21:07:19 UTC
e711824 Junio C Hamano 30 March 2017, 21:07:18 UTC Merge branch 'bc/push-cert-receive-fix' "git receive-pack" could have been forced to die by attempting allocate an unreasonably large amount of memory with a crafted push certificate; this has been fixed. * bc/push-cert-receive-fix: builtin/receive-pack: fix incorrect pointer arithmetic 30 March 2017, 21:07:18 UTC
back to top