1. 30 6月, 2018 30 次提交
  2. 29 6月, 2018 10 次提交
    • J
      Second batch for 2.19 cycle · e3331758
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      e3331758
    • J
      Merge branch 'sb/fix-fetching-moved-submodules' · 085d2abf
      Junio C Hamano 提交于
      The code to try seeing if a fetch is necessary in a submodule
      during a fetch with --recurse-submodules got confused when the path
      to the submodule was changed in the range of commits in the
      superproject, sometimes showing "(null)".  This has been corrected.
      
      * sb/fix-fetching-moved-submodules:
        t5526: test recursive submodules when fetching moved submodules
        submodule: fix NULL correctness in renamed broken submodules
      085d2abf
    • J
      Merge branch 'tz/cred-netrc-cleanup' · cf22247b
      Junio C Hamano 提交于
      Build and test procedure for netrc credential helper (in contrib/)
      has been updated.
      
      * tz/cred-netrc-cleanup:
        git-credential-netrc: make "all" default target of Makefile
        git-credential-netrc: fix exit status when tests fail
        git-credential-netrc: use in-tree Git.pm for tests
        git-credential-netrc: minor whitespace cleanup in test script
      cf22247b
    • J
      Merge branch 'jc/clean-after-sanity-tests' · 18404434
      Junio C Hamano 提交于
      test cleanup.
      
      * jc/clean-after-sanity-tests:
        tests: clean after SANITY tests
      18404434
    • J
      Merge branch 'nd/completion-negation' · 6da2d959
      Junio C Hamano 提交于
      Continuing with the idea to programmatically enumerate various
      pieces of data required for command line completion, the codebase
      has been taught to enumerate options prefixed with "--no-" to
      negate them.
      
      * nd/completion-negation:
        completion: collapse extra --no-.. options
        completion: suppress some -no- options
        parse-options: option to let --git-completion-helper show negative form
      6da2d959
    • J
      Merge branch 'pw/add-p-recount' · 5eb8da85
      Junio C Hamano 提交于
      When user edits the patch in "git add -p" and the user's editor is
      set to strip trailing whitespaces indiscriminately, an empty line
      that is unchanged in the patch would become completely empty
      (instead of a line with a sole SP on it).  The code introduced in
      Git 2.17 timeframe failed to parse such a patch, but now it learned
      to notice the situation and cope with it.
      
      * pw/add-p-recount:
        add -p: fix counting empty context lines in edited patches
      5eb8da85
    • J
      Merge branch 'jk/fetch-all-peeled-fix' · 0079732e
      Junio C Hamano 提交于
      "git fetch-pack --all" used to unnecessarily fail upon seeing an
      annotated tag that points at an object other than a commit.
      
      * jk/fetch-all-peeled-fix:
        fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits
        fetch-pack: don't try to fetch peel values with --all
      0079732e
    • J
      Merge branch 'ms/send-pack-honor-config' · 8d3661d5
      Junio C Hamano 提交于
      "git send-pack --signed" (hence "git push --signed" over the http
      transport) did not read user ident from the config mechanism to
      determine whom to sign the push certificate as, which has been
      corrected.
      
      * ms/send-pack-honor-config:
        builtin/send-pack: populate the default configs
      8d3661d5
    • J
      Merge branch 'jh/partial-clone' · 92e1bbc3
      Junio C Hamano 提交于
      The recent addition of "partial clone" experimental feature kicked
      in when it shouldn't, namely, when there is no partial-clone filter
      defined even if extensions.partialclone is set.
      
      * jh/partial-clone:
        list-objects: check if filter is NULL before using
      92e1bbc3
    • J
      Merge branch 'sg/gpg-tests-fix' · 078f3dc0
      Junio C Hamano 提交于
      Some flaky tests have been fixed.
      
      * sg/gpg-tests-fix:
        tests: make forging GPG signed commits and tags more robust
        t7510-signed-commit: use 'test_must_fail'
      078f3dc0