1. 24 Jun, 2017 17 commits
  2. 19 Jun, 2017 7 commits
    • Junio C Hamano's avatar
      Ninth batch for 2.14 · 05ec6e13
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      05ec6e13
    • Junio C Hamano's avatar
      Merge branch 'jk/consistent-h' · 50ad8561
      Junio C Hamano authored
      "git $cmd -h" for builtin commands calls the implementation of the
      command (i.e. cmd_$cmd() function) without doing any repository
      set-up, and the commands that expect RUN_SETUP is done by the Git
      potty needs to be prepared to show the help text without barfing.
      
      * jk/consistent-h:
        t0012: test "-h" with builtins
        git: add hidden --list-builtins option
        version: convert to parse-options
        diff- and log- family: handle "git cmd -h" early
        submodule--helper: show usage for "-h"
        remote-{ext,fd}: print usage message on invalid arguments
        upload-archive: handle "-h" option early
        credential: handle invalid arguments earlier
      50ad8561
    • Junio C Hamano's avatar
      Merge branch 'ab/perf-remove-index-lock' · 06959fe0
      Junio C Hamano authored
      When an existing repository is used for t/perf testing, we first
      create bit-for-bit copy of it, which may grab a transient state of
      the repository and freeze it into the repository used for testing,
      which then may cause Git operations to fail.  Single out "the index
      being locked" case and forcibly drop the lock from the copy.
      
      * ab/perf-remove-index-lock:
        perf: work around the tested repo having an index.lock
      06959fe0
    • Junio C Hamano's avatar
      Merge branch 'bw/object-id' · a6f38c10
      Junio C Hamano authored
      Conversion from uchar[20] to struct object_id continues.
      
      * bw/object-id: (33 commits)
        diff: rename diff_fill_sha1_info to diff_fill_oid_info
        diffcore-rename: use is_empty_blob_oid
        tree-diff: convert path_appendnew to object_id
        tree-diff: convert diff_tree_paths to struct object_id
        tree-diff: convert try_to_follow_renames to struct object_id
        builtin/diff-tree: cleanup references to sha1
        diff-tree: convert diff_tree_sha1 to struct object_id
        notes-merge: convert write_note_to_worktree to struct object_id
        notes-merge: convert verify_notes_filepair to struct object_id
        notes-merge: convert find_notes_merge_pair_ps to struct object_id
        notes-merge: convert merge_from_diffs to struct object_id
        notes-merge: convert notes_merge* to struct object_id
        tree-diff: convert diff_root_tree_sha1 to struct object_id
        combine-diff: convert find_paths_* to struct object_id
        combine-diff: convert diff_tree_combined to struct object_id
        diff: convert diff_flush_patch_id to struct object_id
        patch-ids: convert to struct object_id
        diff: finish conversion for prepare_temp_file to struct object_id
        diff: convert reuse_worktree_file to struct object_id
        diff: convert fill_filespec to struct object_id
        ...
      a6f38c10
    • Junio C Hamano's avatar
      Merge branch 'sb/submodule-rm-absorb' · d04787e6
      Junio C Hamano authored
      Doc update to a recently graduated topic.
      
      * sb/submodule-rm-absorb:
        Documentation/git-rm: correct submodule description
      d04787e6
    • Junio C Hamano's avatar
      Merge branch 'ab/pcre-v2' · ae7e4d4f
      Junio C Hamano authored
      Update "perl-compatible regular expression" support to enable JIT
      and also allow linking with the newer PCRE v2 library.
      
      * ab/pcre-v2:
        grep: add support for PCRE v2
        grep: un-break building with PCRE >= 8.32 without --enable-jit
        grep: un-break building with PCRE < 8.20
        grep: un-break building with PCRE < 8.32
        grep: add support for the PCRE v1 JIT API
        log: add -P as a synonym for --perl-regexp
        grep: skip pthreads overhead when using one thread
        grep: don't redundantly compile throwaway patterns under threading
      ae7e4d4f
    • Junio C Hamano's avatar
      Merge branch 'jk/pathspec-magic-disambiguation' · 32e0da58
      Junio C Hamano authored
      The convention for a command line is to follow "git cmdname
      --options" with revisions followed by an optional "--"
      disambiguator and then finally pathspecs.  When "--" is not there,
      we make sure early ones are all interpretable as revs (and do not
      look like paths) and later ones are the other way around.  A
      pathspec with "magic" (e.g. ":/p/a/t/h" that matches p/a/t/h from
      the top-level of the working tree, no matter what subdirectory you
      are working from) are conservatively judged as "not a path", which
      required disambiguation more often.  The command line parser
      learned to say "it's a pathspec" a bit more often when the syntax
      looks like so.
      
      * jk/pathspec-magic-disambiguation:
        verify_filename(): flip order of checks
        verify_filename(): treat ":(magic)" as a pathspec
        check_filename(): handle ":^" path magic
        check_filename(): use skip_prefix
        check_filename(): refactor ":/" handling
        t4208: add check for ":/" without matching file
      32e0da58
  3. 15 Jun, 2017 15 commits
  4. 13 Jun, 2017 1 commit