1. 25 Apr, 2019 11 commits
    • Junio C Hamano's avatar
      Merge branch 'ab/gc-reflog' · f3c19f85
      Junio C Hamano authored
      Fix various glitches in "git gc" around reflog handling.
      
      * ab/gc-reflog:
        gc: handle & check gc.reflogExpire config
        reflog tests: assert lack of early exit with expiry="never"
        reflog tests: test for the "points nowhere" warning
        reflog tests: make use of "test_config" idiom
        gc: refactor a "call me once" pattern
        gc: convert to using the_hash_algo
        gc: remove redundant check for gc_auto_threshold
      f3c19f85
    • Junio C Hamano's avatar
      Merge branch 'nd/checkout-m' · 4a3ed2be
      Junio C Hamano authored
      "git checkout -m <other>" was about carrying the differences
      between HEAD and the working-tree files forward while checking out
      another branch, and ignored the differences between HEAD and the
      index.  The command has been taught to abort when the index and the
      HEAD are different.
      
      * nd/checkout-m:
        checkout: prevent losing staged changes with --merge
        read-tree: add --quiet
        unpack-trees: rename "gently" flag to "quiet"
        unpack-trees: keep gently check inside add_rejected_path
      4a3ed2be
    • Junio C Hamano's avatar
      Merge branch 'js/difftool-no-index' · b72e9071
      Junio C Hamano authored
      "git difftool" can now run outside a repository.
      
      * js/difftool-no-index:
        difftool: allow running outside Git worktrees with --no-index
        parse-options: make OPT_ARGUMENT() more useful
        difftool: remove obsolete (and misleading) comment
      b72e9071
    • Junio C Hamano's avatar
      Merge branch 'pw/cherry-pick-continue' · d2dba18c
      Junio C Hamano authored
      "git cherry-pick --options A..B", after giving control back to the
      user to ask help resolving a conflicted step, did not honor the
      options it originally received, which has been corrected.
      
      * pw/cherry-pick-continue:
        cherry-pick --continue: remember options
        cherry-pick: demonstrate option amnesia
        sequencer: break some long lines
      d2dba18c
    • 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 14 commits
    • Junio C Hamano's avatar
      The fifth batch · ffac537e
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      ffac537e
    • Junio C Hamano's avatar
      Merge branch 'sg/t5318-cleanup' · 5866e586
      Junio C Hamano authored
      Code cleanup.
      
      * sg/t5318-cleanup:
        t5318-commit-graph: remove unused variable
      5866e586
    • Junio C Hamano's avatar
      Merge branch 'jt/t5551-protocol-v2-does-not-have-half-auth' · d11650dc
      Junio C Hamano authored
      Test update.
      
      * jt/t5551-protocol-v2-does-not-have-half-auth:
        t5551: mark half-auth no-op fetch test as v0-only
      d11650dc
    • Junio C Hamano's avatar
      Merge branch 'jk/http-walker-status-fix' · 3151a5fc
      Junio C Hamano authored
      dumb-http walker has been updated to share more error recovery
      strategy with the normal codepath.
      
      * jk/http-walker-status-fix:
        http: use normalize_curl_result() instead of manual conversion
        http: normalize curl results for dumb loose and alternates fetches
        http: factor out curl result code normalization
      3151a5fc
    • Junio C Hamano's avatar
      Merge branch 'jh/midx-verify-too-many-packs' · ec08c4fd
      Junio C Hamano authored
      "git multi-pack-index verify" did not scale well with the number of
      packfiles, which is being improved.
      
      * jh/midx-verify-too-many-packs:
        midx: during verify group objects by packfile to speed verification
        midx: add progress indicators in multi-pack-index verify
        trace2:data: add trace2 data to midx
        progress: add sparse mode to force 100% complete message
      ec08c4fd
    • Junio C Hamano's avatar
      Merge branch 'bb/unicode-12' · 26623f8f
      Junio C Hamano authored
      Unicode update.
      
      * bb/unicode-12:
        unicode: update the width tables to Unicode 12
      26623f8f
    • Junio C Hamano's avatar
      Merge branch 'jk/refs-double-abort' · 2e08c892
      Junio C Hamano authored
      A corner case bug in the refs API has been corrected.
      
      * jk/refs-double-abort:
        refs/files-backend: don't look at an aborted transaction
        refs/files-backend: handle packed transaction prepare failure
      2e08c892
    • Junio C Hamano's avatar
      Merge branch 'nd/checkout-m-doc-update' · 3feaacba
      Junio C Hamano authored
      Doc about the above.
      
      * nd/checkout-m-doc-update:
        checkout.txt: note about losing staged changes with --merge
      3feaacba
    • Junio C Hamano's avatar
      Merge branch 'tb/trace2-va-list-fix' · e9bd21c3
      Junio C Hamano authored
      Fix some code that passed a NULL when a va_list was expected.
      
      * tb/trace2-va-list-fix:
        trace2: NULL is not allowed for va_list
      e9bd21c3
    • Junio C Hamano's avatar
      Merge branch 'tz/completion' · 2850232a
      Junio C Hamano authored
      The completion helper code now pays attention to repository-local
      configuration (when available), which allows --list-cmds to honour
      a repository specific setting of completion.commands, for example.
      
      * tz/completion:
        completion: use __git when calling --list-cmds
        completion: fix multiple command removals
        t9902: test multiple removals via completion.commands
        git: read local config in --list-cmds
      2850232a
    • Junio C Hamano's avatar
      Merge branch 'ma/doc-diff-doc-vs-doctor-comparison' · 08c9757a
      Junio C Hamano authored
      Dev support update to make it easier to compare two formatted
      results from our documentation.
      
      * ma/doc-diff-doc-vs-doctor-comparison:
        doc-diff: add `--cut-header-footer`
        doc-diff: support diffing from/to AsciiDoc(tor)
        doc-diff: let `render_tree()` take an explicit directory name
        Doc: auto-detect changed build flags
      08c9757a
    • Junio C Hamano's avatar
      Merge branch 'tz/t4038-bash-redirect-target-workaround' · 32211775
      Junio C Hamano authored
      Work-around extra warning from bash in our tests.
      
      * tz/t4038-bash-redirect-target-workaround:
        t4038-diff-combined: quote paths with whitespace
      32211775
    • Junio C Hamano's avatar
      Merge branch 'ab/drop-scripted-rebase' · 4f3036cf
      Junio C Hamano authored
      Retire scripted "git rebase" implementation.
      
      * ab/drop-scripted-rebase:
        rebase: remove the rebase.useBuiltin setting
      4f3036cf
    • Junio C Hamano's avatar
      Merge branch 'jk/perf-lib-tee' · 67e3ec10
      Junio C Hamano authored
      Code cleanup in the test framework.
      
      * jk/perf-lib-tee:
        perf-lib.sh: rely on test-lib.sh for --tee handling
      67e3ec10