1. 25 Jun, 2018 11 commits
    • 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
  2. 21 Jun, 2018 1 commit
  3. 19 Jun, 2018 7 commits
  4. 18 Jun, 2018 21 commits