1. 29 Jun, 2018 10 commits
  2. 28 Jun, 2018 12 commits
    • Junio C Hamano's avatar
      Second batch for 2.19 cycle · e3331758
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      e3331758
    • Junio C Hamano's avatar
      Merge branch 'sb/fix-fetching-moved-submodules' · 085d2abf
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'tz/cred-netrc-cleanup' · cf22247b
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'jc/clean-after-sanity-tests' · 18404434
      Junio C Hamano authored
      test cleanup.
      
      * jc/clean-after-sanity-tests:
        tests: clean after SANITY tests
      18404434
    • Junio C Hamano's avatar
      Merge branch 'nd/completion-negation' · 6da2d959
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'pw/add-p-recount' · 5eb8da85
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'jk/fetch-all-peeled-fix' · 0079732e
      Junio C Hamano authored
      "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
    • Junio C Hamano's avatar
      Merge branch 'ms/send-pack-honor-config' · 8d3661d5
      Junio C Hamano authored
      "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
    • Junio C Hamano's avatar
      Merge branch 'jh/partial-clone' · 92e1bbc3
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'sg/gpg-tests-fix' · 078f3dc0
      Junio C Hamano authored
      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
    • Junio C Hamano's avatar
      Merge branch 'as/safecrlf-quiet-fix' · 8063ff9c
      Junio C Hamano authored
      Fix for 2.17-era regression around `core.safecrlf`.
      
      * as/safecrlf-quiet-fix:
        config.c: fix regression for core.safecrlf false
      8063ff9c
    • Junio C Hamano's avatar
      Merge branch 'ab/refspec-init-fix' · a9097269
      Junio C Hamano authored
      Make refspec parsing codepath more robust.
      
      * ab/refspec-init-fix:
        refspec: initalize `refspec_item` in `valid_fetch_refspec()`
        refspec: add back a refspec_item_init() function
        refspec: s/refspec_item_init/&_or_die/g
      a9097269
  3. 25 Jun, 2018 17 commits
    • Junio C Hamano's avatar
      First batch for 2.19 cycle · ed843436
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      ed843436
    • Junio C Hamano's avatar
      Merge branch 'sb/plug-misc-leaks' · 02f27d0d
      Junio C Hamano authored
      Misc leak plugging.
      
      * sb/plug-misc-leaks:
        sequencer.c: plug mem leak in git_sequencer_config
        sequencer.c: plug leaks in do_pick_commit
        submodule--helper: plug mem leak in print_default_remote
        refs/packed-backend.c: close fd of empty file
      02f27d0d
    • Junio C Hamano's avatar
      Merge branch 'cc/tests-without-assuming-ref-files-backend' · 90fa1c5d
      Junio C Hamano authored
      Instead of mucking with filesystem directly, use plumbing commands
      update-ref etc. to manipulate the refs in the tests.
      
      * cc/tests-without-assuming-ref-files-backend:
        t9104: kosherly remove remote refs
      90fa1c5d
    • Junio C Hamano's avatar
      Merge branch 'sg/update-ref-stdin-cleanup' · 9eb97278
      Junio C Hamano authored
      Code cleanup.
      
      * sg/update-ref-stdin-cleanup:
        update-ref --stdin: use skip_prefix()
      9eb97278
    • Junio C Hamano's avatar
      Merge branch 'nd/reject-empty-shallow-request' · 208ee598
      Junio C Hamano authored
      "git fetch --shallow-since=<cutoff>" that specifies the cut-off
      point that is newer than the existing history used to end up
      grabbing the entire history.  Such a request now errors out.
      
      * nd/reject-empty-shallow-request:
        upload-pack: reject shallow requests that would return nothing
      208ee598
    • Junio C Hamano's avatar
      Merge branch 'ls/complete-remote-update-names' · f0209e80
      Junio C Hamano authored
      "git remote update" can take both a single remote nickname and a
      nickname for remote groups, and the completion script (in contrib/)
      has been taught about it.
      
      * ls/complete-remote-update-names:
        completion: complete remote names too
      f0209e80
    • Junio C Hamano's avatar
      Merge branch 'ag/rebase-p' · f3fec40e
      Junio C Hamano authored
      Separate "rebase -p" codepath out of "rebase -i" implementation to
      slim down the latter and make it easier to manage.
      
      * ag/rebase-p:
        rebase: remove -p code from git-rebase--interactive.sh
        rebase: use the new git-rebase--preserve-merges.sh
        rebase: strip unused code in git-rebase--preserve-merges.sh
        rebase: introduce a dedicated backend for --preserve-merges
      f3fec40e
    • Junio C Hamano's avatar
      Merge branch 'nd/complete-config-vars' · ebaf0a56
      Junio C Hamano authored
      Continuing with the idea to programatically enumerate various
      pieces of data required for command line completion, teach the
      codebase to report the list of configuration variables
      subcommands care about to help complete them.
      
      * nd/complete-config-vars:
        completion: complete general config vars in two steps
        log-tree: allow to customize 'grafted' color
        completion: support case-insensitive config vars
        completion: keep other config var completion in camelCase
        completion: drop the hard coded list of config vars
        am: move advice.amWorkDir parsing back to advice.c
        advice: keep config name in camelCase in advice_config[]
        fsck: produce camelCase config key names
        help: add --config to list all available config
        fsck: factor out msg_id_info[] lazy initialization code
        grep: keep all colors in an array
        Add and use generic name->id mapping code for color slot parsing
      ebaf0a56
    • Junio C Hamano's avatar
      Merge branch 'sb/object-store-alloc' · 11024058
      Junio C Hamano authored
      The conversion to pass "the_repository" and then "a_repository"
      throughout the object access API continues.
      
      * sb/object-store-alloc:
        alloc: allow arbitrary repositories for alloc functions
        object: allow create_object to handle arbitrary repositories
        object: allow grow_object_hash to handle arbitrary repositories
        alloc: add repository argument to alloc_commit_index
        alloc: add repository argument to alloc_report
        alloc: add repository argument to alloc_object_node
        alloc: add repository argument to alloc_tag_node
        alloc: add repository argument to alloc_commit_node
        alloc: add repository argument to alloc_tree_node
        alloc: add repository argument to alloc_blob_node
        object: add repository argument to grow_object_hash
        object: add repository argument to create_object
        repository: introduce parsed objects field
      11024058
    • Junio C Hamano's avatar
      Merge branch 'jk/show-index' · fa82bb70
      Junio C Hamano authored
      Modernize a less often used command.
      
      * jk/show-index:
        show-index: update documentation for index v2
        make show-index a builtin
      fa82bb70
    • Junio C Hamano's avatar
      Merge branch 'en/merge-recursive-tests' · 93b74a7c
      Junio C Hamano authored
      Clean up tests in t6xxx series about 'merge' command.
      
      * en/merge-recursive-tests:
        t6036: prefer test_when_finished to manual cleanup in following test
        t6036, t6042: prefer test_cmp to sequences of test
        t6036, t6042: prefer test_path_is_file, test_path_is_missing
        t6036, t6042: use test_line_count instead of wc -l
        t6036, t6042: use test_create_repo to keep tests independent
      93b74a7c
    • Junio C Hamano's avatar
      Merge branch 'nd/diff-apply-ita' · ac997db0
      Junio C Hamano authored
      "git diff" compares the index and the working tree.  For paths
      added with intent-to-add bit, the command shows the full contents
      of them as added, but the paths themselves were not marked as new
      files.  They are now shown as new by default.
      
      "git apply" learned the "--intent-to-add" option so that an
      otherwise working-tree-only application of a patch will add new
      paths to the index marked with the "intent-to-add" bit.
      
      * nd/diff-apply-ita:
        apply: add --intent-to-add
        t2203: add a test about "diff HEAD" case
        diff: turn --ita-invisible-in-index on by default
        diff: ignore --ita-[in]visible-in-index when diffing worktree-to-tree
      ac997db0
    • Junio C Hamano's avatar
      Merge branch 'ds/commit-graph-lockfile-fix' · a856e7d6
      Junio C Hamano authored
      Update to ds/generation-numbers topic.
      
      * ds/commit-graph-lockfile-fix:
        commit-graph: fix UX issue when .lock file exists
        commit-graph.txt: update design document
        merge: check config before loading commits
        commit: use generation number in remove_redundant()
        commit: add short-circuit to paint_down_to_common()
        commit: use generation numbers for in_merge_bases()
        ref-filter: use generation number for --contains
        commit-graph: always load commit-graph information
        commit: use generations in paint_down_to_common()
        commit-graph: compute generation numbers
        commit: add generation number to struct commit
        ref-filter: fix outdated comment on in_commit_list
      a856e7d6
    • Junio C Hamano's avatar
      Merge branch 'nd/commit-util-to-slab' · b3b2aaf0
      Junio C Hamano authored
      The in-core "commit" object had an all-purpose "void *util" field,
      which was tricky to use especially in library-ish part of the
      code.  All of the existing uses of the field has been migrated to a
      more dedicated "commit-slab" mechanism and the field is eliminated.
      
      * nd/commit-util-to-slab:
        commit.h: delete 'util' field in struct commit
        merge: use commit-slab in merge remote desc instead of commit->util
        log: use commit-slab in prepare_bases() instead of commit->util
        show-branch: note about its object flags usage
        show-branch: use commit-slab for commit-name instead of commit->util
        name-rev: use commit-slab for rev-name instead of commit->util
        bisect.c: use commit-slab for commit weight instead of commit->util
        revision.c: use commit-slab for show_source
        sequencer.c: use commit-slab to associate todo items to commits
        sequencer.c: use commit-slab to mark seen commits
        shallow.c: use commit-slab for commit depth instead of commit->util
        describe: use commit-slab for commit names instead of commit->util
        blame: use commit-slab for blame suspects instead of commit->util
        commit-slab: support shared commit-slab
        commit-slab.h: code split
      b3b2aaf0
    • Junio C Hamano's avatar
      Merge branch 'pc/submodule-helper-foreach' · ea27893a
      Junio C Hamano authored
      The bulk of "git submodule foreach" has been rewritten in C.
      
      * pc/submodule-helper-foreach:
        submodule: port submodule subcommand 'foreach' from shell to C
        submodule foreach: document variable '$displaypath'
        submodule foreach: document '$sm_path' instead of '$path'
        submodule foreach: correct '$path' in nested submodules from a subdirectory
      ea27893a
    • Junio C Hamano's avatar
      Prepare to start 2.19 cycle · 0bf8c8ce
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      0bf8c8ce
    • Stefan Beller's avatar
      f40f3c16
  4. 21 Jun, 2018 1 commit