1. 26 6月, 2014 12 次提交
    • J
      Merge branch 'ep/avoid-test-a-o' · e5685724
      Junio C Hamano 提交于
      Update tests and scripts to avoid "test ... -a ...", which is often
      more error-prone than "test ... && test ...".
      
      Squashed misconversion fix-up into git-submodule.sh updates.
      
      * ep/avoid-test-a-o:
        git-submodule.sh: avoid "echo" path-like values
        git-submodule.sh: avoid "test <cond> -a/-o <cond>"
        t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
        t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
        t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
        t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
        t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
        t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
        t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
        t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
        t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
        git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
        git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
        git-bisect.sh: avoid "test <cond> -a/-o <cond>"
        contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
        contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
        contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
        contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
        contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
        check_bindir: avoid "test <cond> -a/-o <cond>"
      e5685724
    • J
      Merge branch 'tb/unicode-7.0-display-width' · 5b9b715f
      Junio C Hamano 提交于
      * tb/unicode-7.0-display-width:
        Update of unicode_width.h to Unicode Version 7.0
      5b9b715f
    • J
      Merge branch 'ye/doc-http-proto' · ccca6b65
      Junio C Hamano 提交于
      * ye/doc-http-proto:
        http-protocol.txt: Basic Auth is defined in RFC 2617, not RFC 2616
      ccca6b65
    • J
      Merge branch 'rs/blame-refactor' · 8d87e35b
      Junio C Hamano 提交于
      * rs/blame-refactor:
        blame: simplify prepare_lines()
        blame: factor out get_next_line()
      8d87e35b
    • J
      Merge branch 'pb/trim-trailing-spaces' · 35869f4c
      Junio C Hamano 提交于
      * pb/trim-trailing-spaces:
        t0008: do not depend on 'echo' handling backslashes specially
      35869f4c
    • J
      Merge branch 'mc/doc-submodule-sync-recurse' · b47761dd
      Junio C Hamano 提交于
      * mc/doc-submodule-sync-recurse:
        submodule: document "sync --recursive"
      b47761dd
    • J
      Merge branch 'sp/complete-ext-alias' · af6ba0eb
      Junio C Hamano 提交于
      * sp/complete-ext-alias:
        completion: handle '!f() { ... }; f' and "!sh -c '...' -" aliases
      af6ba0eb
    • J
      Merge branch 'mc/git-p4-prepare-p4-only' · 2a20f4b7
      Junio C Hamano 提交于
      * mc/git-p4-prepare-p4-only:
        git-p4: fix submit in non --prepare-p4-only mode
      2a20f4b7
    • J
      Merge branch 'jk/repack-pack-writebitmaps-config' · 25f31190
      Junio C Hamano 提交于
      * jk/repack-pack-writebitmaps-config:
        t7700: drop explicit --no-pack-kept-objects from .keep test
        repack: introduce repack.writeBitmaps config option
        repack: simplify handling of --write-bitmap-index
        pack-objects: stop respecting pack.writebitmaps
      25f31190
    • J
      Merge branch 'nd/init-restore-env' · b30adaac
      Junio C Hamano 提交于
      Some subcommands do not want to be aliased because of the side
      effects that happens while the definitions of the aliases are looked
      up from configuration system.
      
      * nd/init-restore-env:
        git potty: restore environments after alias expansion
      b30adaac
    • J
      Merge branch 'jk/repack-pack-keep-objects' · b7ce5836
      Junio C Hamano 提交于
      Recent updates to "git repack" started to duplicate objects that
      are in packfiles marked with .keep flag into the new packfile by
      mistake.
      
      * jk/repack-pack-keep-objects:
        repack: s/write_bitmap/&s/ in code
        repack: respect pack.writebitmaps
        repack: do not accidentally pack kept objects by default
      b7ce5836
    • J
      Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff' · 9ce7100b
      Junio C Hamano 提交于
      * fr/sequencer-fail-with-not-one-upon-no-ff:
        sequencer: signal failed ff as an aborted, not a conflicted merge
      9ce7100b
  2. 21 6月, 2014 8 次提交
    • J
      Fourth batch for 2.1 · 786a89d3
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      786a89d3
    • J
      Merge branch 'jc/test-lazy-prereq' (early part) · bf80b8a6
      Junio C Hamano 提交于
      * 'jc/test-lazy-prereq' (early part):
        t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
        t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
        t3302: do not chdir around in the primary test process
        t3302: coding style updates
        test: turn USR_BIN_TIME into a lazy prerequisite
        test: turn EXPENSIVE into a lazy prerequisite
      bf80b8a6
    • J
      Merge branch 'jc/fetch-pull-refmap' · a668853c
      Junio C Hamano 提交于
      * jc/fetch-pull-refmap:
        docs: Explain the purpose of fetch's and pull's <refspec> parameter.
        fetch: allow explicit --refmap to override configuration
        fetch doc: add a section on configured remote-tracking branches
        fetch doc: remove "short-cut" section
        fetch doc: update refspec format description
        fetch doc: on pulling multiple refspecs
        fetch doc: remove notes on outdated "mixed layout"
        fetch doc: update note on '+' in front of the refspec
        fetch doc: move FETCH_HEAD material lower and add an example
        fetch doc: update introductory part for clarity
      a668853c
    • J
      Merge branch 'mt/send-email-cover-to-cc' · 9fe49ae7
      Junio C Hamano 提交于
      * mt/send-email-cover-to-cc:
        t9001: avoid non-portable '\n' with sed
        test/send-email: to-cover, cc-cover tests
        git-send-email: two new options: to-cover, cc-cover
      9fe49ae7
    • J
      Merge branch 'tb/t5551-clone-notice-to-stderr' · 7402a1c1
      Junio C Hamano 提交于
      * tb/t5551-clone-notice-to-stderr:
        t5551: fix the 50,000 tag test
      7402a1c1
    • J
      Merge branch 'rs/more-starts-with' · fa820374
      Junio C Hamano 提交于
      * rs/more-starts-with:
        Use starts_with() for C strings instead of memcmp()
      fa820374
    • J
      Merge branch 'jm/api-strbuf-doc' · 9ba66403
      Junio C Hamano 提交于
      * jm/api-strbuf-doc:
        api-strbuf.txt minor typos
      9ba66403
    • J
      Merge branch 'jc/revision-dash-count-parsing' · 7a3b4e3b
      Junio C Hamano 提交于
      "git log -2master" is a common typo that shows two commits starting
      from whichever random branch that is not 'master' that happens to
      be checked out currently.
      
      * jc/revision-dash-count-parsing:
        revision: parse "git log -<count>" more carefully
      7a3b4e3b
  3. 20 6月, 2014 2 次提交
  4. 19 6月, 2014 1 次提交
  5. 17 6月, 2014 17 次提交
    • J
      Third batch for 2.1 · cb682f8c
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      cb682f8c
    • J
      Merge branch 'ib/test-selectively-run' · 7e1a5381
      Junio C Hamano 提交于
      Allow specifying only certain individual test pieces to be run
      using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
      
      * ib/test-selectively-run:
        t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
        test-lib: '--run' to run only specific tests
        test-lib: tests skipped by GIT_SKIP_TESTS say so
        test-lib: document short options in t/README
      7e1a5381
    • J
      Merge branch 'ta/string-list-init' · c6d3abbf
      Junio C Hamano 提交于
      * ta/string-list-init:
        string-list: spell all values out that are given to a string_list initializer
      c6d3abbf
    • J
      Merge branch 'jm/dedup-test-config' · bbfa0cc7
      Junio C Hamano 提交于
      * jm/dedup-test-config:
        t/t7810-grep.sh: remove duplicate test_config()
      bbfa0cc7
    • J
      Merge branch 'dt/refs-check-refname-component-optim' · ae7dd1a4
      Junio C Hamano 提交于
      * dt/refs-check-refname-component-optim:
        refs.c: optimize check_refname_component()
      ae7dd1a4
    • J
      Merge branch 'sk/test-cmp-bin' · c651ccc9
      Junio C Hamano 提交于
      * sk/test-cmp-bin:
        t5000, t5003: do not use test_cmp to compare binary files
      c651ccc9
    • J
      Merge branch 'sh/enable-preloadindex' · 96b29bde
      Junio C Hamano 提交于
      * sh/enable-preloadindex:
        environment.c: enable core.preloadindex by default
      96b29bde
    • J
      Merge branch 'rs/read-ref-at' · bb0ced75
      Junio C Hamano 提交于
      * rs/read-ref-at:
        refs.c: change read_ref_at to use the reflog iterators
      bb0ced75
    • J
      Merge branch 'jk/error-resolve-conflict-advice' · d0d5ba7e
      Junio C Hamano 提交于
      * jk/error-resolve-conflict-advice:
        error_resolve_conflict: drop quotations around operation
        error_resolve_conflict: rewrap advice message
      d0d5ba7e
    • J
      Merge branch 'rs/pack-objects-no-unnecessary-realloc' · 57a2eee9
      Junio C Hamano 提交于
      Avoid unnecessary copy of previous contents when extending the
      hashtable used in pack-objects.
      
      * rs/pack-objects-no-unnecessary-realloc:
        pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
      57a2eee9
    • J
      Merge branch 'lt/log-auto-decorate' · 3009afd5
      Junio C Hamano 提交于
      * lt/log-auto-decorate:
        git log: support "auto" decorations
      3009afd5
    • J
      Merge branch 'jm/doc-wording-tweaks' · 668668ad
      Junio C Hamano 提交于
      * jm/doc-wording-tweaks:
        Documentation: wording fixes in the user manual and glossary
      668668ad
    • J
      Merge branch 'jm/format-patch-mail-sig' · f18871dc
      Junio C Hamano 提交于
      * jm/format-patch-mail-sig:
        format-patch: add "--signature-file=<file>" option
        format-patch: make newline after signature conditional
      f18871dc
    • J
      Merge branch 'jk/http-errors' · 2075a0c2
      Junio C Hamano 提交于
      Propagate the error messages from the webserver better to the
      client coming over the HTTP transport.
      
      * jk/http-errors:
        http: default text charset to iso-8859-1
        remote-curl: reencode http error messages
        strbuf: add strbuf_reencode helper
        http: optionally extract charset parameter from content-type
        http: extract type/subtype portion of content-type
        t5550: test display of remote http error messages
        t/lib-httpd: use write_script to copy CGI scripts
        test-lib: preserve GIT_CURL_VERBOSE from the environment
      2075a0c2
    • J
      Merge branch 'ow/config-mailmap-pathname' · c37d3269
      Junio C Hamano 提交于
      mailmap.file configuration names a pathname, hence should honor
      ~/path and ~user/path as its value.
      
      * ow/config-mailmap-pathname:
        config: respect '~' and '~user' in mailmap.file
      c37d3269
    • J
      Merge branch 'fc/remote-helper-refmap' · c9fc3a6a
      Junio C Hamano 提交于
      Allow remote-helper/fast-import based transport to rename the refs
      while transferring the history.
      
      * fc/remote-helper-refmap:
        transport-helper: remove unnecessary strbuf resets
        transport-helper: add support to delete branches
        fast-export: add support to delete refs
        fast-import: add support to delete refs
        transport-helper: add support to push symbolic refs
        transport-helper: add support for old:new refspec
        fast-export: add new --refspec option
        fast-export: improve argument parsing
      c9fc3a6a
    • J
      Merge branch 'nd/daemonize-gc' · 1a81f6ce
      Junio C Hamano 提交于
      "git gc --auto" was recently changed to run in the background to
      give control back early to the end-user sitting in front of the
      terminal, but it forgot that housekeeping involving reflogs should
      be done without other processes competing for accesses to the refs.
      
      * nd/daemonize-gc:
        gc --auto: do not lock refs in the background
      1a81f6ce