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
26aa9fc Junio C Hamano 18 November 2018, 09:24:49 UTC Git 2.20-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 November 2018, 09:24:49 UTC
9e3dc6b Junio C Hamano 18 November 2018, 09:23:59 UTC Merge branch 'jk/close-duped-fd-before-unlock-for-bundle' When "git bundle" aborts due to an empty commit ranges (i.e. resulting in an empty pack), it left a file descriptor to an lockfile open, which resulted in leftover lockfile on Windows where you cannot remove a file with an open file descriptor. This has been corrected. * jk/close-duped-fd-before-unlock-for-bundle: bundle: dup() output descriptor closer to point-of-use 18 November 2018, 09:23:59 UTC
4520c23 Junio C Hamano 18 November 2018, 09:23:59 UTC Merge branch 'ab/rebase-in-c-escape-hatch' The recently merged "rebase in C" has an escape hatch to use the scripted version when necessary, but it hasn't been documented, which has been corrected. * ab/rebase-in-c-escape-hatch: tests: add a special setup where rebase.useBuiltin is off rebase doc: document rebase.useBuiltin 18 November 2018, 09:23:59 UTC
137c1f2 Junio C Hamano 18 November 2018, 09:23:59 UTC Merge branch 'js/rebase-am-options' The way "git rebase" parses and forwards the command line options meant for underlying "git am" has been revamped, which fixed for options with parameters that were not passed correctly. * js/rebase-am-options: rebase: validate -C<n> and --whitespace=<mode> parameters early rebase: really just passthru the `git am` options 18 November 2018, 09:23:59 UTC
7bdebaa Junio C Hamano 18 November 2018, 09:23:59 UTC Merge branch 'sg/ref-filter-wo-repository' "git ls-remote --sort=<thing>" can feed an object that is not yet available into the comparison machinery and segfault, which has been corrected to check such a request upfront and reject it. * sg/ref-filter-wo-repository: ref-filter: don't look for objects when outside of a repository 18 November 2018, 09:23:59 UTC
56e4af3 Junio C Hamano 18 November 2018, 09:23:58 UTC Merge branch 'nd/doc-extensions' Doc update. * nd/doc-extensions: doc: move extensions.worktreeConfig to the right place 18 November 2018, 09:23:59 UTC
7b9bb38 Junio C Hamano 18 November 2018, 09:23:58 UTC Merge branch 'js/fuzz-cxxflags' The build procedure to link for fuzzing test has been made customizable with a new Makefile variable. * js/fuzz-cxxflags: Makefile: use FUZZ_CXXFLAGS for linking fuzzers 18 November 2018, 09:23:58 UTC
b8a9209 Junio C Hamano 18 November 2018, 09:23:58 UTC Merge branch 'js/mingw-msdn-url' The URL to an MSDN page in a comment has been updated. * js/mingw-msdn-url: mingw: replace an obsolete link with the superseding one 18 November 2018, 09:23:58 UTC
c56aa1d Junio C Hamano 18 November 2018, 09:23:58 UTC Merge branch 'js/mingw-create-hard-link' Windows update. * js/mingw-create-hard-link: mingw: use `CreateHardLink()` directly 18 November 2018, 09:23:58 UTC
744fad6 Junio C Hamano 18 November 2018, 09:23:57 UTC Merge branch 'js/config-sequence' A sanity check for start-up sequence has been added in the config API codepath. * js/config-sequence: config: report a bug if git_dir exists without commondir 18 November 2018, 09:23:57 UTC
06a2d24 Junio C Hamano 18 November 2018, 09:23:57 UTC Merge branch 'lj/mingw-pthread-cond' Code simplification. * lj/mingw-pthread-cond: win32: replace pthread_cond_*() with much simpler code 18 November 2018, 09:23:57 UTC
ca6e972 Junio C Hamano 18 November 2018, 09:23:57 UTC Merge branch 'nd/command-list-gen-fix' Build tweak. * nd/command-list-gen-fix: build: fix broken command-list.h generation with core.autocrlf 18 November 2018, 09:23:57 UTC
0466aeb Junio C Hamano 18 November 2018, 09:23:57 UTC Merge branch 'ag/p3400-force-checkout' Perf test tweak. * ag/p3400-force-checkout: p3400: replace calls to `git checkout -b' by `git checkout -B' 18 November 2018, 09:23:57 UTC
e14af5f Junio C Hamano 18 November 2018, 09:23:57 UTC Merge branch 'cb/notes-freeing-always-null-fix' Code cleanup. * cb/notes-freeing-always-null-fix: builtin/notes: remove unnecessary free 18 November 2018, 09:23:57 UTC
0de3a73 Junio C Hamano 18 November 2018, 09:23:56 UTC Merge branch 'js/rebase-r-and-merge-head' Bugfix for the recently graduated "git rebase --rebase-merges". * js/rebase-r-and-merge-head: status: rebase and merge can be in progress at the same time built-in rebase --skip/--abort: clean up stale .git/<name> files rebase -i: include MERGE_HEAD into files to clean up rebase -r: do not write MERGE_HEAD unless needed rebase -r: demonstrate bug with conflicting merges 18 November 2018, 09:23:56 UTC
bda53f4 Junio C Hamano 18 November 2018, 09:23:56 UTC Merge branch 'js/apply-recount-allow-noop' When editing a patch in a "git add -i" session, a hunk could be made to no-op. The "git apply" program used to reject a patch with such a no-op hunk to catch user mistakes, but it is now updated to explicitly allow a no-op hunk in an edited patch. * js/apply-recount-allow-noop: apply --recount: allow "no-op hunks" 18 November 2018, 09:23:56 UTC
c72431f Junio C Hamano 18 November 2018, 09:23:56 UTC Merge branch 'ra/rev-parse-exclude-glob' "rev-parse --exclude=<pattern> --branches=<pattern>" etc. did not quite work, which has been corrected. * ra/rev-parse-exclude-glob: refs: fix some exclude patterns being ignored refs: show --exclude failure with --branches/tags/remotes=glob 18 November 2018, 09:23:56 UTC
bb6dd0e Junio C Hamano 18 November 2018, 09:23:55 UTC Merge branch 'js/builtin-rebase-perf-fix' Code clean-up with correction to make the reimplemented "git rebase" a more faithful rewrite of the original, which also regains performance. * js/builtin-rebase-perf-fix: built-in rebase: reinstate `checkout -q` behavior where appropriate rebase: prepare reset_head() for more flags rebase: consolidate clean-up code before leaving reset_head() 18 November 2018, 09:23:55 UTC
5d90463 Junio C Hamano 18 November 2018, 09:23:55 UTC Merge branch 'js/mailmap' Update the mailmap to unify multiple entries for the authors with commits since v2.10. * js/mailmap: Update .mailmap 18 November 2018, 09:23:55 UTC
9aefd35 Junio C Hamano 18 November 2018, 09:23:55 UTC Merge branch 'js/rebase-autostash-detach-fix' "git rebase --autostash" did not correctly re-attach the HEAD at times. * js/rebase-autostash-detach-fix: built-in rebase --autostash: leave the current branch alone if possible built-in rebase: demonstrate regression with --autostash 18 November 2018, 09:23:55 UTC
a517079 Junio C Hamano 18 November 2018, 09:23:54 UTC Merge branch 'ab/range-diff-no-patch' The "--no-patch" option, which can be used to get a high-level overview without the actual line-by-line patch difference shown, of the "range-diff" command was earlier broken, which has been corrected. * ab/range-diff-no-patch: range-diff: make diff option behavior (e.g. --stat) consistent range-diff: fix regression in passing along diff options range-diff doc: add a section about output stability 18 November 2018, 09:23:54 UTC
6d2035e Junio C Hamano 18 November 2018, 09:23:54 UTC Merge branch 'jk/verify-sig-merge-into-void' "git merge" and "git pull" that merges into an unborn branch used to completely ignore "--verify-signatures", which has been corrected. * jk/verify-sig-merge-into-void: pull: handle --verify-signatures for unborn branch merge: handle --verify-signatures for unborn branch merge: extract verify_merge_signature() helper 18 November 2018, 09:23:54 UTC
3984764 Junio C Hamano 18 November 2018, 09:23:53 UTC Merge branch 'js/mingw-res-rebuild' Windows build update. * js/mingw-res-rebuild: Windows: force-recompile git.res for differing architectures 18 November 2018, 09:23:53 UTC
ab96f28 Junio C Hamano 18 November 2018, 09:23:53 UTC Merge branch 'jk/unused-parameter-fixes' Various functions have been audited for "-Wunused-parameter" warnings and bugs in them got fixed. * jk/unused-parameter-fixes: midx: double-check large object write loop assert NOARG/NONEG behavior of parse-options callbacks parse-options: drop OPT_DATE() apply: return -1 from option callback instead of calling exit(1) cat-file: report an error on multiple --batch options tag: mark "--message" option with NONEG show-branch: mark --reflog option as NONEG format-patch: mark "--no-numbered" option with NONEG status: mark --find-renames option with NONEG cat-file: mark batch options with NONEG pack-objects: mark index-version option as NONEG ls-files: mark exclude options as NONEG am: handle --no-patch-format option apply: mark include/exclude options as NONEG 18 November 2018, 09:23:53 UTC
fa2f2f0 Junio C Hamano 18 November 2018, 09:23:53 UTC Merge branch 'jk/curl-ldflags' The way -lcurl library gets linked has been simplified by taking advantage of the fact that we can just ask curl-config command how. * jk/curl-ldflags: build: link with curl-defined linker flags 18 November 2018, 09:23:53 UTC
95a3ef5 Junio C Hamano 18 November 2018, 09:23:53 UTC Merge branch 'mg/gpg-fingerprint-test' Add a few tests for a topic already in 'master'. * mg/gpg-fingerprint-test: t/t7510-signed-commit.sh: add signing subkey to Eris Discordia key t/t7510-signed-commit.sh: Add %GP to custom format checks 18 November 2018, 09:23:53 UTC
26b80a8 Junio C Hamano 18 November 2018, 09:23:52 UTC Merge branch 'nd/pthreads' The codebase has been cleaned up to reduce "#ifndef NO_PTHREADS". * nd/pthreads: Clean up pthread_create() error handling read-cache.c: initialize copy_len to shut up gcc 8 read-cache.c: reduce branching based on HAVE_THREADS read-cache.c: remove #ifdef NO_PTHREADS pack-objects: remove #ifdef NO_PTHREADS preload-index.c: remove #ifdef NO_PTHREADS grep: clean up num_threads handling grep: remove #ifdef NO_PTHREADS attr.c: remove #ifdef NO_PTHREADS name-hash.c: remove #ifdef NO_PTHREADS index-pack: remove #ifdef NO_PTHREADS send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c run-command.h: include thread-utils.h instead of pthread.h thread-utils: macros to unconditionally compile pthreads API 18 November 2018, 09:23:52 UTC
62ca33e Junio C Hamano 18 November 2018, 09:23:52 UTC Merge branch 'ds/reachable-topo-order' The revision walker machinery learned to take advantage of the commit generation numbers stored in the commit-graph file. * ds/reachable-topo-order: t6012: make rev-list tests more interesting revision.c: generation-based topo-order algorithm commit/revisions: bookkeeping before refactoring revision.c: begin refactoring --topo-order logic test-reach: add rev-list tests test-reach: add run_three_modes method prio-queue: add 'peek' operation 18 November 2018, 09:23:52 UTC
2c8ee1f Jeff King 16 November 2018, 09:43:59 UTC bundle: dup() output descriptor closer to point-of-use When writing a bundle to a file, the bundle code actually creates "your.bundle.lock" using our lockfile interface. We feed that output descriptor to a child git-pack-objects via run-command, which has the quirk that it closes the output descriptor in the parent. To avoid confusing the lockfile code (which still thinks the descriptor is valid), we dup() it, and operate on the duplicate. However, this has a confusing side effect: after the dup() but before we call pack-objects, we have _two_ descriptors open to the lockfile. If we call die() during that time, the lockfile code will try to clean up the partially-written file. It knows to close() the file before unlinking, since on some platforms (i.e., Windows) the open file would block the deletion. But it doesn't know about the duplicate descriptor. On Windows, triggering an error at the right part of the code will result in the cleanup failing and the lockfile being left in the filesystem. We can solve this by moving the dup() much closer to start_command(), shrinking the window in which we have the second descriptor open. It's easy to place this in such a way that no die() is possible. We could still die due to a signal in the exact wrong moment, but we already tolerate races there (e.g., a signal could come before we manage to put the file on the cleanup list in the first place). As a bonus, this shields create_bundle() itself from the duplicate-fd trick, and we can simplify its error handling (note that the lock rollback now happens unconditionally, but that's OK; it's a noop if we didn't open the lock in the first place). The included test uses an empty bundle to cause a failure at the right spot in the code, because that's easy to trigger (the other likely errors are write() problems like ENOSPC). Note that it would already pass on non-Windows systems (because they are happy to unlink an already-open file). Based-on-a-patch-by: Gaël Lhez <gael.lhez@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Tested-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 November 2018, 07:05:49 UTC
62c2393 Ævar Arnfjörð Bjarmason 14 November 2018, 09:15:06 UTC tests: add a special setup where rebase.useBuiltin is off Add a GIT_TEST_REBASE_USE_BUILTIN=false test mode which is equivalent to running with rebase.useBuiltin=false. This is needed to spot that we're not introducing any regressions in the legacy rebase version while we're carrying both it and the new builtin version. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2018, 10:02:54 UTC
d8d0a54 Ævar Arnfjörð Bjarmason 14 November 2018, 09:15:05 UTC rebase doc: document rebase.useBuiltin The rebase.useBuiltin variable introduced in 55071ea248 ("rebase: start implementing it as a builtin", 2018-08-07) was turned on by default in 5541bd5b8f ("rebase: default to using the builtin rebase", 2018-08-08), but had no documentation. Let's document it so that users who run into any stability issues with the C rewrite know there's an escape hatch[1], and make it clear that needing to turn off builtin rebase means you've found a bug in git. 1. https://public-inbox.org/git/87y39w1wc2.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2018, 10:02:54 UTC
2ef2ae2 Johannes Schindelin 15 November 2018, 11:22:40 UTC mingw: replace an obsolete link with the superseding one The MSDN documentation has been superseded by Microsoft Docs (which is backed by a repository on GitHub containing many, many files in Markdown format). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2018, 05:57:54 UTC
927c77e Josh Steadmon 14 November 2018, 19:41:47 UTC Makefile: use FUZZ_CXXFLAGS for linking fuzzers OSS-Fuzz requires C++-specific flags to link fuzzers. Passing these in CFLAGS causes lots of build warnings. Using separate FUZZ_CXXFLAGS avoids this. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2018, 05:25:06 UTC
356aea6 Nguyễn Thái Ngọc Duy 14 November 2018, 16:02:47 UTC doc: move extensions.worktreeConfig to the right place All config extensions are described in technical/repository-version.txt. I made a mistake of adding it in config.txt instead. This patch moves it back to where it belongs. Since repository-version.txt is not part of officially generated documents (it's not even part of DOC_HTML target), it's only visible to developers who read plain .txt files. Let's include it in gitrepository-layout.5 for more visibility. Some minor asciidoc fixes are required in repository-version.txt to make this happen. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2018, 05:10:31 UTC
47bd3d0 SZEDER Gábor 14 November 2018, 12:27:25 UTC ref-filter: don't look for objects when outside of a repository The command 'git ls-remote --sort=authordate <remote>' segfaults when run outside of a repository, ever since the introduction of its '--sort' option in 1fb20dfd8e (ls-remote: create '--sort' option, 2018-04-09). While in general the 'git ls-remote' command can be run outside of a repository just fine, its '--sort=<key>' option with certain keys does require access to the referenced objects. This sorting is implemented using the generic ref-filter sorting facility, which already handles missing objects gracefully with the appropriate 'missing object deadbeef for HEAD' message. However, being generic means that it checks replace refs while trying to retrieve an object, and while doing so it accesses the 'git_replace_ref_base' variable, which has not been initialized and is still a NULL pointer when outside of a repository, thus causing the segfault. Make ref-filter more careful upfront while parsing the format string, and make it error out when encountering a format atom requiring object access when we are not in a repository. Also add a test to ensure that 'git ls-remote --sort' fails gracefully when executed outside of a repository. Reported-by: H.Merijn Brand <h.m.brand@xs4all.nl> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2018, 04:49:08 UTC
4400487 Johannes Schindelin 14 November 2018, 13:59:02 UTC config: report a bug if git_dir exists without commondir This did happen at some stage, and was fixed relatively quickly. Make sure that we detect very quickly, too, should that happen again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2018, 02:54:01 UTC
04519d7 Johannes Schindelin 14 November 2018, 16:25:31 UTC rebase: validate -C<n> and --whitespace=<mode> parameters early It is a good idea to error out early upon seeing, say, `-Cbad`, rather than starting the rebase only to have the `--am` backend complain later. Let's do this. The only options accepting parameters which we pass through to `git am` (which may, or may not, forward them to `git apply`) are `-C` and `--whitespace`. The other options we pass through do not accept parameters, so we do not have to validate them here. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2018, 02:52:13 UTC
f576968 Johannes Schindelin 14 November 2018, 16:25:29 UTC rebase: really just passthru the `git am` options Currently, we parse the options intended for `git am` as if we wanted to handle them in `git rebase`, and then reconstruct them painstakingly to define the `git_am_opt` variable. However, there is a much better way (that I was unaware of, at the time when I mentored Pratik to implement these options): OPT_PASSTHRU_ARGV. It is intended for exactly this use case, where command-line options want to be parsed into a separate `argv_array`. Let's use this feature. Incidentally, this also allows us to address a bug discovered by Phillip Wood, where the built-in rebase failed to understand that the `-C` option takes an optional argument. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 November 2018, 02:52:13 UTC
a48e12e Ævar Arnfjörð Bjarmason 13 November 2018, 18:55:58 UTC range-diff: make diff option behavior (e.g. --stat) consistent Make the behavior when diff options (e.g. "--stat") are passed consistent with how "diff" behaves. Before 73a834e9e2 ("range-diff: relieve callers of low-level configuration burden", 2018-07-22) running range-diff with "--stat" would produce stat output and the diff output, as opposed to how "diff" behaves where once "--stat" is specified "--patch" also needs to be provided to emit the patch output. As noted in a previous change ("range-diff doc: add a section about output stability", 2018-11-07) the "--stat" output with "range-diff" is useless at the moment. But we should behave consistently with "diff" in anticipation of such output being useful in the future, because it would make for confusing UI if "diff" and "range-diff" behaved differently when it came to how they interpret diff options. The new behavior is also consistent with the existing documentation added in ba931edd28 ("range-diff: populate the man page", 2018-08-13). See "[...]also accepts the regular diff options[...]" in git-range-diff(1). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 November 2018, 06:25:48 UTC
c73b7ad Loo Rong Jie 13 November 2018, 18:52:35 UTC win32: replace pthread_cond_*() with much simpler code The Win32 CONDITION_VARIABLE has better performance and is easier to maintain, as the code is a lot shorter now (the semantics of the CONDITION_VARIABLE matches the pthread_cond_t very well). Note: CONDITION_VARIABLE is not available in Windows XP and below, but the declared minimal Windows version required to build and run Git for Windows is Windows Vista (which is also beyond its end-of-life, but for less long than Windows XP), so that's okay. Signed-off-by: Loo Rong Jie <loorongjie@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 November 2018, 06:14:22 UTC
1e1a876 Johannes Schindelin 13 November 2018, 14:37:02 UTC mingw: use `CreateHardLink()` directly The function `CreateHardLink()` is available in all supported Windows versions (even since Windows XP), so there is no more need to resolve it at runtime. Helped-by: Max Kirillov <max@max630.net> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 November 2018, 05:41:15 UTC
d166e6a Junio C Hamano 13 November 2018, 13:13:52 UTC Tenth batch for 2.20 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 13:37:28 UTC
95182c6 Junio C Hamano 13 November 2018, 13:37:28 UTC Merge branch 'nd/complete-format-patch' The support for format-patch (and send-email) by the command-line completion script (in contrib/) has been simplified a bit. * nd/complete-format-patch: completion: use __gitcomp_builtin for format-patch 13 November 2018, 13:37:28 UTC
1e4a714 Junio C Hamano 13 November 2018, 13:37:28 UTC Merge branch 'nd/tree-walk-path-exclusion' Pathspec matching against a tree object were buggy when negative pathspec elements were involved, which has been fixed. * nd/tree-walk-path-exclusion: tree-walk.c: fix overoptimistic inclusion in :(exclude) matching 13 November 2018, 13:37:28 UTC
57f06d5 Junio C Hamano 13 November 2018, 13:37:27 UTC Merge branch 'sg/travis-install-dependencies' The procedure to install dependencies before testing at Travis CI is getting revamped for both simplicity and flexibility, taking advantage of the recent move to the vm-based environment. * sg/travis-install-dependencies: travis-ci: install packages in 'ci/install-dependencies.sh' 13 November 2018, 13:37:27 UTC
9235a6c Junio C Hamano 13 November 2018, 13:37:27 UTC Merge branch 'bp/add-diff-files-optim' "git add" needs to internally run "diff-files" equivalent, and the codepath learned the same optimization as "diff-files" has to run lstat(2) in parallel to find which paths have been updated in the working tree. * bp/add-diff-files-optim: add: speed up cmd_add() by utilizing read_cache_preload() 13 November 2018, 13:37:27 UTC
39d23df Junio C Hamano 13 November 2018, 13:37:27 UTC Merge branch 'jk/xdiff-interface' The interface into "xdiff" library used to discover the offset and size of a generated patch hunk by first formatting it into the textual hunk header "@@ -n,m +k,l @@" and then parsing the numbers out. A new interface has been introduced to allow callers a more direct access to them. * jk/xdiff-interface: xdiff-interface: drop parse_hunk_header() range-diff: use a hunk callback diff: convert --check to use a hunk callback combine-diff: use an xdiff hunk callback diff: use hunk callback for word-diff diff: discard hunk headers for patch-ids earlier diff: avoid generating unused hunk header lines xdiff-interface: provide a separate consume callback for hunks xdiff: provide a separate emit callback for hunks 13 November 2018, 13:37:27 UTC
f22838a Junio C Hamano 13 November 2018, 13:37:26 UTC Merge branch 'jk/misc-unused-fixes' Assorted fixes for bugs found while auditing -Wunused-parameter warnings. * jk/misc-unused-fixes: approxidate: fix NULL dereference in date_time() pathspec: handle non-terminated strings with :(attr) approxidate: handle pending number for "specials" rev-list: handle flags for --indexed-objects 13 November 2018, 13:37:26 UTC
e146cc9 Junio C Hamano 13 November 2018, 13:37:26 UTC Merge branch 'nd/per-worktree-ref-iteration' The code to traverse objects for reachability, used to decide what objects are unreferenced and expendable, have been taught to also consider per-worktree refs of other worktrees as starting points to prevent data loss. * nd/per-worktree-ref-iteration: git-worktree.txt: correct linkgit command name reflog expire: cover reflog from all worktrees fsck: check HEAD and reflog from other worktrees fsck: move fsck_head_link() to get_default_heads() to avoid some globals revision.c: better error reporting on ref from different worktrees revision.c: correct a parameter name refs: new ref types to make per-worktree refs visible to all worktrees Add a place for (not) sharing stuff between worktrees refs.c: indent with tabs, not spaces 13 November 2018, 13:37:26 UTC
11aa560 Junio C Hamano 13 November 2018, 13:37:25 UTC Merge branch 'bp/refresh-index-using-preload' The helper function to refresh the cached stat information in the in-core index has learned to perform the lstat() part of the operation in parallel on multi-core platforms. * bp/refresh-index-using-preload: refresh_index: remove unnecessary calls to preload_index() speed up refresh_index() by utilizing preload_index() 13 November 2018, 13:37:26 UTC
409b3f2 Junio C Hamano 13 November 2018, 13:37:25 UTC Merge branch 'ag/rebase-i-in-c' Code clean-up for a topic already in 'master'. * ag/rebase-i-in-c: sequencer.c: remove a stray semicolon 13 November 2018, 13:37:25 UTC
2281aa8 Junio C Hamano 13 November 2018, 13:37:25 UTC Merge branch 'al/send-email-auto-cte-fixup' "git send-email --transfer-encoding=..." in recent versions of Git sometimes produced an empty "Content-Transfer-Encoding:" header, which has been corrected. * al/send-email-auto-cte-fixup: send-email: avoid empty transfer encoding header 13 November 2018, 13:37:25 UTC
291123e Junio C Hamano 13 November 2018, 13:37:24 UTC Merge branch 'ds/add-missing-tags' The history traversal used to implement the tag-following has been optimized by introducing a new helper. * ds/add-missing-tags: remote: make add_missing_tags() linear test-reach: test get_reachable_subset commit-reach: implement get_reachable_subset 13 November 2018, 13:37:24 UTC
1961efe Junio C Hamano 13 November 2018, 13:37:24 UTC Merge branch 'sh/mingw-safer-compat-poll' Windows fix. * sh/mingw-safer-compat-poll: poll: use GetTickCount64() to avoid wrap-around issues 13 November 2018, 13:37:24 UTC
6e31fa9 Junio C Hamano 13 November 2018, 13:37:24 UTC Merge branch 'js/rebase-p-tests' In preparation to the day when we can deprecate and remove the "rebase -p", make sure we can skip and later remove tests for it. * js/rebase-p-tests: tests: optionally skip `git rebase -p` tests t3418: decouple test cases from a previous `rebase -p` test case t3404: decouple some test cases from outcomes of previous test cases 13 November 2018, 13:37:24 UTC
6b2a524 Junio C Hamano 13 November 2018, 13:37:23 UTC Merge branch 'pw/am-rebase-read-author-script' Unify code to read the author-script used in "git am" and the commands that use the sequencer machinery, e.g. "git rebase -i". * pw/am-rebase-read-author-script: sequencer: use read_author_script() add read_author_script() to libgit am: rename read_author_script() am: improve author-script error reporting am: don't die in read_author_script() 13 November 2018, 13:37:23 UTC
fd4bb38 Junio C Hamano 13 November 2018, 13:37:23 UTC Merge branch 'jc/war-on-string-list' Replace three string-list instances used as look-up tables in "git fetch" with hashmaps. * jc/war-on-string-list: fetch: replace string-list used as a look-up table with a hashmap 13 November 2018, 13:37:23 UTC
20d04b4 Junio C Hamano 13 November 2018, 13:37:23 UTC Merge branch 'ag/rev-parse-all-exclude-fix' "git rev-parse --exclude=* --branches --branches" (i.e. first saying "add only things that do not match '*' out of all branches" and then adding all branches, without any exclusion this time") worked as expected, but "--exclude=* --all --all" did not work the same way, which has been fixed. * ag/rev-parse-all-exclude-fix: rev-parse: clear --exclude list after 'git rev-parse --all' 13 November 2018, 13:37:23 UTC
67cf2fa Junio C Hamano 13 November 2018, 13:37:22 UTC Merge branch 'jt/tighten-fetch-proto-v2-response' "git fetch" was a bit loose in parsing resposes from the other side when talking over the protocol v2. * jt/tighten-fetch-proto-v2-response: fetch-pack: be more precise in parsing v2 response 13 November 2018, 13:37:22 UTC
abb4824 Junio C Hamano 13 November 2018, 13:37:22 UTC Merge branch 'ao/submodule-wo-gitmodules-checked-out' The submodule support has been updated to read from the blob at HEAD:.gitmodules when the .gitmodules file is missing from the working tree. * ao/submodule-wo-gitmodules-checked-out: t/helper: add test-submodule-nested-repo-config submodule: support reading .gitmodules when it's not in the working tree submodule: add a helper to check if it is safe to write to .gitmodules t7506: clean up .gitmodules properly before setting up new scenario submodule: use the 'submodule--helper config' command submodule--helper: add a new 'config' subcommand t7411: be nicer to future tests and really clean things up t7411: merge tests 5 and 6 submodule: factor out a config_set_in_gitmodules_file_gently function submodule: add a print_config_from_gitmodules() helper 13 November 2018, 13:37:22 UTC
504bdc5 Junio C Hamano 13 November 2018, 13:37:21 UTC Merge branch 'nb/worktree-api-doc' Code readability fix. * nb/worktree-api-doc: worktree: rename is_worktree_locked to worktree_lock_reason worktree: update documentation for lock_reason and lock_reason_valid 13 November 2018, 13:37:21 UTC
daa8282 Junio C Hamano 13 November 2018, 13:37:21 UTC Merge branch 'ma/sequencer-do-reset-saner-loop-termination' Code readability fix. * ma/sequencer-do-reset-saner-loop-termination: sequencer: break out of loop explicitly 13 November 2018, 13:37:21 UTC
0474cd1 Junio C Hamano 13 November 2018, 13:37:21 UTC Merge branch 'js/mingw-utf8-env' Windows fix. * js/mingw-utf8-env: mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8) t7800: fix quoting 13 November 2018, 13:37:21 UTC
6c268fd Junio C Hamano 13 November 2018, 13:37:20 UTC Merge branch 'js/mingw-perl5lib' Windows fix. * js/mingw-perl5lib: mingw: unset PERL5LIB by default config: move Windows-specific config settings into compat/mingw.c config: allow for platform-specific core.* config settings config: rename `dummy` parameter to `cb` in git_default_config() 13 November 2018, 13:37:20 UTC
fbfdc07 Junio C Hamano 13 November 2018, 13:37:20 UTC Merge branch 'js/mingw-isatty-and-dup2' Windows fix. * js/mingw-isatty-and-dup2: mingw: fix isatty() after dup2() 13 November 2018, 13:37:20 UTC
bce4fc6 Junio C Hamano 13 November 2018, 13:37:20 UTC Merge branch 'ab/pack-tests-cleanup' A couple of tests used to leave the repository in a state that is deliberately corrupt, which have been corrected. * ab/pack-tests-cleanup: index-pack tests: don't leave test repo dirty at end pack-objects tests: don't leave test .git corrupt at end pack-objects test: modernize style 13 November 2018, 13:37:20 UTC
5fb9263 Junio C Hamano 13 November 2018, 13:37:19 UTC Merge branch 'ds/test-multi-pack-index' Tests for the recently introduced multi-pack index machinery. * ds/test-multi-pack-index: packfile: close multi-pack-index in close_all_packs multi-pack-index: define GIT_TEST_MULTI_PACK_INDEX midx: close multi-pack-index on repack midx: fix broken free() in close_midx() 13 November 2018, 13:37:19 UTC
25e4da8 Junio C Hamano 13 November 2018, 13:37:19 UTC Merge branch 'nd/wildmatch-double-asterisk' A pattern with '**' that does not have a slash on either side used to be an invalid one, but the code now treats such double-asterisks the same way as two normal asterisks that happen to be adjacent to each other. * nd/wildmatch-double-asterisk: wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode 13 November 2018, 13:37:19 UTC
8c758f9 Junio C Hamano 13 November 2018, 13:37:18 UTC Merge branch 'nd/per-worktree-config' A fourth class of configuration files (in addition to the traditional "system wide", "per user in the $HOME directory" and "per repository in the $GIT_DIR/config") has been introduced so that different worktrees that share the same repository (hence the same $GIT_DIR/config file) can use different customization. * nd/per-worktree-config: worktree: add per-worktree config files t1300: extract and use test_cmp_config() 13 November 2018, 13:37:18 UTC
c657aa0 Junio C Hamano 13 November 2018, 13:37:18 UTC Merge branch 'jk/stream-pack-non-delta-clarification' Additional comment on a tricky piece of code to help developers. * jk/stream-pack-non-delta-clarification: read_istream_pack_non_delta(): document input handling 13 November 2018, 13:37:18 UTC
81c365b Junio C Hamano 13 November 2018, 13:37:17 UTC Merge branch 'jk/proto-v2-ref-prefix-fix' "git ls-remote $there foo" was broken by recent update for the protocol v2 and stopped showing refs that match 'foo' that are not refs/{heads,tags}/foo, which has been fixed. * jk/proto-v2-ref-prefix-fix: ls-remote: pass heads/tags prefixes to transport ls-remote: do not send ref prefixes for patterns 13 November 2018, 13:37:17 UTC
879a8d4 Junio C Hamano 13 November 2018, 13:37:17 UTC Merge branch 'jk/detect-truncated-zlib-input' A regression in Git 2.12 era made "git fsck" fall into an infinite loop while processing truncated loose objects. * jk/detect-truncated-zlib-input: cat-file: handle streaming failures consistently check_stream_sha1(): handle input underflow t1450: check large blob in trailing-garbage test 13 November 2018, 13:37:17 UTC
fd7761a Junio C Hamano 13 November 2018, 13:37:16 UTC Merge branch 'nd/config-split' Split the overly large Documentation/config.txt file into million little pieces. This potentially allows each individual piece included into the manual page of the command it affects more easily. * nd/config-split: (81 commits) config.txt: remove config/dummy.txt config.txt: move worktree.* to a separate file config.txt: move web.* to a separate file config.txt: move versionsort.* to a separate file config.txt: move user.* to a separate file config.txt: move url.* to a separate file config.txt: move uploadpack.* to a separate file config.txt: move uploadarchive.* to a separate file config.txt: move transfer.* to a separate file config.txt: move tag.* to a separate file config.txt: move submodule.* to a separate file config.txt: move stash.* to a separate file config.txt: move status.* to a separate file config.txt: move splitIndex.* to a separate file config.txt: move showBranch.* to a separate file config.txt: move sequencer.* to a separate file config.txt: move sendemail-config.txt to config/ config.txt: move reset.* to a separate file config.txt: move rerere.* to a separate file config.txt: move repack.* to a separate file ... 13 November 2018, 13:37:16 UTC
bac2a1e Johannes Schindelin 12 November 2018, 11:44:32 UTC built-in rebase: reinstate `checkout -q` behavior where appropriate When we converted a `git checkout -q $onto^0` call to use `reset_head()`, we inadvertently incurred a change from a twoway_merge to a oneway_merge, as if we wanted a `git reset --hard` instead. This has performance ramifications under certain, though, as the oneway_merge needs to lstat() every single index entry whereas twoway_merge does not. So let's go back to the old behavior. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 06:05:02 UTC
73d6d7b Johannes Schindelin 12 November 2018, 11:44:31 UTC rebase: prepare reset_head() for more flags Currently, we only accept the flag indicating whether the HEAD should be detached not. In the next commit, we want to introduce another flag: to toggle between emulating `reset --hard` vs `checkout -q`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 06:05:02 UTC
3249c12 Johannes Schindelin 12 November 2018, 11:44:30 UTC rebase: consolidate clean-up code before leaving reset_head() The same clean-up code is repeated quite a few times; Let's DRY up the code some. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 06:05:02 UTC
9ab9b5d Rafael Ascensão 12 November 2018, 13:25:44 UTC refs: fix some exclude patterns being ignored `--exclude` from rev-list and rev-parse fails to exclude references if the next `--branches`, `--tags` or `--remotes` use the optional inclusive glob because those options are implemented as particular cases of `--glob=`, which itself requires that exclude patterns begin with 'refs/'. But it makes sense for `--branches=glob` and friends to be aware that exclusions patterns for them shouldn't be 'refs/<type>/' prefixed, the same way exclude patterns for `--branches` and friends (without the optional glob) already are. Let's record in 'refs.c:struct ref_filter' which context the exclude pattern is tied to, so refs.c:filter_refs() can decide if it should ignore the prefix when trying to match. Signed-off-by: Rafael Ascensão <rafa.almas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 05:41:22 UTC
9d55dca Rafael Ascensão 12 November 2018, 13:25:43 UTC refs: show --exclude failure with --branches/tags/remotes=glob The documentation of `--exclude=` option from rev-list and rev-parse explicitly states that exclude patterns *should not* start with 'refs/' when used with `--branches`, `--tags` or `--remotes`. However, following this advice results in refereces not being excluded if the next `--branches`, `--tags`, `--remotes` use the optional inclusive glob. Demonstrate this failure. Signed-off-by: Rafael Ascensão <rafa.almas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 05:41:20 UTC
22cb383 Johannes Schindelin 12 November 2018, 20:54:49 UTC apply --recount: allow "no-op hunks" When editing patches e.g. in `git add -e`, it is quite common that a hunk ends up having no -/+ lines, i.e. it is now supposed to do nothing. This use case was broken by ad6e8ed37bc1 (apply: reject a hunk that does not do anything, 2015-06-01) with the good intention of catching a very real, different issue in hand-edited patches. So let's use the `--recount` option as the tell-tale whether the user would actually be okay with no-op hunks. Add a test case to make sure that this use case does not regress again. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 04:02:52 UTC
982288e Johannes Schindelin 12 November 2018, 23:26:02 UTC status: rebase and merge can be in progress at the same time Since `git rebase -r` was introduced, that is possible. But our machinery did not think that possible, and failed to say anything about the rebase in progress when in the middle of a merge. Let's work around that in the minimal fashion. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 03:04:00 UTC
5aec927 Johannes Schindelin 12 November 2018, 23:26:01 UTC built-in rebase --skip/--abort: clean up stale .git/<name> files The scripted version of the rebase used to execute `git reset --hard` when skipping or aborting. When we ported this to C, we did update the worktree and some reflogs, but we failed to imitate `git reset --hard`'s behavior regarding files in .git/ such as MERGE_HEAD. Let's address this oversight. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 03:04:00 UTC
69c9220 Johannes Schindelin 12 November 2018, 23:25:59 UTC rebase -i: include MERGE_HEAD into files to clean up Every once in a while, the interactive rebase makes sure that no stale files are lying around. These days, we need to include MERGE_HEAD into that set of files, as the `merge` command will generate them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 03:04:00 UTC
85f8d9d Johannes Schindelin 12 November 2018, 23:25:58 UTC rebase -r: do not write MERGE_HEAD unless needed When we detect that a `merge` can be skipped because the merged commit is already an ancestor of HEAD, we do not need to commit, therefore writing the MERGE_HEAD file is useless. It is actually worse than useless: a subsequent `git commit` will pick it up and think that we want to merge that commit, still. To avoid that, move the code that writes the MERGE_HEAD file to a location where we already know that the `merge` cannot be skipped. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 03:04:00 UTC
f08110d Johannes Schindelin 12 November 2018, 23:25:57 UTC rebase -r: demonstrate bug with conflicting merges When calling `merge` on a branch that has already been merged, that `merge` is skipped quietly, but currently a MERGE_HEAD file is being left behind and will then be grabbed by the next `pick` (that did not want to create a *merge* commit). Demonstrate this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 03:04:00 UTC
9a4cb87 Carlo Marcelo Arenas Belón 11 November 2018, 09:49:33 UTC builtin/notes: remove unnecessary free 511726e4b1 ("builtin/notes: fix premature failure when trying to add the empty blob", 2014-11-09) removed the check for !len but left a call to free the buffer that will be otherwise NULL Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 November 2018, 03:03:15 UTC
5aa24d7 Alban Gruin 09 November 2018, 21:19:23 UTC p3400: replace calls to `git checkout -b' by `git checkout -B' p3400 makes a copy of the current repository to test git-rebase performance, and creates new branches in the copy with `git checkout -b'. If the original repository has branches with the same name as the script is trying to create, this operation will fail. This replaces these calls by `git checkout -B' to force the creation and update of these branches. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 November 2018, 07:40:55 UTC
54709d5 Nguyễn Thái Ngọc Duy 10 November 2018, 18:23:23 UTC build: fix broken command-list.h generation with core.autocrlf The script generate-cmdlist.sh needs input text files in UNIX line ending to work correctly. It's been fine even with core.autocrlf set because Documentation/git-*.txt is forced LF conversion. But this leaves out gitk.txt and also Documentation/*config.txt that recently becomes new input for this script. Update the attribute file to force LF on all *.txt files to be on the safe side. For more details, please see 00ddc9d13c (Fix build with core.autocrlf=true - 2017-05-09) Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 November 2018, 07:39:17 UTC
a35b13f Johannes Schindelin 09 November 2018, 11:31:14 UTC Update .mailmap This patch makes the output of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing the current and preferred addresses for authors that appear with more than one address. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 November 2018, 03:52:23 UTC
4624185 Ævar Arnfjörð Bjarmason 09 November 2018, 10:18:02 UTC range-diff: fix regression in passing along diff options In 73a834e9e2 ("range-diff: relieve callers of low-level configuration burden", 2018-07-22) we broke passing down options like --no-patch, --stat etc. Fix that regression, and add a test asserting the pre-73a834e9e2 behavior for some of these diff options. As noted in a change leading up to this ("range-diff doc: add a section about output stability", 2018-11-07) the output is not meant to be stable. So this regression test will likely need to be tweaked once we get a "proper" --stat option. See https://public-inbox.org/git/nycvar.QRO.7.76.6.1811071202480.39@tvgsbejvaqbjf.bet/ for a further explanation of the regression. The fix here is not the same as in Johannes's on-list patch, for reasons that'll be explained in a follow-up commit. The quoting of "EOF" here mirrors that of an earlier test. Perhaps that should be fixed, but let's leave that up to a later cleanup change. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 November 2018, 03:09:21 UTC
df569c3 Ævar Arnfjörð Bjarmason 09 November 2018, 10:18:01 UTC range-diff doc: add a section about output stability The range-diff command is already advertised as porcelain, but let's make it really clear that the output is completely subject to change, particularly when it comes to diff options such as --stat. Right now that option doesn't work, but fixing that is the subject of a later change. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 12 November 2018, 03:05:38 UTC
176f5d9 Johannes Schindelin 07 November 2018, 14:00:50 UTC built-in rebase --autostash: leave the current branch alone if possible When we converted a `git reset --hard` call in the original Unix shell script to built-in code, we asked to reset the worktree and the index and explicitly *not* to detach the HEAD. By mistake, though, we still did. Let's fix this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 November 2018, 01:16:38 UTC
2dac2bc Johannes Schindelin 07 November 2018, 14:00:48 UTC built-in rebase: demonstrate regression with --autostash An unnamed colleague of Ævar Arnfjörð Bjarmason reported a breakage where a `pull --rebase` (which did not really need to do anything but stash, see that nothing was changed, and apply the stash again) also detached the HEAD. This patch adds a minimal reproducer for this regression. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 08 November 2018, 01:16:35 UTC
adb59de Johannes Schindelin 06 November 2018, 14:55:50 UTC Windows: force-recompile git.res for differing architectures When git.rc is compiled into git.res, the result is actually dependent on the architecture. That is, you cannot simply link a 32-bit git.res into a 64-bit git.exe. Therefore, to allow 32-bit and 64-bit builds in the same directory, we let git.res depend on GIT-PREFIX so that it gets recompiled when compiling for a different architecture (this works because the exec path changes based on the architecture: /mingw32/libexec/git-core for 32-bit and /mingw64/libexec/git-core for 64-bit). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 November 2018, 02:58:24 UTC
aa097b8 Jeff King 07 November 2018, 01:12:53 UTC approxidate: fix NULL dereference in date_time() When we see a time like "noon", we pass "12" to our date_time() helper, which sets the hour to 12pm. If the current time is before noon, then we wrap around to yesterday using date_yesterday(). But unlike the normal calls to date_yesterday() from approxidate_alpha(), we pass a NULL "num" parameter. Since c27cc94fad (approxidate: handle pending number for "specials", 2018-11-02), that causes a segfault. One way to fix this is by checking for NULL. But arguably date_time() is abusing our helper by passing NULL in the first place (and this is the only case where one of these "special" parsers is used this way). So instead, let's have it just do the 1-day subtraction itself. It's still just a one-liner due to our update_tm() helper. Note that the test added here is a little funny, as we say "10am noon", which makes the "10am" seem pointless. But this bug can only be triggered when it the currently-parsed hour is before the special time. The latest special time is "tea" at 1700, but t0006 uses a hard-coded TEST_DATE_NOW of 1900. We could reset TEST_DATE_NOW, but that may lead to confusion in other tests. Just saying "10am noon" makes this test self-contained. Reported-by: Carlo Arenas <carenas@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 November 2018, 02:04:06 UTC
01a31f3 Jeff King 06 November 2018, 07:52:13 UTC pull: handle --verify-signatures for unborn branch We usually just forward the --verify-signatures option along to git-merge, and trust it to do the right thing. However, when we are on an unborn branch (i.e., there is no HEAD yet), we handle this case ourselves without even calling git-merge. And in this code path, we do not respect the verification option at all. It may be more maintainable in the long run to call git-merge for the unborn case. That would fix this bug, as well as prevent similar ones in the future. But unfortunately it's not easy to do. As t5520.3 demonstrates, there are some special cases that git-merge does not handle, like "git pull .. master:master" (by the time git-merge is invoked, we've overwritten the unborn HEAD). So for now let's just teach git-pull to handle this feature. Reported-by: Felix Eckhofer <felix@eckhofer.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 November 2018, 01:11:09 UTC
7488ba3 Jeff King 06 November 2018, 07:51:15 UTC merge: handle --verify-signatures for unborn branch When git-merge sees that we are on an unborn branch (i.e., there is no HEAD), it follows a totally separate code path than the usual merge logic. This code path does not know about verify_signatures, and so we fail to notice bad or missing signatures. This has been broken since --verify-signatures was added in efed002249 (merge/pull: verify GPG signatures of commits being merged, 2013-03-31). In an ideal world, we'd unify the flow for this case with the regular merge logic, which would fix this bug and avoid introducing similar ones. But because the unborn case is so different, it would be a burden on the rest of the function to continually handle the missing HEAD. So let's just port the verification check to this special case. Reported-by: Felix Eckhofer <felix@eckhofer.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 November 2018, 01:11:09 UTC
edc4d47 Jeff King 06 November 2018, 07:50:17 UTC merge: extract verify_merge_signature() helper The logic to implement "merge --verify-signatures" is inline in cmd_merge(), but this site misses some cases. Let's extract the logic into a function so we can call it from more places. We'll move it to commit.[ch], since one of the callers (git-pull) is outside our source file. This function isn't all that general (after all, its main function is to exit the program) but it's not worth trying to fix that. The heavy lifting is done by check_commit_signature(), and our purpose here is just sharing the die() logic. We'll mark it with a comment to make that clear. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 07 November 2018, 01:11:09 UTC
8858448 Junio C Hamano 06 November 2018, 06:51:23 UTC Ninth batch for 2.20 Signed-off-by: Junio C Hamano <gitster@pobox.com> 06 November 2018, 06:51:23 UTC
67f673a Junio C Hamano 06 November 2018, 06:50:23 UTC Merge branch 'sg/test-verbose-log' Our test scripts can now take the '-V' option as a synonym for the '--verbose-log' option. * sg/test-verbose-log: test-lib: introduce the '-V' short option for '--verbose-log' 06 November 2018, 06:50:23 UTC
6b37389 Junio C Hamano 06 November 2018, 06:50:23 UTC Merge branch 'rj/header-cleanup' Code cleanup. * rj/header-cleanup: commit-reach.h: add missing declarations (hdr-check) ewok_rlw.h: add missing 'inline' to function definition fetch-object.h: add missing declaration (hdr-check) 06 November 2018, 06:50:23 UTC
back to top