Skip to content
Permalink
Branch: did-git-impl-s…
Commits on Aug 5, 2019
Commits on Jun 21, 2019
  1. The third batch

    gitster committed Jun 21, 2019
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'mo/clang-format-for-each-update'

    gitster committed Jun 21, 2019
    The list of for-each like macros used by clang-format has been
    updated.
    
    * mo/clang-format-for-each-update:
      clang-format: use git grep to generate the ForEachMacros list
  3. Merge branch 'md/url-parse-harden'

    gitster committed Jun 21, 2019
    The URL decoding code has been updated to avoid going past the end
    of the string while parsing %-<hex>-<hex> sequence.
    
    * md/url-parse-harden:
      url: do not allow %00 to represent NUL in URLs
      url: do not read past end of buffer
  4. Merge branch 'an/ignore-doc-update'

    gitster committed Jun 21, 2019
    The description about slashes in gitignore patterns (used to
    indicate things like "anchored to this level only" and "only
    matches directories") has been revamped.
    
    * an/ignore-doc-update:
      gitignore.txt: make slash-rules more readable
  5. Merge branch 'ab/hash-object-doc'

    gitster committed Jun 21, 2019
    Doc update.
    
    * ab/hash-object-doc:
      hash-object doc: stop mentioning git-cvsimport
  6. Merge branch 'cm/send-email-document-req-modules'

    gitster committed Jun 21, 2019
    A doc update.
    
    * cm/send-email-document-req-modules:
      send-email: update documentation of required Perl modules
  7. Merge branch 'md/list-objects-filter-parse-msgfix'

    gitster committed Jun 21, 2019
    Make an end-user facing message localizable.
    
    * md/list-objects-filter-parse-msgfix:
      list-objects-filter-options: error is localizeable
  8. Merge branch 'md/list-objects-filter-memfix'

    gitster committed Jun 21, 2019
    The filter_data used in the list-objects-filter (which manages a
    lazily sparse clone repository) did not use the dynamic array API
    correctly---'nr' is supposed to point at one past the last element
    of the array in use.  This has been corrected.
    
    * md/list-objects-filter-memfix:
      list-objects-filter: correct usage of ALLOC_GROW
  9. Merge branch 'jt/partial-clone-missing-ref-delta-base'

    gitster committed Jun 21, 2019
    "git fetch" into a lazy clone forgot to fetch base objects that are
    necessary to complete delta in a thin packfile, which has been
    corrected.
    
    * jt/partial-clone-missing-ref-delta-base:
      t5616: cover case of client having delta base
      t5616: use correct flag to check object is missing
      index-pack: prefetch missing REF_DELTA bases
      t5616: refactor packfile replacement
  10. Merge branch 'ml/userdiff-rust'

    gitster committed Jun 21, 2019
    The pattern "git diff/grep" use to extract funcname and words
    boundary for Rust has been added.
    
    * ml/userdiff-rust:
      userdiff: two simplifications of patterns for rust
      userdiff: add built-in pattern for rust
Commits on Jun 17, 2019
  1. The second batch

    gitster committed Jun 17, 2019
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'xl/record-partial-clone-origin'

    gitster committed Jun 17, 2019
    When creating a partial clone, the object filtering criteria is
    recorded for the origin of the clone, but this incorrectly used a
    hardcoded name "origin" to name that remote; it has been corrected
    to honor the "--origin <name>" option.
    
    * xl/record-partial-clone-origin:
      clone: respect user supplied origin name when setting up partial clone
  3. Merge branch 'pb/request-pull-verify-remote-ref'

    gitster committed Jun 17, 2019
    "git request-pull" learned to warn when the ref we ask them to pull
    from in the local repository and in the published repository are
    different.
    
    * pb/request-pull-verify-remote-ref:
      request-pull: warn if the remote object is not the same as the local one
      request-pull: quote regex metacharacters in local ref
  4. Merge branch 'mm/p4-unshelve-windows-fix'

    gitster committed Jun 17, 2019
    The command line to invoke a "git cat-file" command from inside
    "git p4" was not properly quoted to protect a caret and running a
    broken command on Windows, which has been corrected.
    
    * mm/p4-unshelve-windows-fix:
      p4 unshelve: fix "Not a valid object name HEAD0" on Windows
  5. Merge branch 'po/git-help-on-git-itself'

    gitster committed Jun 17, 2019
    "git help git" was hard to discover (well, at least for some
    people).
    
    * po/git-help-on-git-itself:
      Doc: git.txt: remove backticks from link and add git-scm.com/docs
      git.c: show usage for accessing the git(1) help page
  6. Merge branch 'es/first-contrib-tutorial'

    gitster committed Jun 17, 2019
    A new tutorial targetting specifically aspiring git-core
    developers.
    
    * es/first-contrib-tutorial:
      doc: add some nit fixes to MyFirstContribution
      documentation: add anchors to MyFirstContribution
      documentation: add tutorial for first contribution
  7. Merge branch 'bb/unicode-12.1-reiwa'

    gitster committed Jun 17, 2019
    Update to Unicode 12.1 width table.
    
    * bb/unicode-12.1-reiwa:
      unicode: update the width tables to Unicode 12.1
  8. Merge branch 'sw/git-p4-unshelve-branched-files'

    gitster committed Jun 17, 2019
    "git p4" update.
    
    * sw/git-p4-unshelve-branched-files:
      git-p4: allow unshelving of branched files
  9. Merge branch 'js/fsmonitor-unflake'

    gitster committed Jun 17, 2019
    The data collected by fsmonitor was not properly written back to
    the on-disk index file, breaking t7519 tests occasionally, which
    has been corrected.
    
    * js/fsmonitor-unflake:
      mark_fsmonitor_valid(): mark the index as changed if needed
      fill_stat_cache_info(): prepare for an fsmonitor fix
  10. Merge branch 'ds/topo-traversal-using-commit-graph'

    gitster committed Jun 17, 2019
    Prepare use of reachability index in topological walker that works
    on a range (A..B).
    
    * ds/topo-traversal-using-commit-graph:
      revision: keep topo-walk free of unintersting commits
      revision: use generation for A..B --topo-order queries
  11. Merge branch 'bl/userdiff-octave'

    gitster committed Jun 17, 2019
    The pattern "git diff/grep" use to extract funcname and words
    boundary for Matlab has been extend to cover Octave, which is more
    or less equivalent.
    
    * bl/userdiff-octave:
      userdiff: fix grammar and style issues
      userdiff: add Octave
  12. Merge branch 'ba/clone-remote-submodules'

    gitster committed Jun 17, 2019
    "git clone --recurse-submodules" learned to set up the submodules
    to ignore commit object names recorded in the superproject gitlink
    and instead use the commits that happen to be at the tip of the
    remote-tracking branches from the get-go, by passing the new
    "--remote-submodules" option.
    
    * ba/clone-remote-submodules:
      clone: add `--remote-submodules` flag
  13. Merge branch 'vv/merge-squash-with-explicit-commit'

    gitster committed Jun 17, 2019
    "git merge --squash" is designed to update the working tree and the
    index without creating the commit, and this cannot be countermanded
    by adding the "--commit" option; the command now refuses to work
    when both options are given.
    
    * vv/merge-squash-with-explicit-commit:
      merge: refuse --commit with --squash
  14. Merge branch 'js/bundle-verify-require-object-store'

    gitster committed Jun 17, 2019
    "git bundle verify" needs to see if prerequisite objects exist in
    the receiving repository, but the command did not check if we are
    in a repository upfront, which has been corrected.
    
    * js/bundle-verify-require-object-store:
      bundle verify: error out if called without an object database
  15. Merge branch 'js/bisect-helper-check-get-oid-return-value'

    gitster committed Jun 17, 2019
    Code cleanup.
    
    * js/bisect-helper-check-get-oid-return-value:
      bisect--helper: verify HEAD could be parsed before continuing
  16. Merge branch 'jk/am-i-resolved-fix'

    gitster committed Jun 17, 2019
    "git am -i --resolved" segfaulted after trying to see a commit as
    if it were a tree, which has been corrected.
    
    * jk/am-i-resolved-fix:
      am: fix --interactive HEAD tree resolution
      am: drop tty requirement for --interactive
      am: read interactive input from stdin
      am: simplify prompt response handling
  17. Merge branch 'jk/HEAD-symref-in-xfer-namespaces'

    gitster committed Jun 17, 2019
    The server side support for "git fetch" used to show incorrect
    value for the HEAD symbolic ref when the namespace feature is in
    use, which has been corrected.
    
    * jk/HEAD-symref-in-xfer-namespaces:
      upload-pack: strip namespace from symref data
  18. Merge branch 'ew/server-info-remove-crufts'

    gitster committed Jun 17, 2019
    "git update-server-info" used to leave stale packfiles in its
    output, which has been corrected.
    
    * ew/server-info-remove-crufts:
      server-info: do not list unlinked packs
  19. Merge branch 'es/grep-require-name-when-needed'

    gitster committed Jun 17, 2019
    More parameter validation.
    
    * es/grep-require-name-when-needed:
      grep: fail if call could output and name is null
  20. Merge branch 'es/git-debugger-doc'

    gitster committed Jun 17, 2019
    Doc update.
    
    * es/git-debugger-doc:
      doc: hint about GIT_DEBUGGER in CodingGuidelines
Older
You can’t perform that action at this time.