1. 16 2月, 2018 8 次提交
    • J
      Merge branch 'ab/wildmatch-tests' · bfc817d8
      Junio C Hamano 提交于
      More tests for wildmatch functions.
      
      * ab/wildmatch-tests:
        wildmatch test: mark test as EXPENSIVE_ON_WINDOWS
        test-lib: add an EXPENSIVE_ON_WINDOWS prerequisite
        wildmatch test: create & test files on disk in addition to in-memory
        wildmatch test: perform all tests under all wildmatch() modes
        wildmatch test: use test_must_fail, not ! for test-wildmatch
        wildmatch test: remove dead fnmatch() test code
        wildmatch test: use a paranoia pattern from nul_match()
        wildmatch test: don't try to vertically align our output
        wildmatch test: use more standard shell style
        wildmatch test: indent with tabs, not spaces
      bfc817d8
    • J
      Merge branch 'po/object-id' · 8be8342b
      Junio C Hamano 提交于
      Conversion from uchar[20] to struct object_id continues.
      
      * po/object-id:
        sha1_file: rename hash_sha1_file_literally
        sha1_file: convert write_loose_object to object_id
        sha1_file: convert force_object_loose to object_id
        sha1_file: convert write_sha1_file to object_id
        notes: convert write_notes_tree to object_id
        notes: convert combine_notes_* to object_id
        commit: convert commit_tree* to object_id
        match-trees: convert splice_tree to object_id
        cache: clear whole hash buffer with oidclr
        sha1_file: convert hash_sha1_file to object_id
        dir: convert struct sha1_stat to use object_id
        sha1_file: convert pretend_sha1_file to object_id
      8be8342b
    • J
      Merge branch 'sb/pull-rebase-submodule' · 157ee050
      Junio C Hamano 提交于
      "git pull --rebase" did not pass verbosity setting down when
      recursing into a submodule.
      
      * sb/pull-rebase-submodule:
        builtin/pull: respect verbosity settings in submodules
      157ee050
    • J
      Merge branch 'kg/packed-ref-cache-fix' · 9db22910
      Junio C Hamano 提交于
      Avoid mmapping small files while using packed refs (especially ones
      with zero size, which would cause later munmap() to fail).
      
      * kg/packed-ref-cache-fix:
        packed_ref_cache: don't use mmap() for small files
        load_contents(): don't try to mmap an empty file
        packed_ref_iterator_begin(): make optimization more general
        find_reference_location(): make function safe for empty snapshots
        create_snapshot(): use `xmemdupz()` rather than a strbuf
        struct snapshot: store `start` rather than `header_len`
      9db22910
    • J
      Merge branch 'jt/fsck-code-cleanup' · 52b7ab31
      Junio C Hamano 提交于
      Plug recently introduced leaks in fsck.
      
      * jt/fsck-code-cleanup:
        fsck: fix leak when traversing trees
      52b7ab31
    • J
      Merge branch 'en/merge-recursive-fixes' · ae0d0795
      Junio C Hamano 提交于
      * en/merge-recursive-fixes:
        merge-recursive: add explanation for src_entry and dst_entry
        merge-recursive: fix logic ordering issue
        Tighten and correct a few testcases for merging and cherry-picking
      ae0d0795
    • J
      Merge branch 'jc/worktree-add-short-help' · cc7655a5
      Junio C Hamano 提交于
      Error message fix.
      
      * jc/worktree-add-short-help:
        worktree: say that "add" takes an arbitrary commit in short-help
      cc7655a5
    • J
      Merge branch 'ab/sha1dc-build' · a66b51c6
      Junio C Hamano 提交于
      Push the submodule version of collision-detecting SHA-1 hash
      implementation a bit harder on builders.
      
      * ab/sha1dc-build:
        sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
        Makefile: under "make dist", include the sha1collisiondetection submodule
        Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto
      a66b51c6
  2. 14 2月, 2018 32 次提交
    • J
      Second batch for 2.17 · b2e45c69
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      b2e45c69
    • J
      Merge branch 'tz/doc-show-defaults-to-head' · 8195303c
      Junio C Hamano 提交于
      Doc update.
      
      * tz/doc-show-defaults-to-head:
        doc: mention 'git show' defaults to HEAD
      8195303c
    • J
      Merge branch 'ew/svn-branch-segfault-fix' · 9cd5320d
      Junio C Hamano 提交于
      Workaround for segfault with more recent versions of SVN.
      
      * ew/svn-branch-segfault-fix:
        git-svn: control destruction order to avoid segfault
      9cd5320d
    • J
      Merge branch 'sg/travis-linux32-sanity' · 798224a1
      Junio C Hamano 提交于
      Travis updates.
      
      * sg/travis-linux32-sanity:
        travis-ci: don't fail if user already exists on 32 bit Linux build job
        travis-ci: don't run the test suite as root in the 32 bit Linux build
        travis-ci: don't repeat the path of the cache directory
        travis-ci: use 'set -e' in the 32 bit Linux build job
        travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build
      798224a1
    • J
      Merge branch 'nd/list-merge-strategy' · 8df7f755
      Junio C Hamano 提交于
      Completion of "git merge -s<strategy>" (in contrib/) did not work
      well in non-C locale.
      
      * nd/list-merge-strategy:
        completion: fix completing merge strategies on non-C locales
      8df7f755
    • J
      Merge branch 'jt/long-running-process-doc' · 417c04c5
      Junio C Hamano 提交于
      Doc updates.
      
      * jt/long-running-process-doc:
        Docs: split out long-running subprocess handshake
      417c04c5
    • J
      Merge branch 'jk/daemon-fixes' · 1772ad11
      Junio C Hamano 提交于
      Assorted fixes to "git daemon".
      
      * jk/daemon-fixes:
        daemon: fix length computation in newline stripping
        t/lib-git-daemon: add network-protocol helpers
        daemon: handle NULs in extended attribute string
        daemon: fix off-by-one in logging extended attributes
        t/lib-git-daemon: record daemon log
        t5570: use ls-remote instead of clone for interp tests
      1772ad11
    • J
      Merge branch 'pw/sequencer-in-process-commit' · 0f57f731
      Junio C Hamano 提交于
      The sequencer infrastructure is shared across "git cherry-pick",
      "git rebase -i", etc., and has always spawned "git commit" when it
      needs to create a commit.  It has been taught to do so internally,
      when able, by reusing the codepath "git commit" itself uses, which
      gives performance boost for a few tens of percents in some sample
      scenarios.
      
      * pw/sequencer-in-process-commit:
        sequencer: run 'prepare-commit-msg' hook
        t7505: add tests for cherry-pick and rebase -i/-p
        t7505: style fixes
        sequencer: assign only free()able strings to gpg_sign
        sequencer: improve config handling
        t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
        sequencer: try to commit without forking 'git commit'
        sequencer: load commit related config
        sequencer: simplify adding Signed-off-by: trailer
        commit: move print_commit_summary() to libgit
        commit: move post-rewrite code to libgit
        Add a function to update HEAD after creating a commit
        commit: move empty message checks to libgit
        t3404: check intermediate squash messages
      0f57f731
    • J
      Merge branch 'nd/shared-index-fix' · dd0c256b
      Junio C Hamano 提交于
      Code clean-up.
      
      * nd/shared-index-fix:
        read-cache: don't write index twice if we can't write shared index
        read-cache.c: move tempfile creation/cleanup out of write_shared_index
        read-cache.c: change type of "temp" in write_shared_index()
      dd0c256b
    • J
      Merge branch 'po/http-push-error-message' · 39a1dd80
      Junio C Hamano 提交于
      Debugging aid.
      
      * po/http-push-error-message:
        http-push: improve error log
      39a1dd80
    • J
      Merge branch 'po/clang-format-functype-weight' · 0c13c4f1
      Junio C Hamano 提交于
      Prevent "clang-format" from breaking line after function return type.
      
      * po/clang-format-functype-weight:
        clang-format: adjust penalty for return type line break
      0c13c4f1
    • J
      Merge branch 'jc/mailinfo-cleanup-fix' · 46e915c4
      Junio C Hamano 提交于
      Corner case bugfix.
      
      * jc/mailinfo-cleanup-fix:
        mailinfo: avoid segfault when can't open files
      46e915c4
    • J
      Merge branch 'sg/cocci-move-array' · cbf0240f
      Junio C Hamano 提交于
      Code clean-up.
      
      * sg/cocci-move-array:
        Use MOVE_ARRAY
      cbf0240f
    • J
      Merge branch 'tg/split-index-fixes' · e75c8621
      Junio C Hamano 提交于
      The split-index mode had a few corner case bugs fixed.
      
      * tg/split-index-fixes:
        travis: run tests with GIT_TEST_SPLIT_INDEX
        split-index: don't write cache tree with null oid entries
        read-cache: fix reading the shared index for other repos
      e75c8621
    • J
      Merge branch 'rs/strbuf-cocci-workaround' · 73df1b34
      Junio C Hamano 提交于
      Update Coccinelle rules to catch and optimize strbuf_addf(&buf, "%s", str)
      
      * rs/strbuf-cocci-workaround:
        cocci: use format keyword instead of a literal string
      73df1b34
    • J
      Merge branch 'mr/packed-ref-store-fix' · 2b72ea0a
      Junio C Hamano 提交于
      Crash fix for a corner case where an error codepath tried to unlock
      what it did not acquire lock on.
      
      * mr/packed-ref-store-fix:
        files_initial_transaction_commit(): only unlock if locked
      2b72ea0a
    • J
      Merge branch 'jt/http-redact-cookies' · 53274637
      Junio C Hamano 提交于
      The http tracing code, often used to debug connection issues,
      learned to redact potentially sensitive information from its output
      so that it can be more safely sharable.
      
      * jt/http-redact-cookies:
        http: support omitting data from traces
        http: support cookie redaction when tracing
      53274637
    • J
      Merge branch 'ds/use-get-be64' · 2dc69eef
      Junio C Hamano 提交于
      Code clean-up.
      
      * ds/use-get-be64:
        packfile: use get_be64() for large offsets
      2dc69eef
    • J
      Merge branch 'cc/sha1-file-name' · 92389416
      Junio C Hamano 提交于
      Code clean-up.
      
      * cc/sha1-file-name:
        sha1_file: improve sha1_file_name() perfs
        sha1_file: remove static strbuf from sha1_file_name()
      92389416
    • J
      Merge branch 'nd/trace-with-env' · 3efeec3a
      Junio C Hamano 提交于
      The tracing machinery learned to report tweaking of environment
      variables as well.
      
      * nd/trace-with-env:
        run-command.c: print new cwd in trace_run_command()
        run-command.c: print env vars in trace_run_command()
        run-command.c: print program 'git' when tracing git_cmd mode
        run-command.c: introduce trace_run_command()
        trace.c: move strbuf_release() out of print_trace_line()
        trace: avoid unnecessary quoting
        sq_quote_argv: drop maxlen parameter
      3efeec3a
    • J
      Merge branch 'pc/submodule-helper' · ead8dbe2
      Junio C Hamano 提交于
      Rewrite two more "git submodule" subcommands in C.
      
      * pc/submodule-helper:
        submodule: port submodule subcommand 'deinit' from shell to C
        submodule: port submodule subcommand 'sync' from shell to C
      ead8dbe2
    • J
      Merge branch 'rb/hashmap-h-compilation-fix' · 922ffec6
      Junio C Hamano 提交于
      Code clean-up.
      
      * rb/hashmap-h-compilation-fix:
        hashmap.h: remove unused variable
      922ffec6
    • J
      Merge branch 'nd/diff-flush-before-warning' · 17c8e0b3
      Junio C Hamano 提交于
      Avoid showing a warning message in the middle of a line of "git
      diff" output.
      
      * nd/diff-flush-before-warning:
        diff.c: flush stdout before printing rename warnings
      17c8e0b3
    • J
      Merge branch 'tb/crlf-conv-flags' · 9bc89b17
      Junio C Hamano 提交于
      Code clean-up.
      
      * tb/crlf-conv-flags:
        convert_to_git(): safe_crlf/checksafe becomes int conv_flags
      9bc89b17
    • J
      Merge branch 'rs/describe-unique-abbrev' · 8fe806bc
      Junio C Hamano 提交于
      Code clean-up.
      
      * rs/describe-unique-abbrev:
        describe: use strbuf_add_unique_abbrev() for adding short hashes
      8fe806bc
    • J
      Merge branch 'ks/submodule-doc-updates' · ab5a940d
      Junio C Hamano 提交于
      Doc updates.
      
      * ks/submodule-doc-updates:
        Doc/git-submodule: improve readability and grammar of a sentence
        Doc/gitsubmodules: make some changes to improve readability and syntax
      ab5a940d
    • J
      Merge branch 'cl/t9001-cleanup' · f5536f1c
      Junio C Hamano 提交于
      Test clean-up.
      
      * cl/t9001-cleanup:
        t9001: use existing helper in send-email test
      f5536f1c
    • J
      Merge branch 'gs/retire-mru' · 86762239
      Junio C Hamano 提交于
      Retire mru API as it does not give enough abstraction over
      underlying list API to be worth it.
      
      * gs/retire-mru:
        mru: Replace mru.[ch] with list.h implementation
      86762239
    • J
      Merge branch 'ot/mru-on-list' · afc8aa3f
      Junio C Hamano 提交于
      The first step to getting rid of mru API and using the
      doubly-linked list API directly instead.
      
      * ot/mru-on-list:
        mru: use double-linked list from list.h
      afc8aa3f
    • J
      Merge branch 'jh/partial-clone' · 6bed209a
      Junio C Hamano 提交于
      The machinery to clone & fetch, which in turn involves packing and
      unpacking objects, have been told how to omit certain objects using
      the filtering mechanism introduced by the jh/object-filtering
      topic, and also mark the resulting pack as a promisor pack to
      tolerate missing objects, taking advantage of the mechanism
      introduced by the jh/fsck-promisors topic.
      
      * jh/partial-clone:
        t5616: test bulk prefetch after partial fetch
        fetch: inherit filter-spec from partial clone
        t5616: end-to-end tests for partial clone
        fetch-pack: restore save_commit_buffer after use
        unpack-trees: batch fetching of missing blobs
        clone: partial clone
        partial-clone: define partial clone settings in config
        fetch: support filters
        fetch: refactor calculation of remote list
        fetch-pack: test support excluding large blobs
        fetch-pack: add --no-filter
        fetch-pack, index-pack, transport: partial clone
        upload-pack: add object filtering for partial clone
      6bed209a
    • J
      Merge branch 'jh/fsck-promisors' · f3d618d2
      Junio C Hamano 提交于
      In preparation for implementing narrow/partial clone, the machinery
      for checking object connectivity used by gc and fsck has been
      taught that a missing object is OK when it is referenced by a
      packfile specially marked as coming from trusted repository that
      promises to make them available on-demand and lazily.
      
      * jh/fsck-promisors:
        gc: do not repack promisor packfiles
        rev-list: support termination at promisor objects
        sha1_file: support lazily fetching missing objects
        introduce fetch-object: fetch one promisor object
        index-pack: refactor writing of .keep files
        fsck: support promisor objects as CLI argument
        fsck: support referenced promisor objects
        fsck: support refs pointing to promisor objects
        fsck: introduce partialclone extension
        extension.partialclone: introduce partial clone extension
      f3d618d2
    • J
      Merge branch 'ab/simplify-perl-makefile' · ed1b87ef
      Junio C Hamano 提交于
      The build procedure for perl/ part has been greatly simplified by
      weaning ourselves off of MakeMaker.
      
      * ab/simplify-perl-makefile:
        perl: treat PERLLIB_EXTRA as an extra path again
        perl: avoid *.pmc and fix Error.pm further
        Makefile: replace perl/Makefile.PL with simple make rules
      ed1b87ef