1. 25 Apr, 2019 7 commits
    • Junio C Hamano's avatar
      Merge branch 'nd/commit-a-with-paths-msg-update' · e313c768
      Junio C Hamano authored
      The message given when "git commit -a <paths>" errors out has been
      updated.
      
      * nd/commit-a-with-paths-msg-update:
        commit: improve error message in "-a <paths>" case
      e313c768
    • Junio C Hamano's avatar
      Merge branch 'jk/server-info-rabbit-hole' · 776f3e1f
      Junio C Hamano authored
      Code clean-up around a much-less-important-than-it-used-to-be
      update_server_info() funtion.
      
      * jk/server-info-rabbit-hole:
        update_info_refs(): drop unused force parameter
        server-info: drop objdirlen pointer arithmetic
        server-info: drop nr_alloc struct member
        server-info: use strbuf to read old info/packs file
        server-info: simplify cleanup in parse_pack_def()
        server-info: fix blind pointer arithmetic
        http: simplify parsing of remote objects/info/packs
        packfile: fix pack basename computation
        midx: check both pack and index names for containment
        t5319: drop useless --buffer from cat-file
        t5319: fix bogus cat-file argument
        pack-revindex: open index if necessary
        packfile.h: drop extern from function declarations
      776f3e1f
    • Junio C Hamano's avatar
      Merge branch 'nd/diff-parseopt-4' · dcd6a8c0
      Junio C Hamano authored
      Fourth batch to teach the diff machinery to use the parse-options
      API.
      
      * nd/diff-parseopt-4:
        am: avoid diff_opt_parse()
        diff --no-index: use parse_options() instead of diff_opt_parse()
        range-diff: use parse_options() instead of diff_opt_parse()
        diff.c: allow --no-color-moved-ws
        diff-parseopt: convert --color-moved-ws
        diff-parseopt: convert --[no-]color-moved
        diff-parseopt: convert --inter-hunk-context
        diff-parseopt: convert --no-prefix
        diff-parseopt: convert --line-prefix
        diff-parseopt: convert --[src|dst]-prefix
        diff-parseopt: convert --[no-]abbrev
        diff-parseopt: convert --diff-filter
        diff-parseopt: convert --find-object
        diff-parseopt: convert -O
        diff-parseopt: convert --pickaxe-all|--pickaxe-regex
        diff-parseopt: convert -S|-G
        diff-parseopt: convert -l
        diff-parseopt: convert -z
        diff-parseopt: convert --ita-[in]visible-in-index
        diff-parseopt: convert --ws-error-highlight
      dcd6a8c0
    • Junio C Hamano's avatar
      Merge branch 'jk/unused-params-even-more' · 42844973
      Junio C Hamano authored
      Code cleanup.
      
      * jk/unused-params-even-more:
        parse_opt_ref_sorting: always use with NONEG flag
        pretty: drop unused strbuf from parse_padding_placeholder()
        pretty: drop unused "type" parameter in needs_rfc2047_encoding()
        parse-options: drop unused ctx parameter from show_gitcomp()
        fetch_pack(): drop unused parameters
        report_path_error(): drop unused prefix parameter
        unpack-trees: drop unused error_type parameters
        unpack-trees: drop name_entry from traverse_by_cache_tree()
        test-date: drop unused "now" parameter from parse_dates()
        update-index: drop unused prefix_length parameter from do_reupdate()
        log: drop unused "len" from show_tagger()
        log: drop unused rev_info from early output
        revision: drop some unused "revs" parameters
      42844973
    • Junio C Hamano's avatar
      Merge branch 'sg/test-atexit' · 579b75ad
      Junio C Hamano authored
      Test framework update to more robustly clean up leftover files and
      processes after tests are done.
      
      * sg/test-atexit:
        t9811-git-p4-label-import: fix pipeline negation
        git p4 test: disable '-x' tracing in the p4d watchdog loop
        git p4 test: simplify timeout handling
        git p4 test: clean up the p4d cleanup functions
        git p4 test: use 'test_atexit' to kill p4d and the watchdog process
        t0301-credential-cache: use 'test_atexit' to stop the credentials helper
        tests: use 'test_atexit' to stop httpd
        git-daemon: use 'test_atexit` to stop 'git-daemon'
        test-lib: introduce 'test_atexit'
        t/lib-git-daemon: make sure to kill the 'git-daemon' process
        test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'
      579b75ad
    • Junio C Hamano's avatar
      Merge branch 'ag/sequencer-reduce-rewriting-todo' · e62e68d3
      Junio C Hamano authored
      The scripted version of "git rebase -i" wrote and rewrote the todo
      list many times during a single step of its operation, and the
      recent C-rewrite made a faithful conversion of the logic to C.  The
      implementation has been updated to carry necessary information
      around in-core to avoid rewriting the same file over and over
      unnecessarily.
      
      * ag/sequencer-reduce-rewriting-todo:
        rebase--interactive: move transform_todo_file()
        sequencer: use edit_todo_list() in complete_action()
        rebase-interactive: rewrite edit_todo_list() to handle the initial edit
        rebase-interactive: append_todo_help() changes
        rebase-interactive: use todo_list_write_to_file() in edit_todo_list()
        sequencer: refactor skip_unnecessary_picks() to work on a todo_list
        rebase--interactive: move rearrange_squash_in_todo_file()
        rebase--interactive: move sequencer_add_exec_commands()
        sequencer: change complete_action() to use the refactored functions
        sequencer: make sequencer_make_script() write its script to a strbuf
        sequencer: refactor rearrange_squash() to work on a todo_list
        sequencer: refactor sequencer_add_exec_commands() to work on a todo_list
        sequencer: refactor check_todo_list() to work on a todo_list
        sequencer: introduce todo_list_write_to_file()
        sequencer: refactor transform_todos() to work on a todo_list
        sequencer: remove the 'arg' field from todo_item
        sequencer: make the todo_list structure public
        sequencer: changes in parse_insn_buffer()
      e62e68d3
    • Junio C Hamano's avatar
      Merge branch 'bp/post-index-change-hook' · 5795a75f
      Junio C Hamano authored
      A new hook "post-index-change" is called when the on-disk index
      file changes, which can help e.g. a virtualized working tree
      implementation.
      
      * bp/post-index-change-hook:
        read-cache: add post-index-change hook
      5795a75f
  2. 22 Apr, 2019 15 commits
    • Junio C Hamano's avatar
      The sixth batch · 14c0f8d3
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      14c0f8d3
    • Junio C Hamano's avatar
      Merge branch 'da/smerge' · 5116eab7
      Junio C Hamano authored
      "git mergetool" learned to offer Sublime Merge (smerge) as one of
      its backends.
      
      * da/smerge:
        contrib/completion: add smerge to the mergetool completion candidates
        mergetools: add support for smerge (Sublime Merge)
      5116eab7
    • Junio C Hamano's avatar
      Merge branch 'dl/flex-str-cocci' · 5f65d7d9
      Junio C Hamano authored
      Code clean-up.
      
      * dl/flex-str-cocci:
        cocci: FLEX_ALLOC_MEM to FLEX_ALLOC_STR
        midx.c: convert FLEX_ALLOC_MEM to FLEX_ALLOC_STR
      5f65d7d9
    • Junio C Hamano's avatar
      Merge branch 'js/spell-out-options-in-tests' · 39e4773d
      Junio C Hamano authored
      The tests have been updated not to rely on the abbreviated option
      names the parse-options API offers, to protect us from an
      abbreviated form of an option that used to be unique within the
      command getting non-unique when a new option that share the same
      prefix is added.
      
      * js/spell-out-options-in-tests:
        tests: disallow the use of abbreviated options (by default)
        tests (pack-objects): use the full, unabbreviated `--revs` option
        tests (status): spell out the `--find-renames` option in full
        tests (push): do not abbreviate the `--follow-tags` option
        t5531: avoid using an abbreviated option
        t7810: do not abbreviate `--no-exclude-standard` nor `--invert-match`
        tests (rebase): spell out the `--force-rebase` option
        tests (rebase): spell out the `--keep-empty` option
      39e4773d
    • Junio C Hamano's avatar
      Merge branch 'nd/read-tree-reset-doc' · 87e20f8c
      Junio C Hamano authored
      The documentation for "git read-tree --reset -u" has been updated.
      
      * nd/read-tree-reset-doc:
        read-tree.txt: clarify --reset and worktree changes
      87e20f8c
    • Junio C Hamano's avatar
      Merge branch 'nd/interpret-trailers-docfix' · 8a33ebc5
      Junio C Hamano authored
      Doc update.
      
      * nd/interpret-trailers-docfix:
        interpret-trailers.txt: start the desc line with a capital letter
      8a33ebc5
    • Junio C Hamano's avatar
      Merge branch 'sg/asciidoctor-in-ci' · bac754ea
      Junio C Hamano authored
      Update our support to format documentation in the CI environment,
      either with AsciiDoc ro Asciidoctor.
      
      * sg/asciidoctor-in-ci:
        ci: fix AsciiDoc/Asciidoctor stderr check in the documentation build job
        ci: stick with Asciidoctor v1.5.8 for now
        ci: install Asciidoctor in 'ci/install-dependencies.sh'
        Documentation/technical/protocol-v2.txt: fix formatting
        Documentation/technical/api-config.txt: fix formatting
        Documentation/git-diff-tree.txt: fix formatting
      bac754ea
    • Junio C Hamano's avatar
      Merge branch 'tz/asciidoctor-fixes' · ec8fcc78
      Junio C Hamano authored
      Doc updates.
      
      * tz/asciidoctor-fixes:
        Documentation/git-status: fix titles in porcelain v2 section
        Documentation/rev-list-options: wrap --date=<format> block with "--"
      ec8fcc78
    • Junio C Hamano's avatar
      Merge branch 'js/check-docs-exe' · 27ff7878
      Junio C Hamano authored
      Dev support update.
      
      * js/check-docs-exe:
        check-docs: fix for setups where executables have an extension
        check-docs: do not expect guide pages to correspond to commands
        check-docs: really look at the documented commands again
        docs: do not document the `git remote-testgit` command
        docs: move gitremote-helpers into section 7
      27ff7878
    • Junio C Hamano's avatar
      Merge branch 'nd/include-if-wildmatch' · 078b254d
      Junio C Hamano authored
      A buglet in configuration parser has been fixed.
      
      * nd/include-if-wildmatch:
        config: correct '**' matching in includeIf patterns
      078b254d
    • Junio C Hamano's avatar
      Merge branch 'cb/doco-mono' · 6b428054
      Junio C Hamano authored
      Clean-up markup in the documentation suite.
      
      * cb/doco-mono:
        doc: format pathnames and URLs as monospace.
        doc/CodingGuidelines: URLs and paths as monospace
      6b428054
    • Junio C Hamano's avatar
      Merge branch 'tg/stash-in-c-show-default-to-p-fix' · 8aed8034
      Junio C Hamano authored
      A regression fix.
      
      * tg/stash-in-c-show-default-to-p-fix:
        stash: setup default diff output format if necessary
      8aed8034
    • Junio C Hamano's avatar
      Merge branch 'js/stash-in-c-pathspec-fix' · 0ba1ba48
      Junio C Hamano authored
      Further fixes to "git stash" reimplemented in C.
      
      * js/stash-in-c-pathspec-fix:
        stash: pass pathspec as pointer
        built-in stash: handle :(glob) pathspecs again
        legacy stash: fix "rudimentary backport of -q"
      0ba1ba48
    • Junio C Hamano's avatar
      Merge branch 'tb/stash-in-c-unused-param-fix' · 646becd7
      Junio C Hamano authored
      Code clean-up.
      
      * tb/stash-in-c-unused-param-fix:
        stash: drop unused parameter
      646becd7
    • Junio C Hamano's avatar
      Merge branch 'ps/stash-in-c' · e36adf71
      Junio C Hamano authored
      "git stash" rewritten in C.
      
      * ps/stash-in-c: (28 commits)
        tests: add a special setup where stash.useBuiltin is off
        stash: optionally use the scripted version again
        stash: add back the original, scripted `git stash`
        stash: convert `stash--helper.c` into `stash.c`
        stash: replace all `write-tree` child processes with API calls
        stash: optimize `get_untracked_files()` and `check_changes()`
        stash: convert save to builtin
        stash: make push -q quiet
        stash: convert push to builtin
        stash: convert create to builtin
        stash: convert store to builtin
        stash: convert show to builtin
        stash: convert list to builtin
        stash: convert pop to builtin
        stash: convert branch to builtin
        stash: convert drop and clear to builtin
        stash: convert apply to builtin
        stash: mention options in `show` synopsis
        stash: add tests for `git stash show` config
        stash: rename test cases to be more descriptive
        ...
      e36adf71
  3. 16 Apr, 2019 18 commits