1. 11 8月, 2016 1 次提交
    • J
      Merge branch 'jk/reset-ident-time-per-commit' · 24fbe004
      Junio C Hamano 提交于
      Not-so-recent rewrite of "git am" that started making internal
      calls into the commit machinery had an unintended regression, in
      that no matter how many seconds it took to apply many patches, the
      resulting committer timestamp for the resulting commits were all
      the same.
      
      * jk/reset-ident-time-per-commit:
        am: reset cached ident date for each patch
      24fbe004
  2. 09 8月, 2016 39 次提交
    • J
      Sync with maint · a0a1831b
      Junio C Hamano 提交于
      * maint:
        Hopefully final batch for 2.9.3
      a0a1831b
    • J
      Eleventh batch for 2.10 · 0aaf2500
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      0aaf2500
    • J
      Merge branch 'jc/hashmap-doc-init' · 16f0cb2d
      Junio C Hamano 提交于
      The API documentation for hashmap was unclear if hashmap_entry
      can be safely discarded without any other consideration.  State
      that it is safe to do so.
      
      * jc/hashmap-doc-init:
        hashmap: clarify that hashmap_entry can safely be discarded
      16f0cb2d
    • J
      Merge branch 'ew/build-time-pager-tweaks' · 43a42aa4
      Junio C Hamano 提交于
      The build procedure learned PAGER_ENV knob that lists what default
      environment variable settings to export for popular pagers.  This
      mechanism is used to tweak the default settings to MORE on FreeBSD.
      
      * ew/build-time-pager-tweaks:
        pager: move pager-specific setup into the build
      43a42aa4
    • J
      Merge branch 'sb/submodule-recommend-shallowness' · dc7e09a3
      Junio C Hamano 提交于
      Doc update.
      
      * sb/submodule-recommend-shallowness:
        gitmodules: document shallow recommendation
      dc7e09a3
    • J
      Merge branch 'jk/parseopt-string-list' · 19492555
      Junio C Hamano 提交于
      A small memory leak in the command line parsing of "git blame"
      has been plugged.
      
      * jk/parseopt-string-list:
        blame: drop strdup of string literal
      19492555
    • J
      Merge branch 'jh/clean-smudge-f-doc' · 104985c5
      Junio C Hamano 提交于
      A minor documentation update.
      
      * jh/clean-smudge-f-doc:
        clarify %f documentation
      104985c5
    • J
      Merge branch 'js/nedmalloc-gcc6-warnings' · ffdcac4b
      Junio C Hamano 提交于
      Squelch compiler warnings for netmalloc (in compat/) library.
      
      * js/nedmalloc-gcc6-warnings:
        nedmalloc: work around overzealous GCC 6 warning
        nedmalloc: fix misleading indentation
      ffdcac4b
    • J
      Merge branch 'nd/fbsd-lazy-mtime' · 17501ba1
      Junio C Hamano 提交于
      FreeBSD can lie when asked mtime of a directory, which made the
      untracked cache code to fall back to a slow-path, which in turn
      caused tests in t7063 to fail because it wanted to verify the
      behaviour of the fast-path.
      
      * nd/fbsd-lazy-mtime:
        t7063: work around FreeBSD's lazy mtime update feature
      17501ba1
    • J
      Merge branch 'nd/log-decorate-color-head-arrow' · 3a3338d3
      Junio C Hamano 提交于
      An entry "git log --decorate" for the tip of the current branch is
      shown as "HEAD -> name" (where "name" is the name of the branch);
      paint the arrow in the same color as "HEAD", not in the color for
      commits.
      
      * nd/log-decorate-color-head-arrow:
        log: decorate HEAD -> branch with the same color for arrow and HEAD
      3a3338d3
    • J
      Merge branch 'rs/use-strbuf-addstr' · 940622bc
      Junio C Hamano 提交于
      * rs/use-strbuf-addstr:
        use strbuf_addstr() instead of strbuf_addf() with "%s"
        use strbuf_addstr() for adding constant strings to a strbuf
      940622bc
    • J
      Merge branch 'rs/st-mult' · 68e80da4
      Junio C Hamano 提交于
      Micro optimization of st_mult() facility used to check the integer
      overflow coming from multiplication to compute size of memory
      allocation.
      
      * rs/st-mult:
        pass constants as first argument to st_mult()
      68e80da4
    • J
      Merge branch 'ib/t3700-add-chmod-x-updates' · 09ee6444
      Junio C Hamano 提交于
      The t3700 test about "add --chmod=-x" have been made a bit more
      robust and generally cleaned up.
      
      * ib/t3700-add-chmod-x-updates:
        t3700: add a test_mode_in_index helper function
        t3700: merge two tests into one
        t3700: remove unwanted leftover files before running new tests
      09ee6444
    • J
      Merge branch 'ab/gitweb-link-html-escape' · ae674b01
      Junio C Hamano 提交于
      The characters in the label shown for tags/refs for commits in
      "gitweb" output are now properly escaped for proper HTML output.
      
      * ab/gitweb-link-html-escape:
        gitweb: escape link body in format_ref_marker
      ae674b01
    • J
      Merge branch 'jk/pack-objects-optim' · 78849622
      Junio C Hamano 提交于
      "git pack-objects" has a few options that tell it not to pack
      objects found in certain packfiles, which require it to scan .idx
      files of all available packs.  The codepaths involved in these
      operations have been optimized for a common case of not having any
      non-local pack and/or any .kept pack.
      
      * jk/pack-objects-optim:
        pack-objects: compute local/ignore_pack_keep early
        pack-objects: break out of want_object loop early
        find_pack_entry: replace last_found_pack with MRU cache
        add generic most-recently-used list
        sha1_file: drop free_pack_by_name
        t/perf: add tests for many-pack scenarios
      78849622
    • J
      Merge branch 'jk/difftool-in-subdir' · 7647537e
      Junio C Hamano 提交于
      "git difftool <paths>..." started in a subdirectory failed to
      interpret the paths relative to that directory, which has been
      fixed.
      
      * jk/difftool-in-subdir:
        difftool: use Git::* functions instead of passing around state
        difftool: avoid $GIT_DIR and $GIT_WORK_TREE
        difftool: fix argument handling in subdirs
      7647537e
    • J
      Merge branch 'va/i18n' · 768ededa
      Junio C Hamano 提交于
      More i18n marking.
      
      * va/i18n:
        i18n: config: unfold error messages marked for translation
        i18n: notes: mark comment for translation
      768ededa
    • J
      Merge branch 'js/rebase-i-progress-tidy' · 6b9114c6
      Junio C Hamano 提交于
      Regression fix for an i18n topic already in 'master'.
      
      * js/rebase-i-progress-tidy:
        rebase-interactive: trim leading whitespace from progress count
      6b9114c6
    • J
      Merge branch 'jk/reflog-date' · 0d327996
      Junio C Hamano 提交于
      The reflog output format is documented better, and a new format
      --date=unix to report the seconds-since-epoch (without timezone)
      has been added.
      
      * jk/reflog-date:
        date: clarify --date=raw description
        date: add "unix" format
        date: document and test "raw-local" mode
        doc/pretty-formats: explain shortening of %gd
        doc/pretty-formats: describe index/time formats for %gd
        doc/rev-list-options: explain "-g" output formats
        doc/rev-list-options: clarify "commit@{Nth}" for "-g" option
      0d327996
    • J
      Merge branch 'cp/completion-clone-recurse-submodules' · 4c30ad8c
      Junio C Hamano 提交于
      * cp/completion-clone-recurse-submodules:
        completion: add option '--recurse-submodules' to 'git clone'
      4c30ad8c
    • J
      Merge branch 'jk/t4205-cleanup' · 4d7f59ae
      Junio C Hamano 提交于
      Test modernization.
      
      * jk/t4205-cleanup:
        t4205: indent here documents
        t4205: drop top-level &&-chaining
      4d7f59ae
    • J
      Merge branch 'da/subtree-modernize' · f2be3b73
      Junio C Hamano 提交于
      Style fixes for "git subtree" (in contrib/).
      
      * da/subtree-modernize:
        subtree: adjust function definitions to match CodingGuidelines
        subtree: adjust style to match CodingGuidelines
      f2be3b73
    • J
      Merge branch 'nd/fetch-ref-summary' · abbf7bd4
      Junio C Hamano 提交于
      Hotfix of a test in a topic that has already been merged to 'master'.
      
      * nd/fetch-ref-summary:
        t5510: skip tests under GETTEXT_POISON build
      abbf7bd4
    • J
      Merge branch 'ew/git-svn-http-tests' · 612c3dfb
      Junio C Hamano 提交于
      Tests for "git svn" have been taught to reuse the lib-httpd test
      infrastructure when testing the subversion integration that
      interacts with subversion repositories served over the http://
      protocol.
      
      * ew/git-svn-http-tests:
        git svn: migrate tests to use lib-httpd
        t/t91*: do not say how to avoid the tests
      612c3dfb
    • J
      Merge branch 'js/t4130-rename-without-ino' · 3819fb9a
      Junio C Hamano 提交于
      Windows port was failing some tests in t4130, due to the lack of
      inum in the returned values by its lstat(2) emulation.
      
      * js/t4130-rename-without-ino:
        t4130: work around Windows limitation
      3819fb9a
    • J
      Hopefully final batch for 2.9.3 · 00f27feb
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      00f27feb
    • J
      Merge branch 'sb/pack-protocol-doc-nak' into maint · 593be730
      Junio C Hamano 提交于
      A doc update.
      
      * sb/pack-protocol-doc-nak:
        Documentation: pack-protocol correct NAK response
      593be730
    • J
      Merge branch 'rs/submodule-config-code-cleanup' into maint · f7b01d3e
      Junio C Hamano 提交于
      Code cleanup.
      
      * rs/submodule-config-code-cleanup:
        submodule-config: fix test binary crashing when no arguments given
        submodule-config: combine early return code into one goto
        submodule-config: passing name reference for .gitmodule blobs
        submodule-config: use explicit empty string instead of strbuf in config_from()
      f7b01d3e
    • J
      Merge branch 'sb/submodule-deinit-all' into maint · 6a024a24
      Junio C Hamano 提交于
      A comment update for a topic that was merged to Git v2.8.
      
      * sb/submodule-deinit-all:
        submodule deinit: remove outdated comment
      6a024a24
    • J
      Merge branch 'rs/worktree-use-strbuf-absolute-path' into maint · 5131967e
      Junio C Hamano 提交于
      Code simplification.
      
      * rs/worktree-use-strbuf-absolute-path:
        worktree: use strbuf_add_absolute_path() directly
      5131967e
    • J
      Merge branch 'jc/doc-diff-filter-exclude' into maint · 2f8c654e
      Junio C Hamano 提交于
      Belated doc update for a feature added in v1.8.5.
      
      * jc/doc-diff-filter-exclude:
        diff: document diff-filter exclusion
      2f8c654e
    • J
      Merge branch 'nd/test-helpers' into maint · 970994de
      Junio C Hamano 提交于
      Build clean-up.
      
      * nd/test-helpers:
        t/test-lib.sh: fix running tests with --valgrind
        Makefile: use VCSSVN_LIB to refer to svn library
        Makefile: drop extra dependencies for test helpers
      970994de
    • J
      Merge branch 'rs/use-strbuf-addbuf' into maint · 48aa37ed
      Junio C Hamano 提交于
      Code cleanup.
      
      * rs/use-strbuf-addbuf:
        strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()
        use strbuf_addbuf() for appending a strbuf to another
      48aa37ed
    • J
      Merge branch 'lf/recv-sideband-cleanup' into maint · ee7fd70e
      Junio C Hamano 提交于
      Code simplification.
      
      * lf/recv-sideband-cleanup:
        sideband.c: small optimization of strbuf usage
        sideband.c: refactor recv_sideband()
      ee7fd70e
    • J
      Merge branch 'ah/unpack-trees-advice-messages' into maint · e69771c3
      Junio C Hamano 提交于
      Grammofix.
      
      * ah/unpack-trees-advice-messages:
        unpack-trees: fix English grammar in do-this-before-that messages
      e69771c3
    • J
      Merge branch 'lf/sideband-returns-void' into maint · 26256c01
      Junio C Hamano 提交于
      A small internal API cleanup.
      
      * lf/sideband-returns-void:
        upload-pack.c: make send_client_data() return void
        sideband.c: make send_sideband() return void
      26256c01
    • J
      Merge branch 'jk/send-pack-stdio' into maint · 1e274ef2
      Junio C Hamano 提交于
      Code clean-up.
      
      * jk/send-pack-stdio:
        write_or_die: remove the unused write_or_whine() function
        send-pack: use buffered I/O to talk to pack-objects
      1e274ef2
    • J
      Merge branch 'pb/commit-editmsg-path' into maint · a220e2bb
      Junio C Hamano 提交于
      Code clean-up.
      
      * pb/commit-editmsg-path:
        builtin/commit.c: memoize git-path for COMMIT_EDITMSG
      a220e2bb
    • J
      Merge branch 'ew/find-perl-on-freebsd-in-local' into maint · 8d642168
      Junio C Hamano 提交于
      Recent FreeBSD stopped making perl available at /usr/bin/perl;
      switch the default the built-in path to /usr/local/bin/perl on not
      too ancient FreeBSD releases.
      
      * ew/find-perl-on-freebsd-in-local:
        config.mak.uname: correct perl path on FreeBSD
      8d642168