1. 15 10月, 2021 1 次提交
  2. 14 10月, 2021 10 次提交
    • J
      Merge branch 'ja/doc-status-types-and-copies' · 9875c515
      Junio C Hamano 提交于
      A few kinds of changes "git status" can show were not documented.
      
      * ja/doc-status-types-and-copies:
        Documentation/git-status: mention how to detect copies
        Documentation/git-status: document porcelain status T (typechange)
        Documentation/diff-format: state in which cases porcelain status is T
        Documentation/git-status: remove impossible porcelain status DR and DC
      9875c515
    • J
      Merge branch 'ab/make-sparse-for-real' · f0beebdb
      Junio C Hamano 提交于
      Prevent "make sparse" from running for the source files that
      haven't been modified.
      
      * ab/make-sparse-for-real:
        Makefile: make the "sparse" target non-.PHONY
      f0beebdb
    • J
      Merge branch 'ab/align-parse-options-help' · d7bc8521
      Junio C Hamano 提交于
      When "git cmd -h" shows more than one line of usage text (e.g.
      the cmd subcommand may take sub-sub-command), parse-options API
      learned to align these lines, even across i18n/l10n.
      
      * ab/align-parse-options-help:
        parse-options: properly align continued usage output
        git rev-parse --parseopt tests: add more usagestr tests
        send-pack: properly use parse_options() API for usage string
        parse-options API users: align usage output in C-strings
      d7bc8521
    • J
      Merge branch 'ab/help-config-vars' · 62f035ae
      Junio C Hamano 提交于
      Teach "git help -c" into helping the command line completion of
      configuration variables.
      
      * ab/help-config-vars:
        help: move column config discovery to help.c library
        help / completion: make "git help" do the hard work
        help tests: test --config-for-completion option & output
        help: simplify by moving to OPT_CMDMODE()
        help: correct logic error in combining --all and --guides
        help: correct logic error in combining --all and --config
        help tests: add test for --config output
        help: correct usage & behavior of "git help --guides"
        help: correct the usage string in -h and documentation
      62f035ae
    • J
      Merge branch 'jh/builtin-fsmonitor-part1' · af303ee3
      Junio C Hamano 提交于
      Built-in fsmonitor (part 1).
      
      * jh/builtin-fsmonitor-part1:
        t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command
        run-command: create start_bg_command
        simple-ipc/ipc-win32: add Windows ACL to named pipe
        simple-ipc/ipc-win32: add trace2 debugging
        simple-ipc: move definition of ipc_active_state outside of ifdef
        simple-ipc: preparations for supporting binary messages.
        trace2: add trace2_child_ready() to report on background children
      af303ee3
    • J
      Merge branch 'ab/config-based-hooks-1' · a5e61a42
      Junio C Hamano 提交于
      Mostly preliminary clean-up in the hook API.
      
      * ab/config-based-hooks-1:
        hook-list.h: add a generated list of hooks, like config-list.h
        hook.c users: use "hook_exists()" instead of "find_hook()"
        hook.c: add a hook_exists() wrapper and use it in bugreport.c
        hook.[ch]: move find_hook() from run-command.c to hook.c
        Makefile: remove an out-of-date comment
        Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
        Makefile: stop hardcoding {command,config}-list.h
        Makefile: mark "check" target as .PHONY
      a5e61a42
    • J
      Merge branch 'ab/lib-subtest' · cf006037
      Junio C Hamano 提交于
      Updates to the tests in t0000 to test the test framework.
      
      * ab/lib-subtest:
        test-lib tests: get rid of copy/pasted mock test code
        test-lib tests: assert 1 exit code, not non-zero
        test-lib tests: refactor common part of check_sub_test_lib_test*()
        test-lib tests: avoid subshell for "test_cmp" for readability
        test-lib tests: don't provide a description for the sub-tests
        test-lib tests: split up "write and run" into two functions
        test-lib tests: move "run_sub_test" to a new lib-subtest.sh
      cf006037
    • J
      Merge branch 'en/removing-untracked-fixes' · a7c2daa0
      Junio C Hamano 提交于
      Various fixes in code paths that move untracked files away to make room.
      
      * en/removing-untracked-fixes:
        Documentation: call out commands that nuke untracked files/directories
        Comment important codepaths regarding nuking untracked files/dirs
        unpack-trees: avoid nuking untracked dir in way of locally deleted file
        unpack-trees: avoid nuking untracked dir in way of unmerged file
        Change unpack_trees' 'reset' flag into an enum
        Remove ignored files by default when they are in the way
        unpack-trees: make dir an internal-only struct
        unpack-trees: introduce preserve_ignored to unpack_trees_options
        read-tree, merge-recursive: overwrite ignored files by default
        checkout, read-tree: fix leak of unpack_trees_options.dir
        t2500: add various tests for nuking untracked files
      a7c2daa0
    • J
      Merge branch 'mt/grep-submodule-textconv' · 1fdfb774
      Junio C Hamano 提交于
      "git grep --recurse-submodules" takes trees and blobs from the
      submodule repository, but the textconv settings when processing a
      blob from the submodule is not taken from the submodule repository.
      A test is added to demonstrate the issue, without fixing it.
      
      * mt/grep-submodule-textconv:
        grep: demonstrate bug with textconv attributes and submodules
      1fdfb774
    • J
      Merge branch 'ds/add-rm-with-sparse-index' · 2d498a7c
      Junio C Hamano 提交于
      "git add", "git mv", and "git rm" have been adjusted to avoid
      updating paths outside of the sparse-checkout definition unless
      the user specifies a "--sparse" option.
      
      * ds/add-rm-with-sparse-index:
        advice: update message to suggest '--sparse'
        mv: refuse to move sparse paths
        rm: skip sparse paths with missing SKIP_WORKTREE
        rm: add --sparse option
        add: update --renormalize to skip sparse paths
        add: update --chmod to skip sparse paths
        add: implement the --sparse option
        add: skip tracked paths outside sparse-checkout cone
        add: fail when adding an untracked sparse file
        dir: fix pattern matching on dirs
        dir: select directories correctly
        t1092: behavior for adding sparse files
        t3705: test that 'sparse_entry' is unstaged
      2d498a7c
  3. 13 10月, 2021 29 次提交
    • J
      Sync with Git 2.33.1 · 2bd2f258
      Junio C Hamano 提交于
      2bd2f258
    • J
      Git 2.33.1 · af6d1d60
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      af6d1d60
    • J
      Merge branch 'ah/connect-parse-feature-v0-fix' into maint · 9e25a2e8
      Junio C Hamano 提交于
      Protocol v0 clients can get stuck parsing a malformed feature line.
      
      * ah/connect-parse-feature-v0-fix:
        connect: also update offset for features without values
      9e25a2e8
    • J
      Merge branch 'ab/make-clean-depend-dirs' into maint · bbfc8212
      Junio C Hamano 提交于
      "make clean" has been updated to remove leftover .depend/
      directories, even when it is not told to use them to compute header
      dependencies.
      
      * ab/make-clean-depend-dirs:
        Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes
      bbfc8212
    • J
      Merge branch 'jk/http-redact-fix' into maint · 77edbde4
      Junio C Hamano 提交于
      Sensitive data in the HTTP trace were supposed to be redacted, but
      we failed to do so in HTTP/2 requests.
      
      * jk/http-redact-fix:
        http: match headers case-insensitively when redacting
      77edbde4
    • J
      Merge branch 'da/difftool-dir-diff-symlink-fix' into maint · ef09a7fb
      Junio C Hamano 提交于
      "git difftool --dir-diff" mishandled symbolic links.
      
      * da/difftool-dir-diff-symlink-fix:
        difftool: fix symlink-file writing in dir-diff mode
      ef09a7fb
    • J
      Merge branch 'cb/cvsserver' into maint · b59c0609
      Junio C Hamano 提交于
      "git cvsserver" had a long-standing bug in its authentication code,
      which has finally been corrected (it is unclear and is a separate
      question if anybody is seriously using it, though).
      
      * cb/cvsserver:
        Documentation: cleanup git-cvsserver
        git-cvsserver: protect against NULL in crypt(3)
        git-cvsserver: use crypt correctly to compare password hashes
      b59c0609
    • J
      Merge branch 'jk/clone-unborn-head-in-bare' into maint · c365967f
      Junio C Hamano 提交于
      "git clone" from a repository whose HEAD is unborn into a bare
      repository didn't follow the branch name the other side used, which
      is corrected.
      
      * jk/clone-unborn-head-in-bare:
        clone: handle unborn branch in bare repos
      c365967f
    • J
      Merge branch 'en/stash-df-fix' into maint · e61304f2
      Junio C Hamano 提交于
      "git stash", where the tentative change involves changing a
      directory to a file (or vice versa), was confused, which has been
      corrected.
      
      * en/stash-df-fix:
        stash: restore untracked files AFTER restoring tracked files
        stash: avoid feeding directories to update-index
        t3903: document a pair of directory/file bugs
      e61304f2
    • J
      Merge branch 'jk/strvec-typefix' into maint · 9cfc01e5
      Junio C Hamano 提交于
      Correct nr and alloc members of strvec struct to be of type size_t.
      
      * jk/strvec-typefix:
        strvec: use size_t to store nr and alloc
      9cfc01e5
    • J
      Merge branch 'en/am-abort-fix' into maint · b809c3d9
      Junio C Hamano 提交于
      When "git am --abort" fails to abort correctly, it still exited
      with exit status of 0, which has been corrected.
      
      * en/am-abort-fix:
        am: fix incorrect exit status on am fail to abort
        t4151: add a few am --abort tests
        git-am.txt: clarify --abort behavior
      b809c3d9
    • J
      Merge branch 'ps/update-ref-batch-flush' into maint · b5f309dc
      Junio C Hamano 提交于
      "git update-ref --stdin" failed to flush its output as needed,
      which potentially led the conversation to a deadlock.
      
      * ps/update-ref-batch-flush:
        t1400: avoid SIGPIPE race condition on fifo
        update-ref: fix streaming of status updates
      b5f309dc
    • J
      Merge branch 'rs/no-mode-to-open-when-appending' into maint · d64b99d3
      Junio C Hamano 提交于
      The "mode" word is useless in a call to open(2) that does not
      create a new file.  Such a call in the files backend of the ref
      subsystem has been cleaned up.
      
      * rs/no-mode-to-open-when-appending:
        refs/files-backend: remove unused open mode parameter
      d64b99d3
    • J
      Merge branch 'tb/pack-finalize-ordering' into maint · 62874602
      Junio C Hamano 提交于
      The order in which various files that make up a single (conceptual)
      packfile has been reevaluated and straightened up.  This matters in
      correctness, as an incomplete set of files must not be shown to a
      running Git.
      
      * tb/pack-finalize-ordering:
        pack-objects: rename .idx files into place after .bitmap files
        pack-write: split up finish_tmp_packfile() function
        builtin/index-pack.c: move `.idx` files into place last
        index-pack: refactor renaming in final()
        builtin/repack.c: move `.idx` files into place last
        pack-write.c: rename `.idx` files after `*.rev`
        pack-write: refactor renaming in finish_tmp_packfile()
        bulk-checkin.c: store checksum directly
        pack.h: line-wrap the definition of finish_tmp_packfile()
      62874602
    • J
      Merge branch 'rs/range-diff-avoid-segfault-with-I' into maint · 6aa501aa
      Junio C Hamano 提交于
      "git range-diff -I... <range> <range>" segfaulted, which has been
      corrected.
      
      * rs/range-diff-avoid-segfault-with-I:
        range-diff: avoid segfault with -I
      6aa501aa
    • J
      Merge branch 'ab/reverse-midx-optim' into maint · 79c887d2
      Junio C Hamano 提交于
      The code that optionally creates the *.rev reverse index file has
      been optimized to avoid needless computation when it is not writing
      the file out.
      
      * ab/reverse-midx-optim:
        pack-write: skip *.rev work when not writing *.rev
      79c887d2
    • J
      Merge branch 'jc/trivial-threeway-binary-merge' into maint · 62a7648a
      Junio C Hamano 提交于
      The "git apply -3" code path learned not to bother the lower level
      merge machinery when the three-way merge can be trivially resolved
      without the content level merge.
      
      * jc/trivial-threeway-binary-merge:
        apply: resolve trivial merge without hitting ll-merge with "--3way"
      62a7648a
    • J
      Merge branch 'ab/send-email-config-fix' into maint · 1af63244
      Junio C Hamano 提交于
      Regression fix.
      
      * ab/send-email-config-fix:
        send-email: fix a "first config key wins" regression in v2.33.0
      1af63244
    • J
      Merge branch 'so/diff-index-regression-fix' into maint · bf4ca3fd
      Junio C Hamano 提交于
      Recent "diff -m" changes broke "gitk", which has been corrected.
      
      * so/diff-index-regression-fix:
        diff-index: restore -c/--cc options handling
      bf4ca3fd
    • J
      Merge branch 'jk/log-warn-on-bogus-encoding' into maint · d9e26775
      Junio C Hamano 提交于
      Doc update plus improved error reporting.
      
      * jk/log-warn-on-bogus-encoding:
        docs: use "character encoding" to refer to commit-object encoding
        logmsg_reencode(): warn when iconv() fails
      d9e26775
    • J
      Merge branch 'tk/fast-export-anonymized-tag-fix' into maint · 48939c57
      Junio C Hamano 提交于
      The output from "git fast-export", when its anonymization feature
      is in use, showed an annotated tag incorrectly.
      
      * tk/fast-export-anonymized-tag-fix:
        fast-export: fix anonymized tag using original length
      48939c57
    • J
      Merge branch 'mh/send-email-reset-in-reply-to' into maint · f11b01bd
      Junio C Hamano 提交于
      Even when running "git send-email" without its own threaded
      discussion support, a threading related header in one message is
      carried over to the subsequent message to result in an unwanted
      threading, which has been corrected.
      
      * mh/send-email-reset-in-reply-to:
        send-email: avoid incorrect header propagation
      f11b01bd
    • J
      Merge branch 'sg/set-ceiling-during-tests' into maint · e4bea4a6
      Junio C Hamano 提交于
      Buggy tests could damage repositories outside the throw-away test
      area we created.  We now by default export GIT_CEILING_DIRECTORIES
      to limit the damage from such a stray test.
      
      * sg/set-ceiling-during-tests:
        test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repository
      e4bea4a6
    • J
      Merge branch 'jh/sparse-index-resize-fix' into maint · a45b8240
      Junio C Hamano 提交于
      The sparse-index support can corrupt the index structure by storing
      a stale and/or uninitialized data, which has been corrected.
      
      * jh/sparse-index-resize-fix:
        sparse-index: copy dir_hash in ensure_full_index()
      a45b8240
    • J
      Merge branch 'ka/want-ref-in-namespace' into maint · 0a5af02a
      Junio C Hamano 提交于
      "git upload-pack" which runs on the other side of "git fetch"
      forgot to take the ref namespaces into account when handling
      want-ref requests.
      
      * ka/want-ref-in-namespace:
        docs: clarify the interaction of transfer.hideRefs and namespaces
        upload-pack.c: treat want-ref relative to namespace
        t5730: introduce fetch command helper
      0a5af02a
    • J
      Merge branch 'sg/column-nl' into maint · 69247e28
      Junio C Hamano 提交于
      The parser for the "--nl" option of "git column" has been
      corrected.
      
      * sg/column-nl:
        column: fix parsing of the '--nl' option
      69247e28
    • J
      Merge branch 'cb/makefile-apple-clang' into maint · 689cfaf9
      Junio C Hamano 提交于
      Build update for Apple clang.
      
      * cb/makefile-apple-clang:
        build: catch clang that identifies itself as "$VENDOR clang"
        build: clang version may not be followed by extra words
        build: update detect-compiler for newer Xcode version
      689cfaf9
    • J
      Merge branch 'rs/branch-allow-deleting-dangling' into maint · 474e4f9b
      Junio C Hamano 提交于
      "git branch -D <branch>" used to refuse to remove a broken branch
      ref that points at a missing commit, which has been corrected.
      
      * rs/branch-allow-deleting-dangling:
        branch: allow deleting dangling branches with --force
      474e4f9b
    • J
      Merge branch 'mt/quiet-with-delayed-checkout' into maint · cd9a57f6
      Junio C Hamano 提交于
      The delayed checkout code path in "git checkout" etc. were chatty
      even when --quiet and/or --no-progress options were given.
      
      * mt/quiet-with-delayed-checkout:
        checkout: make delayed checkout respect --quiet and --no-progress
      cd9a57f6