1. 21 5月, 2018 15 次提交
  2. 08 5月, 2018 25 次提交
    • J
      The fifth batch for 2.18 · ccdcbd54
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ccdcbd54
    • J
      Merge branch 'ma/http-walker-no-partial' · 96f29521
      Junio C Hamano 提交于
      "git http-fetch" (deprecated) had an optional and experimental
      "feature" to fetch only commits and/or trees, which nobody used.
      This has been removed.
      
      * ma/http-walker-no-partial:
        walker: drop fields of `struct walker` which are always 1
        http-fetch: make `-a` standard behaviour
      96f29521
    • J
      Merge branch 'js/runtime-prefix' · 71c848bb
      Junio C Hamano 提交于
      * js/runtime-prefix:
        Avoid multiple PREFIX definitions
        git_setup_gettext: plug memory leak
        gettext: avoid initialization if the locale dir is not present
      71c848bb
    • J
      Merge branch 'js/colored-push-errors' · a56fb3dc
      Junio C Hamano 提交于
      Error messages from "git push" can be painted for more visibility.
      
      * js/colored-push-errors:
        config: document the settings to colorize push errors/hints
        push: test to verify that push errors are colored
        push: colorize errors
        color: introduce support for colorizing stderr
      a56fb3dc
    • J
      Merge branch 'jc/parseopt-expiry-errors' · 3915f9a4
      Junio C Hamano 提交于
      "git gc --prune=nonsense" spent long time repacking and then
      silently failed when underlying "git prune --expire=nonsense"
      failed to parse its command line.  This has been corrected.
      
      * jc/parseopt-expiry-errors:
        parseopt: handle malformed --expire arguments more nicely
        gc: do not upcase error message shown with die()
      3915f9a4
    • J
      Merge branch 'ma/fast-export-skip-merge-fix' · ad3207e6
      Junio C Hamano 提交于
      "git fast-export" had a regression in v2.15.0 era where it skipped
      some merge commits in certain cases, which has been corrected.
      
      * ma/fast-export-skip-merge-fix:
        fast-export: fix regression skipping some merge-commits
      ad3207e6
    • J
      Merge branch 'tz/doc-git-urls-reference' · df7abe3f
      Junio C Hamano 提交于
      Doc fix.
      
      * tz/doc-git-urls-reference:
        doc/clone: update caption for GIT URLS cross-reference
      df7abe3f
    • J
      Merge branch 'tg/demote-stash-save-in-completion' · 79d92b11
      Junio C Hamano 提交于
      The command line completion (in contrib/) has been taught that "git
      stash save" has been deprecated ("git stash push" is the preferred
      spelling in the new world) and does not offer it as a possible
      completion candidate when "git stash push" can be.
      
      * tg/demote-stash-save-in-completion:
        completion: make stash -p and alias for stash push -p
        completion: stop showing 'save' for stash by default
      79d92b11
    • J
      Merge branch 'sa/send-email-dedup-some-headers' · c50f76aa
      Junio C Hamano 提交于
      When fed input that already has In-Reply-To: and/or References:
      headers and told to add the same information, "git send-email"
      added these headers separately, instead of appending to an existing
      one, which is a violation of the RFC.  This has been corrected.
      
      * sa/send-email-dedup-some-headers:
        send-email: avoid duplicate In-Reply-To/References
      c50f76aa
    • J
      Merge branch 'nd/submodule-status-fix' · 0cd58d8b
      Junio C Hamano 提交于
      "git submodule status" did not check the symbolic revision name it
      computed for the submodule HEAD is not the NULL, and threw it at
      printf routines, which has been corrected.
      
      * nd/submodule-status-fix:
        submodule--helper: don't print null in 'submodule status'
      0cd58d8b
    • J
      Merge branch 'js/ident-date-fix' · 0657e0f8
      Junio C Hamano 提交于
      During a "rebase -i" session, the code could give older timestamp
      to commits created by later "pick" than an earlier "reword", which
      has been corrected.
      
      * js/ident-date-fix:
        sequencer: reset the committer date before commits
      0657e0f8
    • J
      Merge branch 'bt/gpg-interface' · 6d2a655a
      Junio C Hamano 提交于
      What is queued here is only the obviously correct and
      uncontroversial code clean-up part, which is an earlier 7 patches,
      of a larger series.
      
      The remainder that is not queued introduces a few configuration
      variables to deal with e-signature backends with different
      signature format.
      
      * bt/gpg-interface:
        gpg-interface: find the last gpg signature line
        gpg-interface: extract gpg line matching helper
        gpg-interface: fix const-correctness of "eol" pointer
        gpg-interface: use size_t for signature buffer size
        gpg-interface: modernize function declarations
        gpg-interface: handle bool user.signingkey
        t7004: fix mistaken tag name
      6d2a655a
    • J
      Merge branch 'hn/sort-ls-remote' · 6c0110ff
      Junio C Hamano 提交于
      "git ls-remote" learned an option to allow sorting its output based
      on the refnames being shown.
      
      * hn/sort-ls-remote:
        ls-remote: create '--sort' option
      6c0110ff
    • J
      Merge branch 'ab/git-svn-get-record-typofix' · a500a9c4
      Junio C Hamano 提交于
      "git svn" had a minor thinko/typo which has been fixed.
      
      * ab/git-svn-get-record-typofix:
        git-svn: avoid warning on undef readline()
      a500a9c4
    • J
      Merge branch 'tb/config-default' · 00bb99c4
      Junio C Hamano 提交于
      "git config --get" learned the "--default" option, to help the
      calling script.  Building on top of the tb/config-type topic, the
      "git config" learns "--type=color" type.  Taken together, you can
      do things like "git config --get foo.color --default blue" and get
      the ANSI color sequence for the color given to foo.color variable,
      or "blue" if the variable does not exist.
      
      * tb/config-default:
        builtin/config: introduce `color` type specifier
        config.c: introduce 'git_config_color' to parse ANSI colors
        builtin/config: introduce `--default`
      00bb99c4
    • J
      Merge branch 'tb/config-type' · e3e042b1
      Junio C Hamano 提交于
      The "git config" command uses separate options e.g. "--int",
      "--bool", etc. to specify what type the caller wants the value to
      be interpreted as.  A new "--type=<typename>" option has been
      introduced, which would make it cleaner to define new types.
      
      * tb/config-type:
        builtin/config.c: support `--type=<type>` as preferred alias for `--<type>`
        builtin/config.c: treat type specifiers singularly
      e3e042b1
    • J
      Merge branch 'sg/doc-gc-quote-mismatch-fix' · 278c2511
      Junio C Hamano 提交于
      Doc formatting fix.
      
      * sg/doc-gc-quote-mismatch-fix:
        docs/git-gc: fix minor rendering issue
      278c2511
    • J
      Merge branch 'sg/completion-clear-cached' · 1dfb929a
      Junio C Hamano 提交于
      The completion script (in contrib/) learned to clear cached list of
      command line options upon dot-sourcing it again in a more efficient
      way.
      
      * sg/completion-clear-cached:
        completion: reduce overhead of clearing cached --options
      1dfb929a
    • J
      Merge branch 'sb/worktree-remove-opt-force' · 90186fa0
      Junio C Hamano 提交于
      "git worktree remove" learned that "-f" is a shorthand for
      "--force" option, just like for "git worktree add".
      
      * sb/worktree-remove-opt-force:
        worktree: accept -f as short for --force for removal
      90186fa0
    • J
      Merge branch 'ma/double-dashes-in-docs' · 535cfa32
      Junio C Hamano 提交于
      Doc formatting updates.
      
      * ma/double-dashes-in-docs:
        git-submodule.txt: quote usage in monospace, drop backslash
        git-[short]log.txt: unify quoted standalone --
        doc: convert [\--] to [--]
        doc: convert \--option to --option
      535cfa32
    • J
      Merge branch 'tq/t1510' · 3138f23c
      Junio C Hamano 提交于
      Test cleanup.
      
      * tq/t1510:
        t1510-repo-setup.sh: remove useless mkdir
      3138f23c
    • J
      Merge branch 'so/glossary-ancestor' · c0bdbac4
      Junio C Hamano 提交于
      Docfix.
      
      * so/glossary-ancestor:
        glossary: substitute "ancestor" for "direct ancestor" in 'push' description.
      c0bdbac4
    • J
      Merge branch 'ls/checkout-encoding' · 1ac0ce4d
      Junio C Hamano 提交于
      The new "checkout-encoding" attribute can ask Git to convert the
      contents to the specified encoding when checking out to the working
      tree (and the other way around when checking in).
      
      * ls/checkout-encoding:
        convert: add round trip check based on 'core.checkRoundtripEncoding'
        convert: add tracing for 'working-tree-encoding' attribute
        convert: check for detectable errors in UTF encodings
        convert: add 'working-tree-encoding' attribute
        utf8: add function to detect a missing UTF-16/32 BOM
        utf8: add function to detect prohibited UTF-16/32 BOM
        utf8: teach same_encoding() alternative UTF encoding names
        strbuf: add a case insensitive starts_with()
        strbuf: add xstrdup_toupper()
        strbuf: remove unnecessary NUL assignment in xstrdup_tolower()
      1ac0ce4d
    • J
      Merge branch 'ab/nuke-emacs-contrib' · 7d7d051c
      Junio C Hamano 提交于
      The scripts in contrib/emacs/ have outlived their usefulness and
      have been replaced with a stub that errors out and tells the user
      there are replacements.
      
      * ab/nuke-emacs-contrib:
        git{,-blame}.el: remove old bitrotting Emacs code
      7d7d051c
    • J
      Merge branch 'nd/warn-more-for-devs' · e998e7a1
      Junio C Hamano 提交于
      The build procedure "make DEVELOPER=YesPlease" learned to enable a
      bit more warning options depending on the compiler used to help
      developers more.  There also is "make DEVOPTS=tokens" knob
      available now, for those who want to help fixing warnings we
      usually ignore, for example.
      
      * nd/warn-more-for-devs:
        Makefile: add a DEVOPTS to get all of -Wextra
        Makefile: add a DEVOPTS to suppress -Werror under DEVELOPER
        Makefile: detect compiler and enable more warnings in DEVELOPER=1
        connect.c: mark die_initial_contact() NORETURN
      e998e7a1