1. 07 Mar, 2019 25 commits
    • Junio C Hamano's avatar
      Start 2.22 cycle · 6e0cc677
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      6e0cc677
    • Junio C Hamano's avatar
      Merge branch 'jt/http-auth-proto-v2-fix' · c42c664a
      Junio C Hamano authored
      Unify RPC code for smart http in protocol v0/v1 and v2, which fixes
      a bug in the latter (lack of authentication retry) and generally
      improves the code base.
      
      * jt/http-auth-proto-v2-fix:
        remote-curl: use post_rpc() for protocol v2 also
        remote-curl: refactor reading into rpc_state's buf
        remote-curl: reduce scope of rpc_state.result
        remote-curl: reduce scope of rpc_state.stdin_preamble
        remote-curl: reduce scope of rpc_state.argv
      c42c664a
    • Junio C Hamano's avatar
      Merge branch 'jk/diff-no-index-initialize' · 12e5bdd9
      Junio C Hamano authored
      "git diff --no-index" may still want to access Git goodies like
      --ext-diff and --textconv, but so far these have been ignored,
      which has been corrected.
      
      * jk/diff-no-index-initialize:
        diff: reuse diff setup for --no-index case
      12e5bdd9
    • Junio C Hamano's avatar
      Merge branch 'nd/no-more-check-racy' · 68731c7e
      Junio C Hamano authored
      Unused code removal.
      
      * nd/no-more-check-racy:
        Delete check-racy.c
      68731c7e
    • Junio C Hamano's avatar
      Merge branch 'rd/doc-hook-used-in-sample' · 1c6036b6
      Junio C Hamano authored
      Doc update.
      
      * rd/doc-hook-used-in-sample:
        mention use of "hooks.allownonascii" in "man githooks"
      1c6036b6
    • Junio C Hamano's avatar
      Merge branch 'nd/diff-parseopt-2' · 4ab0f138
      Junio C Hamano authored
      Second batch to teach the diff machinery to use the parse-options
      API.
      
      * nd/diff-parseopt-2: (21 commits)
        diff-parseopt: convert --ignore-some-changes
        diff-parseopt: convert --[no-]minimal
        diff-parseopt: convert --relative
        diff-parseopt: convert --no-renames|--[no--rename-empty
        diff-parseopt: convert --find-copies-harder
        diff-parseopt: convert -C|--find-copies
        diff-parseopt: convert -D|--irreversible-delete
        diff-parseopt: convert -M|--find-renames
        diff-parseopt: convert -B|--break-rewrites
        diff-parseopt: convert --output-*
        diff-parseopt: convert --[no-]compact-summary
        diff-parseopt: convert --stat*
        diff-parseopt: convert -s|--no-patch
        diff-parseopt: convert --name-status
        diff-parseopt: convert --name-only
        diff-parseopt: convert --patch-with-stat
        diff-parseopt: convert --summary
        diff-parseopt: convert --check
        diff-parseopt: convert --dirstat and friends
        diff-parseopt: convert --numstat and --shortstat
        ...
      4ab0f138
    • Junio C Hamano's avatar
      Merge branch 'en/merge-options-doc' · 082c15ad
      Junio C Hamano authored
      Doc update.
      
      * en/merge-options-doc:
        merge-options.txt: correct wording of --no-commit option
      082c15ad
    • Junio C Hamano's avatar
      Merge branch 'nd/completion-more-parameters' · b0e7fb2e
      Junio C Hamano authored
      The command line completion (in contrib/) has been taught to
      complete more subcommand parameters.
      
      * nd/completion-more-parameters:
        completion: add more parameter value completion
      b0e7fb2e
    • Junio C Hamano's avatar
      Merge branch 'ab/receive-pack-use-after-free-fix' · 4751a167
      Junio C Hamano authored
      Memfix.
      
      * ab/receive-pack-use-after-free-fix:
        receive-pack: fix use-after-free bug
      4751a167
    • Junio C Hamano's avatar
      Merge branch 'dl/doc-submodule-wo-subcommand' · c388c12c
      Junio C Hamano authored
      Doc update.
      
      * dl/doc-submodule-wo-subcommand:
        submodule: document default behavior
      c388c12c
    • Junio C Hamano's avatar
      Merge branch 'jk/unused-params' · 1dc2f8c1
      Junio C Hamano authored
      Code clean-up.
      
      * jk/unused-params:
        ref-filter: drop unused "sz" parameters
        ref-filter: drop unused "obj" parameters
        ref-filter: drop unused buf/sz pairs
        files-backend: drop refs parameter from split_symref_update()
        pack-objects: drop unused parameter from oe_map_new_pack()
        merge-recursive: drop several unused parameters
        diff: drop complete_rewrite parameter from run_external_diff()
        diff: drop unused emit data parameter from sane_truncate_line()
        diff: drop unused color reset parameters
        diff: drop options parameter from diffcore_fix_diff_index()
      1dc2f8c1
    • Junio C Hamano's avatar
      Merge branch 'jk/prune-optim' · f7213a3d
      Junio C Hamano authored
      "git prune" has been taught to take advantage of reachability
      bitmap when able.
      
      * jk/prune-optim:
        t5304: rename "sha1" variables to "oid"
        prune: check SEEN flag for reachability
        prune: use bitmaps for reachability traversal
        prune: lazily perform reachability traversal
      f7213a3d
    • Junio C Hamano's avatar
      Merge branch 'jh/trace2' · 32038fef
      Junio C Hamano authored
      A more structured way to obtain execution trace has been added.
      
      * jh/trace2:
        trace2: add for_each macros to clang-format
        trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
        trace2:data: add subverb for rebase
        trace2:data: add subverb to reset command
        trace2:data: add subverb to checkout command
        trace2:data: pack-objects: add trace2 regions
        trace2:data: add trace2 instrumentation to index read/write
        trace2:data: add trace2 hook classification
        trace2:data: add trace2 transport child classification
        trace2:data: add trace2 sub-process classification
        trace2:data: add editor/pager child classification
        trace2:data: add trace2 regions to wt-status
        trace2: collect Windows-specific process information
        trace2: create new combined trace facility
        trace2: Documentation/technical/api-trace2.txt
      32038fef
    • Junio C Hamano's avatar
      Merge branch 'js/doc-symref-in-proto-v1' · 47e1019e
      Junio C Hamano authored
      Doc update.
      
      * js/doc-symref-in-proto-v1:
        protocol-capabilities.txt: document symref
      47e1019e
    • Junio C Hamano's avatar
      Merge branch 'nd/split-index-null-base-fix' · 0efa3d74
      Junio C Hamano authored
      Split-index fix.
      
      * nd/split-index-null-base-fix:
        read-cache.c: fix writing "link" index ext with null base oid
      0efa3d74
    • Junio C Hamano's avatar
      Merge branch 'rj/prune-packed-excess-args' · ebf846c0
      Junio C Hamano authored
      "git prune-packed" did not notice and complain against excess
      arguments given from the command line, which now it does.
      
      * rj/prune-packed-excess-args:
        prune-packed: check for too many arguments
      ebf846c0
    • Junio C Hamano's avatar
      Merge branch 'jc/test-yes-doc' · 19ea7228
      Junio C Hamano authored
      Test doc update.
      
      * jc/test-yes-doc:
        test: caution on our version of 'yes'
      19ea7228
    • Junio C Hamano's avatar
      Merge branch 'en/combined-all-paths' · c425d361
      Junio C Hamano authored
      Output from "diff --cc" did not show the original paths when the
      merge involved renames.  A new option adds the paths in the
      original trees to the output.
      
      * en/combined-all-paths:
        log,diff-tree: add --combined-all-paths option
      c425d361
    • Junio C Hamano's avatar
      Merge branch 'sc/pack-redundant' · cf0879f7
      Junio C Hamano authored
      Update the implementation of pack-redundant for performance in a
      repository with many packfiles.
      
      * sc/pack-redundant:
        pack-redundant: consistent sort method
        pack-redundant: rename pack_list.all_objects
        pack-redundant: new algorithm to find min packs
        pack-redundant: delete redundant code
        pack-redundant: delay creation of unique_objects
        t5323: test cases for git-pack-redundant
      cf0879f7
    • Junio C Hamano's avatar
      Merge branch 'du/branch-show-current' · 3710f60a
      Junio C Hamano authored
      "git branch" learned a new subcommand "--show-current".
      
      * du/branch-show-current:
        branch: introduce --show-current display option
      3710f60a
    • Junio C Hamano's avatar
      Merge branch 'dl/complete-submodule-absorbgitdirs' · 26e3ddcd
      Junio C Hamano authored
      Command-line completion (in contrib/) learned to tab-complete the
      "git submodule absorbgitdirs" subcommand.
      
      * dl/complete-submodule-absorbgitdirs:
        completion: complete git submodule absorbgitdirs
      26e3ddcd
    • Junio C Hamano's avatar
      Merge branch 'wh/author-committer-ident-config' · 4e021dc2
      Junio C Hamano authored
      Four new configuration variables {author,committer}.{name,email}
      have been introduced to override user.{name,email} in more specific
      cases.
      
      * wh/author-committer-ident-config:
        config: allow giving separate author and committer idents
      4e021dc2
    • Junio C Hamano's avatar
      Merge branch 'aw/pretty-trailers' · 42977bf5
      Junio C Hamano authored
      The %(trailers) formatter in "git log --format=..."  now allows to
      optionally pick trailers selectively by keyword, show only values,
      etc.
      
      * aw/pretty-trailers:
        pretty: add support for separator option in %(trailers)
        strbuf: separate callback for strbuf_expand:ing literals
        pretty: add support for "valueonly" option in %(trailers)
        pretty: allow showing specific trailers
        pretty: single return path in %(trailers) handling
        pretty: allow %(trailers) options with explicit value
        doc: group pretty-format.txt placeholders descriptions
      42977bf5
    • Junio C Hamano's avatar
      Merge branch 'nd/diff-parseopt' · 54b469b9
      Junio C Hamano authored
      The diff machinery, one of the oldest parts of the system, which
      long predates the parse-options API, uses fairly long and complex
      handcrafted option parser.  This is being rewritten to use the
      parse-options API.
      
      * nd/diff-parseopt:
        diff.c: convert --raw
        diff.c: convert -W|--[no-]function-context
        diff.c: convert -U|--unified
        diff.c: convert -u|-p|--patch
        diff.c: prepare to use parse_options() for parsing
        diff.h: avoid bit fields in struct diff_flags
        diff.h: keep forward struct declarations sorted
        parse-options: allow ll_callback with OPTION_CALLBACK
        parse-options: avoid magic return codes
        parse-options: stop abusing 'callback' for lowlevel callbacks
        parse-options: add OPT_BITOP()
        parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
        parse-options: add one-shot mode
        parse-options.h: remove extern on function prototypes
      54b469b9
    • Junio C Hamano's avatar
      Merge branch 'tg/checkout-no-overlay' · 7d0c1f45
      Junio C Hamano authored
      "git checkout --no-overlay" can be used to trigger a new mode of
      checking out paths out of the tree-ish, that allows paths that
      match the pathspec that are in the current index and working tree
      and are not in the tree-ish.
      
      * tg/checkout-no-overlay:
        revert "checkout: introduce checkout.overlayMode config"
        checkout: introduce checkout.overlayMode config
        checkout: introduce --{,no-}overlay option
        checkout: factor out mark_cache_entry_for_checkout function
        checkout: clarify comment
        read-cache: add invalidate parameter to remove_marked_cache_entries
        entry: support CE_WT_REMOVE flag in checkout_entry
        entry: factor out unlink_entry function
        move worktree tests to t24*
      7d0c1f45
  2. 05 Mar, 2019 1 commit
  3. 03 Mar, 2019 1 commit
    • Jonathan Tan's avatar
      remote-curl: use post_rpc() for protocol v2 also · a97d0079
      Jonathan Tan authored
      When transmitting and receiving POSTs for protocol v0 and v1,
      remote-curl uses post_rpc() (and associated functions), but when doing
      the same for protocol v2, it uses a separate set of functions
      (proxy_rpc() and others). Besides duplication of code, this has caused
      at least one bug: the auth retry mechanism that was implemented in v0/v1
      was not implemented in v2.
      
      To fix this issue and avoid it in the future, make remote-curl also use
      post_rpc() when handling protocol v2. Because line lengths are written
      to the HTTP request in protocol v2 (unlike in protocol v0/v1), this
      necessitates changes in post_rpc() and some of the functions it uses;
      perform these changes too.
      
      A test has been included to ensure that the code for both the unchunked
      and chunked variants of the HTTP request is exercised.
      
      Note: stateless_connect() has been updated to use the lower-level packet
      reading functions instead of struct packet_reader. The low-level control
      is necessary here because we cannot change the destination buffer of
      struct packet_reader while it is being used; struct packet_buffer has a
      peeking mechanism which relies on the destination buffer being present
      in between a peek and a read.
      Signed-off-by: default avatarJonathan Tan <jonathantanmy@google.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      a97d0079
  4. 02 Mar, 2019 1 commit
  5. 01 Mar, 2019 1 commit
  6. 26 Feb, 2019 1 commit
  7. 24 Feb, 2019 6 commits
    • Junio C Hamano's avatar
      Git 2.21 · 8104ec99
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      8104ec99
    • Junio C Hamano's avatar
      Merge branch 'yn/checkout-doc-fix' · 572e460b
      Junio C Hamano authored
      Doc fix.
      
      * yn/checkout-doc-fix:
        checkout doc: fix an unmatched double-quote pair
      572e460b
    • Jeff King's avatar
      diff: reuse diff setup for --no-index case · 287ab28b
      Jeff King authored
      When "--no-index" is in effect (or implied by the arguments), git-diff
      jumps early to a special code path to perform that diff. This means we
      miss out on some settings like enabling --ext-diff and --textconv by
      default.
      
      Let's jump to the no-index path _after_ we've done more setup on
      rev.diffopt. Since some of the options don't affect us (e.g., items
      related to the index), let's re-order the setup into two blocks (see the
      in-code comments).
      
      Note that we also need to stop re-initializing the diffopt struct in
      diff_no_index(). This should not be necessary, as it will already have
      been initialized by cmd_diff() (and there are no other callers). That in
      turn lets us drop the "repository" argument from diff_no_index (which
      never made much sense, since the whole point is that you don't need a
      repository).
      Signed-off-by: default avatarJeff King <peff@peff.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      287ab28b
    • Junio C Hamano's avatar
      Merge tag 'l10n-2.21.0-rnd2' of git://github.com/git-l10n/git-po · a1997dad
      Junio C Hamano authored
      l10n-2.21.0-rnd2
      
      * tag 'l10n-2.21.0-rnd2' of git://github.com/git-l10n/git-po:
        l10n: bg.po: Updated Bulgarian translation (4363t)
        l10n: update German translation
        l10n: zh_CN: Revision for git v2.21.0 l10n
        l10n: zh_CN: for git v2.21.0 l10n round 1~2
        l10n: bg.po: correct typo
        l10n: Update Swedish translation (4363t0f0u)
        l10n: de.po: fix grammar in message for tag.c
        l10n: de.po: fix a message for index-pack.c
        l10n: de.po: consistent translation of 'root commit'
        l10n: it: update the Italian translation
        l10n: es: 2.21.0 round 2
        l10n: el: add Greek l10n team and essential translations
        l10n: fr.po v2.21.0 rnd 2
        l10n: fr.po Fix some typos from round3
        l10n: fr.po Fix some typos
        l10n: Fixes to Catalan translation
        l10n: git.pot: v2.21.0 round 2 (3 new, 3 removed)
        l10n: git.pot: v2.21.0 round 1 (214 new, 38 removed)
        l10n: zh_CN: fix typo of submodule init message
        l10n: Update Catalan translation
      a1997dad
    • Johannes Schindelin's avatar
      README: adjust for final Azure Pipeline ID · 39ffebd2
      Johannes Schindelin authored
      During the six months of development of the Azure Pipelines support, the
      patches went through quite a few iterations of changes, and to test
      those iterations, a temporary build definition was used.
      
      In the meantime, Azure Pipelines support made it to `master`, and we now
      have a regular Azure Pipeline, installed via the common GitHub App
      workflow. This new pipeline has a different name (git.git instead of
      test-git.git), and a new ID (11 instead of 2).
      
      Let's adjust the badge in our README to reflect that final shape of the
      Azure Pipeline.
      Signed-off-by: Johannes Schindelin's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      39ffebd2
    • Yoichi NAKAYAMA's avatar
  8. 23 Feb, 2019 3 commits
  9. 22 Feb, 2019 1 commit