1. 11 Aug, 2016 1 commit
    • Jeff Hostetler's avatar
      status: collect per-file data for --porcelain=v2 · 1ecdecce
      Jeff Hostetler authored
      Collect extra per-file data for porcelain V2 format.
      
      The output of `git status --porcelain` leaves out many
      details about the current status that clients might like
      to have.  This can force them to be less efficient as they
      may need to launch secondary commands (and try to match
      the logic within git) to accumulate this extra information.
      For example, a GUI IDE might want the file mode to display
      the correct icon for a changed item (without having to stat
      it afterwards).
      Signed-off-by: default avatarJeff Hostetler <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      1ecdecce
  2. 05 Aug, 2016 3 commits
  3. 28 Jul, 2016 28 commits
    • Junio C Hamano's avatar
      Sync with maint · f8f7adce
      Junio C Hamano authored
      * maint:
        Some fixes for 2.9.3
      f8f7adce
    • Junio C Hamano's avatar
      Eighth batch of topics for 2.10 · 8213178c
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      8213178c
    • Junio C Hamano's avatar
      t9100: portability fix · 2a96d398
      Junio C Hamano authored
      Do not say "export VAR=VAL"; "VAR=VAL && export VAR" is always more
      portable.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      2a96d398
    • Junio C Hamano's avatar
      Merge branch 'master' of git://git.bogomips.org/git-svn · 0f3d855e
      Junio C Hamano authored
      * 'master' of git://git.bogomips.org/git-svn:
        git-svn: allow --version to work anywhere
        git-svn: document svn.authorsProg in config
      0f3d855e
    • Junio C Hamano's avatar
      Some fixes for 2.9.3 · 08df31ee
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      08df31ee
    • Junio C Hamano's avatar
      Merge branch 'ak/lazy-prereq-mktemp' into maint · 1ecc6b29
      Junio C Hamano authored
      A test that unconditionally used "mktemp" learned that the command
      is not necessarily available everywhere.
      
      * ak/lazy-prereq-mktemp:
        t7610: test for mktemp before test execution
      1ecc6b29
    • Junio C Hamano's avatar
      Merge branch 'nd/icase' into maint · 6cbec0da
      Junio C Hamano authored
      "git grep -i" has been taught to fold case in non-ascii locales
      correctly.
      
      * nd/icase:
        grep.c: reuse "icase" variable
        diffcore-pickaxe: support case insensitive match on non-ascii
        diffcore-pickaxe: Add regcomp_or_die()
        grep/pcre: support utf-8
        gettext: add is_utf8_locale()
        grep/pcre: prepare locale-dependent tables for icase matching
        grep: rewrite an if/else condition to avoid duplicate expression
        grep/icase: avoid kwsset when -F is specified
        grep/icase: avoid kwsset on literal non-ascii strings
        test-regex: expose full regcomp() to the command line
        test-regex: isolate the bug test code
        grep: break down an "if" stmt in preparation for next changes
      6cbec0da
    • Junio C Hamano's avatar
      Merge branch 'sb/submodule-parallel-fetch' into maint · 8e4571e5
      Junio C Hamano authored
      Fix recently introduced codepaths that are involved in parallel
      submodule operations, which gave up on reading too early, and
      could have wasted CPU while attempting to write under a corner
      case condition.
      
      * sb/submodule-parallel-fetch:
        hoist out handle_nonblock function for xread and xwrite
        xwrite: poll on non-blocking FDs
        xread: retry after poll on EAGAIN/EWOULDBLOCK
      8e4571e5
    • Junio C Hamano's avatar
      Merge branch 'dk/blame-move-no-reason-for-1-line-context' into maint · c81d2836
      Junio C Hamano authored
      "git blame -M" missed a single line that was moved within the file.
      
      * dk/blame-move-no-reason-for-1-line-context:
        blame: require 0 context lines while finding moved lines with -M
      c81d2836
    • Junio C Hamano's avatar
      Merge branch 'jk/test-match-signal' into maint · e5a730a1
      Junio C Hamano authored
      The test framework learned a new helper test_match_signal to
      check an exit code from getting killed by an expected signal.
      
      * jk/test-match-signal:
        t/lib-git-daemon: use test_match_signal
        test_must_fail: use test_match_signal
        t0005: use test_match_signal as appropriate
        tests: factor portable signal check out of t0005
      e5a730a1
    • Junio C Hamano's avatar
      Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint · 174f9e62
      Junio C Hamano authored
      One part of "git am" had an oddball helper function that called
      stuff from outside "his" as opposed to calling what we have "ours",
      which was not gender-neutral and also inconsistent with the rest of
      the system where outside stuff is usuall called "theirs" in
      contrast to "ours".
      
      * js/am-call-theirs-theirs-in-fallback-3way:
        am: counteract gender bias
      174f9e62
    • Junio C Hamano's avatar
      Merge branch 'js/t3404-grammo-fix' into maint · 8a81d5f5
      Junio C Hamano authored
      Grammofix.
      
      * js/t3404-grammo-fix:
        t3404: fix a grammo (commands are ran -> commands are run)
      8a81d5f5
    • Junio C Hamano's avatar
      Merge branch 'nd/doc-new-command' into maint · dcfb9d7d
      Junio C Hamano authored
      Typofix in a doc.
      
      * nd/doc-new-command:
        new-command.txt: correct the command description file
      dcfb9d7d
    • Junio C Hamano's avatar
      Merge branch 'ew/gc-auto-pack-limit-fix' into maint · 87be95b6
      Junio C Hamano authored
      "gc.autoPackLimit" when set to 1 should not trigger a repacking
      when there is only one pack, but the code counted poorly and did
      so.
      
      * ew/gc-auto-pack-limit-fix:
        gc: fix off-by-one error with gc.autoPackLimit
      87be95b6
    • Junio C Hamano's avatar
      Merge branch 'js/color-on-windows-comment' into maint · 52d637c4
      Junio C Hamano authored
      For a long time, we carried an in-code comment that said our
      colored output would work only when we use fprintf/fputs on
      Windows, which no longer is the case for the past few years.
      
      * js/color-on-windows-comment:
        color.h: remove obsolete comment about limitations on Windows
      52d637c4
    • Junio C Hamano's avatar
      Merge branch 'mm/doc-tt' into maint · 1032eb9c
      Junio C Hamano authored
      More mark-up updates to typeset strings that are expected to
      literally typed by the end user in fixed-width font.
      
      * mm/doc-tt:
        doc: typeset HEAD and variants as literal
        CodingGuidelines: formatting HEAD in documentation
        doc: typeset long options with argument as literal
        doc: typeset '--' as literal
        doc: typeset long command-line options as literal
        doc: typeset short command-line options as literal
        Documentation/git-mv.txt: fix whitespace indentation
      1032eb9c
    • Junio C Hamano's avatar
      Merge branch 'js/sign-empty-commit-fix' into maint · 475495ff
      Junio C Hamano authored
      "git commit --amend --allow-empty-message -S" for a commit without
      any message body could have misidentified where the header of the
      commit object ends.
      
      * js/sign-empty-commit-fix:
        commit -S: avoid invalid pointer with empty message
      475495ff
    • Junio C Hamano's avatar
      Merge branch 'ps/rebase-i-auto-unstash-upon-abort' into maint · ae8daba6
      Junio C Hamano authored
      "git rebase -i --autostash" did not restore the auto-stashed change
      when the operation was aborted.
      
      * ps/rebase-i-auto-unstash-upon-abort:
        rebase -i: restore autostash on abort
      ae8daba6
    • Junio C Hamano's avatar
      Merge branch 'nd/ita-cleanup' into maint · c12c71fa
      Junio C Hamano authored
      Git does not know what the contents in the index should be for a
      path added with "git add -N" yet, so "git grep --cached" should not
      show hits (or show lack of hits, with -L) in such a path, but that
      logic does not apply to "git grep", i.e. searching in the working
      tree files.  But we did so by mistake, which has been corrected.
      
      * nd/ita-cleanup:
        grep: fix grepping for "intent to add" files
        t7810-grep.sh: fix a whitespace inconsistency
        t7810-grep.sh: fix duplicated test name
      c12c71fa
    • Junio C Hamano's avatar
      Merge branch 'js/find-commit-subject-ignore-leading-blanks' into maint · 4966b58f
      Junio C Hamano authored
      A helper function that takes the contents of a commit object and
      finds its subject line did not ignore leading blank lines, as is
      commonly done by other codepaths.  Make it ignore leading blank
      lines to match.
      
      * js/find-commit-subject-ignore-leading-blanks:
        reset --hard: skip blank lines when reporting the commit subject
        sequencer: use skip_blank_lines() to find the commit subject
        commit -C: skip blank lines at the beginning of the message
        commit.c: make find_commit_subject() more robust
        pretty: make the skip_blank_lines() function public
      4966b58f
    • Junio C Hamano's avatar
      Merge branch 'dg/subtree-rebase-test' into maint · 053e2fb5
      Junio C Hamano authored
      Add a test to specify the desired behaviour that currently is not
      available in "git rebase -Xsubtree=...".
      
      * dg/subtree-rebase-test:
        contrib/subtree: Add a test for subtree rebase that loses commits
      053e2fb5
    • Junio C Hamano's avatar
      Merge branch 'sb/submodule-deinit-all' · b8307836
      Junio C Hamano authored
      A comment update for a topic that was merged to Git v2.8.
      
      * sb/submodule-deinit-all:
        submodule deinit: remove outdated comment
      b8307836
    • Junio C Hamano's avatar
      Merge branch 'ew/find-perl-on-freebsd-in-local' · 36f99a40
      Junio C Hamano authored
      Recent FreeBSD stopped making perl available at /usr/bin/perl;
      switch the default the built-in path to /usr/local/bin/perl on not
      too ancient FreeBSD releases.
      
      * ew/find-perl-on-freebsd-in-local:
        config.mak.uname: correct perl path on FreeBSD
      36f99a40
    • Junio C Hamano's avatar
      Merge branch 'ew/daemon-socket-keepalive' · b48dfd86
      Junio C Hamano authored
      Recent update to "git daemon" tries to enable the socket-level
      KEEPALIVE, but when it is spawned via inetd, the standard input
      file descriptor may not necessarily be connected to a socket.
      Suppress an ENOTSOCK error from setsockopt().
      
      * ew/daemon-socket-keepalive:
        Windows: add missing definition of ENOTSOCK
        daemon: ignore ENOTSOCK from setsockopt
      b48dfd86
    • Junio C Hamano's avatar
      Merge branch 'nd/pack-ofs-4gb-limit' · ad2d7776
      Junio C Hamano authored
      "git pack-objects" and "git index-pack" mostly operate with off_t
      when talking about the offset of objects in a packfile, but there
      were a handful of places that used "unsigned long" to hold that
      value, leading to an unintended truncation.
      
      * nd/pack-ofs-4gb-limit:
        fsck: use streaming interface for large blobs in pack
        pack-objects: do not truncate result in-pack object size on 32-bit systems
        index-pack: correct "offset" type in unpack_entry_data()
        index-pack: report correct bad object offsets even if they are large
        index-pack: correct "len" type in unpack_data()
        sha1_file.c: use type off_t* for object_info->disk_sizep
        pack-objects: pass length to check_pack_crc() without truncation
      ad2d7776
    • Junio C Hamano's avatar
      Merge branch 'nd/worktree-lock' · 2c608e0f
      Junio C Hamano authored
      "git worktree prune" protected worktrees that are marked as
      "locked" by creating a file in a known location.  "git worktree"
      command learned a dedicated command pair to create and remove such
      a file, so that the users do not have to do this with editor.
      
      * nd/worktree-lock:
        worktree.c: find_worktree() search by path suffix
        worktree: add "unlock" command
        worktree: add "lock" command
        worktree.c: add is_worktree_locked()
        worktree.c: add is_main_worktree()
        worktree.c: add find_worktree()
      2c608e0f
    • Junio C Hamano's avatar
      Merge branch 'rs/notes-merge-no-toctou' · d0b6966e
      Junio C Hamano authored
      "git notes merge" had a code to see if a path exists (and fails if
      it does) and then open the path for writing (when it doesn't).
      Replace it with open with O_EXCL.
      
      * rs/notes-merge-no-toctou:
        notes-merge: use O_EXCL to avoid overwriting existing files
      d0b6966e
    • Junio C Hamano's avatar
      Merge branch 'js/rebase-i-tests' · c97268c8
      Junio C Hamano authored
      A few tests that specifically target "git rebase -i" have been
      added.
      
      * js/rebase-i-tests:
        rebase -i: we allow extra spaces after fixup!/squash!
        rebase -i: demonstrate a bug with --autosquash
        t3404: add a test for the --gpg-sign option
      c97268c8
  4. 26 Jul, 2016 2 commits
  5. 25 Jul, 2016 6 commits
    • Junio C Hamano's avatar
      Seventh batch of topics for 2.10 · 8c6d1f98
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      8c6d1f98
    • Junio C Hamano's avatar
      Merge branch 'rs/use-strbuf-addbuf' · b4e8a847
      Junio C Hamano authored
      Code cleanup.
      
      * rs/use-strbuf-addbuf:
        strbuf: avoid calling strbuf_grow() twice in strbuf_addbuf()
        use strbuf_addbuf() for appending a strbuf to another
      b4e8a847
    • Junio C Hamano's avatar
      Merge branch 'ew/autoconf-pthread' · 7b01ab56
      Junio C Hamano authored
      Existing autoconf generated test for the need to link with pthread
      library did not check all the functions from pthread libraries;
      recent FreeBSD has some functions in libc but not others, and we
      mistakenly thought linking with libc is enough when it is not.
      
      * ew/autoconf-pthread:
        configure.ac: stronger test for pthread linkage
      7b01ab56
    • Junio C Hamano's avatar
      Merge branch 'mh/blame-worktree' · 37e9c7f5
      Junio C Hamano authored
      "git blame file" allowed the lineage of lines in the uncommitted,
      unadded contents of "file" to be inspected, but it refused when
      "file" did not appear in the current commit.  When "file" was
      created by renaming an existing file (but the change has not been
      committed), this restriction was unnecessarily tight.
      
      * mh/blame-worktree:
        t/t8003-blame-corner-cases.sh: Use here documents
        blame: allow to blame paths freshly added to the index
      37e9c7f5
    • Junio C Hamano's avatar
      Merge branch 'js/fsck-name-object' · 9db39797
      Junio C Hamano authored
      When "git fsck" reports a broken link (e.g. a tree object contains
      a blob that does not exist), both containing object and the object
      that is referred to were reported with their 40-hex object names.
      The command learned the "--name-objects" option to show the path to
      the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
      
      * js/fsck-name-object:
        fsck: optionally show more helpful info for broken links
        fsck: give the error function a chance to see the fsck_options
        fsck_walk(): optionally name objects on the go
        fsck: refactor how to describe objects
      9db39797
    • Junio C Hamano's avatar
      Merge branch 'nd/cache-tree-ita' · 3cc75c10
      Junio C Hamano authored
      "git add -N dir/file && git write-tree" produced an incorrect tree
      when there are other paths in the same directory that sorts after
      "file".
      
      * nd/cache-tree-ita:
        cache-tree: do not generate empty trees as a result of all i-t-a subentries
        cache-tree.c: fix i-t-a entry skipping directory updates sometimes
        test-lib.sh: introduce and use $EMPTY_BLOB
        test-lib.sh: introduce and use $EMPTY_TREE
      3cc75c10