This project is mirrored from https://github.com/git/git.git. Pull mirroring updated .
  1. 15 Jul, 2020 4 commits
  2. 13 Jul, 2020 7 commits
  3. 30 Jun, 2020 2 commits
  4. 25 Jun, 2020 10 commits
    • Junio C Hamano's avatar
      The fifth batch · f402ea68
      Junio C Hamano authored
      
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      f402ea68
    • Junio C Hamano's avatar
      Merge branch 'pb/t4014-unslave' · f33b5bdd
      Junio C Hamano authored
      A branch name used in a test has been clarified to match what is
      going on.
      
      * pb/t4014-unslave:
        t4014: do not use "slave branch" nomenclature
      f33b5bdd
    • Junio C Hamano's avatar
      Merge branch 'jt/cdn-offload' · 34e849b0
      Junio C Hamano authored
      The "fetch/clone" protocol has been updated to allow the server to
      instruct the clients to grab pre-packaged packfile(s) in addition
      to the packed object data coming over the wire.
      
      * jt/cdn-offload:
        upload-pack: fix a sparse '0 as NULL pointer' warning
        upload-pack: send part of packfile response as uri
        fetch-pack: support more than one pack lockfile
        upload-pack: refactor reading of pack-objects out
        Documentation: add Packfile URIs design doc
        Documentation: order protocol v2 sections
        http-fetch: support fetching packfiles by URL
        http-fetch: refactor into function
        http: refactor finish_http_pack_request()
        http: use --stdin when indexing dumb HTTP pack
      34e849b0
    • Junio C Hamano's avatar
      Merge branch 'ss/submodule-set-branch-in-c' · 10462829
      Junio C Hamano authored
      Rewrite of parts of the scripted "git submodule" Porcelain command
      continues; this time it is "git submodule set-branch" subcommand's
      turn.
      
      * ss/submodule-set-branch-in-c:
        submodule: port subcommand 'set-branch' from shell to C
      10462829
    • Junio C Hamano's avatar
      Merge branch 'ds/merge-base-is-ancestor-optim' · dc4b3cfb
      Junio C Hamano authored
      "git merge-base --is-ancestor" is taught to take advantage of the
      commit graph.
      
      * ds/merge-base-is-ancestor-optim:
        commit-reach: use fast logic in repo_in_merge_base
        commit-reach: create repo_is_descendant_of()
      dc4b3cfb
    • Junio C Hamano's avatar
      Merge branch 'dl/branch-cleanup' · 7b2685ef
      Junio C Hamano authored
      Code clean-up around "git branch" with a minor bugfix.
      
      * dl/branch-cleanup:
        branch: don't mix --edit-description
        t3200: test for specific errors
        t3200: rename "expected" to "expect"
      7b2685ef
    • Junio C Hamano's avatar
      Merge branch 'cc/upload-pack-data-3' · eb52351a
      Junio C Hamano authored
      Code clean-up in the codepath that serves "git fetch" continues.
      
      * cc/upload-pack-data-3:
        upload-pack: refactor common code into do_got_oid()
        upload-pack: move oldest_have to upload_pack_data
        upload-pack: pass upload_pack_data to got_oid()
        upload-pack: pass upload_pack_data to ok_to_give_up()
        upload-pack: pass upload_pack_data to send_acks()
        upload-pack: pass upload_pack_data to process_haves()
        upload-pack: change allow_unadvertised_object_request to an enum
        upload-pack: move allow_unadvertised_object_request to upload_pack_data
        upload-pack: move extra_edge_obj to upload_pack_data
        upload-pack: move shallow_nr to upload_pack_data
        upload-pack: pass upload_pack_data to send_unshallow()
        upload-pack: pass upload_pack_data to deepen_by_rev_list()
        upload-pack: pass upload_pack_data to deepen()
        upload-pack: pass upload_pack_data to send_shallow_list()
      eb52351a
    • Junio C Hamano's avatar
      Merge branch 'ct/diff-with-merge-base-clarification' · 1457886c
      Junio C Hamano authored
      "git diff" used to take arguments in random and nonsense range
      notation, e.g. "git diff A..B C", "git diff A..B C...D", etc.,
      which has been cleaned up.
      
      * ct/diff-with-merge-base-clarification:
        Documentation: usage for diff combined commits
        git diff: improve range handling
        t/t3430: avoid undefined git diff behavior
      1457886c
    • Junio C Hamano's avatar
      Merge branch 'en/clean-cleanups' · 53674699
      Junio C Hamano authored
      Code clean-up of "git clean" resulted in a fix of recent
      performance regression.
      
      * en/clean-cleanups:
        clean: optimize and document cases where we recurse into subdirectories
        clean: consolidate handling of ignored parameters
        dir, clean: avoid disallowed behavior
        dir: fix a few confusing comments
      53674699
    • Junio C Hamano's avatar
      Merge branch 'jk/complete-git-switch' · 32042184
      Junio C Hamano authored
      The command line completion (in contrib/) learned to complete
      options that the "git switch" command takes.
      
      * jk/complete-git-switch:
        completion: improve handling of --orphan option of switch/checkout
        completion: improve handling of -c/-C and -b/-B in switch/checkout
        completion: improve handling of --track in switch/checkout
        completion: improve handling of --detach in checkout
        completion: improve completion for git switch with no options
        completion: improve handling of DWIM mode for switch/checkout
        completion: perform DWIM logic directly in __git_complete_refs
        completion: extract function __git_dwim_remote_heads
        completion: replace overloaded track term for __git_complete_refs
        completion: add tests showing subpar switch/checkout --orphan logic
        completion: add tests showing subpar -c/C argument completion
        completion: add tests showing subpar -c/-C startpoint completion
        completion: add tests showing subpar switch/checkout --track logic
        completion: add tests showing subar checkout --detach logic
        completion: add tests showing subpar DWIM logic for switch/checkout
        completion: add test showing subpar git switch completion
      32042184
  5. 22 Jun, 2020 5 commits
    • Junio C Hamano's avatar
      The fourth batch · c9c318d6
      Junio C Hamano authored
      
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      c9c318d6
    • Junio C Hamano's avatar
      Merge branch 'en/sparse-with-submodule-doc' · 81be89e0
      Junio C Hamano authored
      The effect of sparse checkout settings on submodules is documented.
      
      * en/sparse-with-submodule-doc:
        git-sparse-checkout: clarify interactions with submodules
      81be89e0
    • Junio C Hamano's avatar
      Merge branch 'es/worktree-duplicate-paths' · 9740ef88
      Junio C Hamano authored
      The same worktree directory must be registered only once, but
      "git worktree move" allowed this invariant to be violated, which
      has been corrected.
      
      * es/worktree-duplicate-paths:
        worktree: make "move" refuse to move atop missing registered worktree
        worktree: generalize candidate worktree path validation
        worktree: prune linked worktree referencing main worktree path
        worktree: prune duplicate entries referencing same worktree path
        worktree: make high-level pruning re-usable
        worktree: give "should be pruned?" function more meaningful name
        worktree: factor out repeated string literal
      9740ef88
    • Junio C Hamano's avatar
      Merge branch 'jt/redact-all-cookies' · b8a52995
      Junio C Hamano authored
      The interface to redact sensitive information in the trace output
      has been simplified.
      
      * jt/redact-all-cookies:
        http: redact all cookies, teach GIT_TRACE_REDACT=0
      b8a52995
    • Junio C Hamano's avatar
      Merge branch 'cc/upload-pack-data-2' · 113f7349
      Junio C Hamano authored
      Further code clean-up.
      
      * cc/upload-pack-data-2:
        upload-pack: move pack_objects_hook to upload_pack_data
        upload-pack: move allow_sideband_all to upload_pack_data
        upload-pack: move allow_ref_in_want to upload_pack_data
        upload-pack: move allow_filter to upload_pack_data
        upload-pack: move keepalive to upload_pack_data
        upload-pack: pass upload_pack_data to upload_pack_config()
        upload-pack: change multi_ack to an enum
        upload-pack: move multi_ack to upload_pack_data
        upload-pack: move filter_capability_requested to upload_pack_data
        upload-pack: move use_sideband to upload_pack_data
        upload-pack: move static vars to upload_pack_data
        upload-pack: annotate upload_pack_data fields
        upload-pack: actually use some upload_pack_data bitfields
      113f7349
  6. 19 Jun, 2020 1 commit
    • Paolo Bonzini's avatar
      t4014: do not use "slave branch" nomenclature · 08dc2606
      Paolo Bonzini authored
      
      
      Git branches have been qualified as topic branches, integration branches,
      development branches, feature branches, release branches and so on.
      Git has a branch that is the master *for* development, but it is not
      the master *of* any "slave branch": Git does not have slave branches,
      and has never had, except for a single testcase that claims otherwise. :)
      
      Independent of any future change to the naming of the "master" branch,
      removing this sole appearance of the term is a strict improvement: it
      avoids divisive language, and talking about "feature branch" clarifies
      which developer workflow the test is trying to emulate.
      Reported-by: default avatarTill Maas <tmaas@redhat.com>
      Signed-off-by: Paolo Bonzini's avatarPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      08dc2606
  7. 18 Jun, 2020 11 commits