This project is mirrored from https://github.com/git/git. Updated .
  1. 15 Oct, 2019 18 commits
    • Junio C Hamano's avatar
      Ninth batch · 108b97dc
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      108b97dc
    • Junio C Hamano's avatar
      Merge branch 'jk/coc' · cbe8cdd3
      Junio C Hamano authored
      Code-of-conduct document.
      
      * jk/coc:
        CODE_OF_CONDUCT: mention individual project-leader emails
        add a Code of Conduct document
      cbe8cdd3
    • Junio C Hamano's avatar
      Merge branch 'js/trace2-fetch-push' · 3b9ec279
      Junio C Hamano authored
      Dev support.
      
      * js/trace2-fetch-push:
        transport: push codepath can take arbitrary repository
        push: add trace2 instrumentation
        fetch: add trace2 instrumentation
      3b9ec279
    • Junio C Hamano's avatar
      Merge branch 'jt/push-avoid-lazy-fetch' · c7d2cede
      Junio C Hamano authored
      Performance hack.
      
      * jt/push-avoid-lazy-fetch:
        send-pack: never fetch when checking exclusions
      c7d2cede
    • Junio C Hamano's avatar
      Merge branch 'dl/format-patch-doc-test-cleanup' · 1ef3bd36
      Junio C Hamano authored
      test cleanup.
      
      * dl/format-patch-doc-test-cleanup:
        t4014: treat rev-list output as the expected value
      1ef3bd36
    • Junio C Hamano's avatar
      Merge branch 'js/xdiffi-comment-updates' · eb3de5b8
      Junio C Hamano authored
      Comment update.
      
      * js/xdiffi-comment-updates:
        xdiffi: fix typos and touch up comments
      eb3de5b8
    • Junio C Hamano's avatar
      Merge branch 'dl/t0000-skip-test-test' · 4e8371ec
      Junio C Hamano authored
      test update.
      
      * dl/t0000-skip-test-test:
        t0000: cover GIT_SKIP_TESTS blindspots
      4e8371ec
    • Junio C Hamano's avatar
      Merge branch 'tg/range-diff-output-update' · b6d712fa
      Junio C Hamano authored
      "git range-diff" failed to handle mode-only change, which has been
      corrected.
      
      * tg/range-diff-output-update:
        range-diff: don't segfault with mode-only changes
      b6d712fa
    • Junio C Hamano's avatar
      Merge branch 'gs/sq-quote-buf-pretty' · 77458870
      Junio C Hamano authored
      Pretty-printed command line formatter (used in e.g. reporting the
      command being run by the tracing API) had a bug that lost an
      argument that is an empty string, which has been corrected.
      
      * gs/sq-quote-buf-pretty:
        sq_quote_buf_pretty: don't drop empty arguments
      77458870
    • Junio C Hamano's avatar
      Merge branch 'ew/hashmap' · 5efabc7e
      Junio C Hamano authored
      Code clean-up of the hashmap API, both users and implementation.
      
      * ew/hashmap:
        hashmap_entry: remove first member requirement from docs
        hashmap: remove type arg from hashmap_{get,put,remove}_entry
        OFFSETOF_VAR macro to simplify hashmap iterators
        hashmap: introduce hashmap_free_entries
        hashmap: hashmap_{put,remove} return hashmap_entry *
        hashmap: use *_entry APIs for iteration
        hashmap_cmp_fn takes hashmap_entry params
        hashmap_get{,_from_hash} return "struct hashmap_entry *"
        hashmap: use *_entry APIs to wrap container_of
        hashmap_get_next returns "struct hashmap_entry *"
        introduce container_of macro
        hashmap_put takes "struct hashmap_entry *"
        hashmap_remove takes "const struct hashmap_entry *"
        hashmap_get takes "const struct hashmap_entry *"
        hashmap_add takes "struct hashmap_entry *"
        hashmap_get_next takes "const struct hashmap_entry *"
        hashmap_entry_init takes "struct hashmap_entry *"
        packfile: use hashmap_entry in delta_base_cache_entry
        coccicheck: detect hashmap_entry.hash assignment
        diff: use hashmap_entry_init on moved_entry.ent
      5efabc7e
    • Junio C Hamano's avatar
      Merge branch 'js/trace2-cap-max-output-files' · d0ce4d90
      Junio C Hamano authored
      The trace2 output, when sending them to files in a designated
      directory, can populate the directory with too many files; a
      mechanism is introduced to set the maximum number of files and
      discard further logs when the maximum is reached.
      
      * js/trace2-cap-max-output-files:
        trace2: write discard message to sentinel files
        trace2: discard new traces if target directory has too many files
        docs: clarify trace2 version invariants
        docs: mention trace2 target-dir mode in git-config
      d0ce4d90
    • Junio C Hamano's avatar
      Merge branch 'am/t0028-utf16-tests' · 6ed610b9
      Junio C Hamano authored
      Test fixes.
      
      * am/t0028-utf16-tests:
        t0028: add more tests
        t0028: fix test for UTF-16-LE-BOM
      6ed610b9
    • Junio C Hamano's avatar
      Merge branch 'dl/octopus-graph-bug' · 5b900fb8
      Junio C Hamano authored
      "git log --graph" for an octopus merge is sometimes colored
      incorrectly, which is demonstrated and documented but not yet
      fixed.
      
      * dl/octopus-graph-bug:
        t4214: demonstrate octopus graph coloring failure
        t4214: explicitly list tags in log
        t4214: generate expect in their own test cases
        t4214: use test_merge
        test-lib: let test_merge() perform octopus merges
      5b900fb8
    • Junio C Hamano's avatar
      Merge branch 'en/fast-imexport-nested-tags' · 16d9d718
      Junio C Hamano authored
      Updates to fast-import/export.
      
      * en/fast-imexport-nested-tags:
        fast-export: handle nested tags
        t9350: add tests for tags of things other than a commit
        fast-export: allow user to request tags be marked with --mark-tags
        fast-export: add support for --import-marks-if-exists
        fast-import: add support for new 'alias' command
        fast-import: allow tags to be identified by mark labels
        fast-import: fix handling of deleted tags
        fast-export: fix exporting a tag and nothing else
      16d9d718
    • Junio C Hamano's avatar
      Merge branch 'js/azure-pipelines-msvc' · 6d5291be
      Junio C Hamano authored
      CI updates.
      
      * js/azure-pipelines-msvc:
        ci: also build and test with MS Visual Studio on Azure Pipelines
        ci: really use shallow clones on Azure Pipelines
        tests: let --immediate and --write-junit-xml play well together
        test-tool run-command: learn to run (parts of) the testsuite
        vcxproj: include more generated files
        vcxproj: only copy `git-remote-http.exe` once it was built
        msvc: work around a bug in GetEnvironmentVariable()
        msvc: handle DEVELOPER=1
        msvc: ignore some libraries when linking
        compat/win32/path-utils.h: add #include guards
        winansi: use FLEX_ARRAY to avoid compiler warning
        msvc: avoid using minus operator on unsigned types
        push: do not pretend to return `int` from `die_push_simple()`
      6d5291be
    • Junio C Hamano's avatar
      Merge branch 'gs/commit-graph-trace-with-cmd' · ccc28991
      Junio C Hamano authored
      Dev support.
      
      * gs/commit-graph-trace-with-cmd:
        commit-graph: emit trace2 cmd_mode for each sub-command
      ccc28991
    • Junio C Hamano's avatar
      Merge branch 'js/fetch-jobs' · d96e31e3
      Junio C Hamano authored
      "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching
      submodules, but this did not apply to "git fetch --multiple" that
      fetches from multiple remote repositories.  It now does.
      
      * js/fetch-jobs:
        fetch: let --jobs=<n> parallelize --multiple, too
      d96e31e3
    • Junio C Hamano's avatar
      Merge branch 'en/merge-recursive-cleanup' · 280bd445
      Junio C Hamano authored
      The merge-recursive machiery is one of the most complex parts of
      the system that accumulated cruft over time.  This large series
      cleans up the implementation quite a bit.
      
      * en/merge-recursive-cleanup: (26 commits)
        merge-recursive: fix the fix to the diff3 common ancestor label
        merge-recursive: fix the diff3 common ancestor label for virtual commits
        merge-recursive: alphabetize include list
        merge-recursive: add sanity checks for relevant merge_options
        merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
        merge-recursive: split internal fields into a separate struct
        merge-recursive: avoid losing output and leaking memory holding that output
        merge-recursive: comment and reorder the merge_options fields
        merge-recursive: consolidate unnecessary fields in merge_options
        merge-recursive: move some definitions around to clean up the header
        merge-recursive: rename merge_options argument to opt in header
        merge-recursive: rename 'mrtree' to 'result_tree', for clarity
        merge-recursive: use common name for ancestors/common/base_list
        merge-recursive: fix some overly long lines
        cache-tree: share code between functions writing an index as a tree
        merge-recursive: don't force external callers to do our logging
        merge-recursive: remove useless parameter in merge_trees()
        merge-recursive: exit early if index != head
        Ensure index matches head before invoking merge machinery, round N
        merge-recursive: remove another implicit dependency on the_repository
        ...
      280bd445
  2. 11 Oct, 2019 12 commits
    • Junio C Hamano's avatar
      Eighth batch · 08da6496
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      08da6496
    • Junio C Hamano's avatar
      Merge branch 'dl/rev-list-doc-cleanup' · 07f25ad8
      Junio C Hamano authored
      Doc update.
      
      * dl/rev-list-doc-cleanup:
        git-rev-list.txt: prune options in synopsis
      07f25ad8
    • Junio C Hamano's avatar
      Merge branch 'kt/add-i-progress' · f0d407e6
      Junio C Hamano authored
      "git add -i" has been taught to show the total number of hunks and
      the hunks that has been processed so far when showing prompts.
      
      * kt/add-i-progress:
        add -i: show progress counter in the prompt
      f0d407e6
    • Junio C Hamano's avatar
      Merge branch 'js/stash-apply-in-secondary-worktree' · 66102cfa
      Junio C Hamano authored
      "git stash apply" in a subdirectory of a secondary worktree failed
      to access the worktree correctly, which has been corrected.
      
      * js/stash-apply-in-secondary-worktree:
        stash apply: report status correctly even in a worktree's subdirectory
      66102cfa
    • Junio C Hamano's avatar
      Merge branch 'rs/dedup-includes' · a4c5d9f6
      Junio C Hamano authored
      Code cleanup.
      
      * rs/dedup-includes:
        treewide: remove duplicate #include directives
      a4c5d9f6
    • Junio C Hamano's avatar
      Merge branch 'js/range-diff-noprefix' · 159cdabd
      Junio C Hamano authored
      "git range-diff" segfaulted when diff.noprefix configuration was
      used, as it blindly expected the patch it internally generates to
      have the standard a/ and b/ prefixes.  The command now forces the
      internal patch to be built without any prefix, not to be affected
      by any end-user configuration.
      
      * js/range-diff-noprefix:
        range-diff: internally force `diff.noprefix=true`
      159cdabd
    • Junio C Hamano's avatar
      Merge branch 'cb/pcre1-cleanup' · 93424f1f
      Junio C Hamano authored
      PCRE fixes.
      
      * cb/pcre1-cleanup:
        grep: refactor and simplify PCRE1 support
        grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1
      93424f1f
    • Junio C Hamano's avatar
      Merge branch 'ab/pcre-jit-fixes' · a73f9177
      Junio C Hamano authored
      A few simplification and bugfixes to PCRE interface.
      
      * ab/pcre-jit-fixes:
        grep: under --debug, show whether PCRE JIT is enabled
        grep: do not enter PCRE2_UTF mode on fixed matching
        grep: stess test PCRE v2 on invalid UTF-8 data
        grep: create a "is_fixed" member in "grep_pat"
        grep: consistently use "p->fixed" in compile_regexp()
        grep: stop using a custom JIT stack with PCRE v1
        grep: stop "using" a custom JIT stack with PCRE v2
        grep: remove overly paranoid BUG(...) code
        grep: use PCRE v2 for optimized fixed-string search
        grep: remove the kwset optimization
        grep: drop support for \0 in --fixed-strings <pattern>
        grep: make the behavior for NUL-byte in patterns sane
        grep tests: move binary pattern tests into their own file
        grep tests: move "grep binary" alongside the rest
        grep: inline the return value of a function call used only once
        t4210: skip more command-line encoding tests on MinGW
        grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
        log tests: test regex backends in "--encode=<enc>" tests
      a73f9177
    • Junio C Hamano's avatar
      Merge branch 'pw/rebase-i-show-HEAD-to-reword' · 4608a029
      Junio C Hamano authored
      "git rebase -i" showed a wrong HEAD while "reword" open the editor.
      
      * pw/rebase-i-show-HEAD-to-reword:
        sequencer: simplify root commit creation
        rebase -i: check for updated todo after squash and reword
        rebase -i: always update HEAD before rewording
      4608a029
    • Junio C Hamano's avatar
      Merge branch 'tk/git-svn-trim-author-name' · 020011f2
      Junio C Hamano authored
      The author names taken from SVN repositories may have extra leading
      or trailing whitespaces, which are now munged away.
      
      * tk/git-svn-trim-author-name:
        git-svn: trim leading and trailing whitespaces in author name
      020011f2
    • Junio C Hamano's avatar
      Merge branch 'bc/object-id-part17' · 676278f8
      Junio C Hamano authored
      Preparation for SHA-256 upgrade continues.
      
      * bc/object-id-part17: (26 commits)
        midx: switch to using the_hash_algo
        builtin/show-index: replace sha1_to_hex
        rerere: replace sha1_to_hex
        builtin/receive-pack: replace sha1_to_hex
        builtin/index-pack: replace sha1_to_hex
        packfile: replace sha1_to_hex
        wt-status: convert struct wt_status to object_id
        cache: remove null_sha1
        builtin/worktree: switch null_sha1 to null_oid
        builtin/repack: write object IDs of the proper length
        pack-write: use hash_to_hex when writing checksums
        sequencer: convert to use the_hash_algo
        bisect: switch to using the_hash_algo
        sha1-lookup: switch hard-coded constants to the_hash_algo
        config: use the_hash_algo in abbrev comparison
        combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
        bundle: switch to use the_hash_algo
        connected: switch GIT_SHA1_HEXSZ to the_hash_algo
        show-index: switch hard-coded constants to the_hash_algo
        blame: remove needless comparison with GIT_SHA1_HEXSZ
        ...
      676278f8
    • Junio C Hamano's avatar
      Merge branch 'en/clean-nested-with-ignored' · aafb7545
      Junio C Hamano authored
      "git clean" fixes.
      
      * en/clean-nested-with-ignored:
        dir: special case check for the possibility that pathspec is NULL
        clean: fix theoretical path corruption
        clean: rewrap overly long line
        clean: avoid removing untracked files in a nested git repository
        clean: disambiguate the definition of -d
        git-clean.txt: do not claim we will delete files with -n/--dry-run
        dir: add commentary explaining match_pathspec_item's return value
        dir: if our pathspec might match files under a dir, recurse into it
        dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
        dir: also check directories for matching pathspecs
        dir: fix off-by-one error in match_pathspec_item
        dir: fix typo in comment
        t7300: add testcases showing failure to clean specified pathspecs
      aafb7545
  3. 10 Oct, 2019 2 commits
  4. 09 Oct, 2019 8 commits