Skip to content
Commits on May 26, 2016
  1. @gitster

    Sync with maint

    * maint:
      Start preparing for 2.8.4
      archive-tar: convert snprintf to xsnprintf
    gitster committed May 26, 2016
  2. @gitster

    Start preparing for 2.8.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 26, 2016
  3. @gitster

    Merge branch 'jc/linkgit-fix' into maint

    Many 'linkgit:<git documentation page>' references were broken,
    which are all fixed with this.
    
    * jc/linkgit-fix:
      Documentation: fix linkgit references
    gitster committed May 26, 2016
  4. @gitster

    Merge branch 'ls/travis-build-doc' into maint

    CI test was taught to build documentation pages.
    
    * ls/travis-build-doc:
      travis-ci: build documentation
    gitster committed May 26, 2016
  5. @gitster

    Merge branch 'jc/fsck-nul-in-commit' into maint

    "git fsck" learned to catch NUL byte in a commit object as
    potential error and warn.
    
    * jc/fsck-nul-in-commit:
      fsck: detect and warn a commit with embedded NUL
      fsck_commit_buffer(): do not special case the last validation
    gitster committed May 26, 2016
  6. @gitster

    Merge branch 'jk/rebase-interative-eval-fix' into maint

    Portability enhancement for "rebase -i" to help platforms whose
    shell does not like "for i in <empty>" (which is not POSIX-kosher).
    
    * jk/rebase-interative-eval-fix:
      rebase--interactive: avoid empty list in shell for-loop
    gitster committed May 26, 2016
  7. @gitster

    Merge branch 'js/windows-dotgit' into maint

    On Windows, .git and optionally any files whose name starts with a
    dot are now marked as hidden, with a core.hideDotFiles knob to
    customize this behaviour.
    
    * js/windows-dotgit:
      mingw: remove unnecessary definition
      mingw: introduce the 'core.hideDotFiles' setting
    gitster committed May 26, 2016
  8. @gitster

    Merge branch 'kf/gpg-sig-verification-doc' into maint

    Documentation for "git merge --verify-signatures" has been updated
    to clarify that the signature of only the commit at the tip is
    verified.  Also the phrasing used for signature and key validity is
    adjusted to align with that used by OpenPGP.
    
    * kf/gpg-sig-verification-doc:
      Documentation: clarify signature verification
    gitster committed May 26, 2016
  9. @gitster

    Merge branch 'lp/typofixes' into maint

    Typofixes.
    
    * lp/typofixes:
      typofix: assorted typofixes in comments, documentation and messages
    gitster committed May 26, 2016
  10. @gitster

    Merge branch 'sb/z-is-gnutar-ism' into maint

    Test fix.
    
    * sb/z-is-gnutar-ism:
      t6041: do not compress backup tar file
      t3513: do not compress backup tar file
    gitster committed May 26, 2016
  11. @gitster

    Merge branch 'va/i18n-misc-updates' into maint

    Mark several messages for translation.
    
    * va/i18n-misc-updates:
      i18n: unpack-trees: avoid substituting only a verb in sentences
      i18n: builtin/pull.c: split strings marked for translation
      i18n: builtin/pull.c: mark placeholders for translation
      i18n: git-parse-remote.sh: mark strings for translation
      i18n: branch: move comment for translators
      i18n: branch: unmark string for translation
      i18n: builtin/rm.c: remove a comma ',' from string
      i18n: unpack-trees: mark strings for translation
      i18n: builtin/branch.c: mark option for translation
      i18n: index-pack: use plural string instead of normal one
    gitster committed May 26, 2016
  12. @gitster

    Merge branch 'bn/config-doc-tt-varnames' into maint

    Doc formatting fixes.
    
    * bn/config-doc-tt-varnames:
      config: consistently format $variables in monospaced font
      config: describe 'pathname' value type
    gitster committed May 26, 2016
  13. @gitster

    Merge branch 'nd/remote-plural-ours-plus-theirs' into maint

    Message fix.
    
    * nd/remote-plural-ours-plus-theirs:
      remote.c: specify correct plural form in "commit diverge" message
    gitster committed May 26, 2016
  14. @gitster

    Merge branch 'ak/t4151-ls-files-could-be-empty' into maint

    Test fix.
    
    * ak/t4151-ls-files-could-be-empty:
      t4151: make sure argument to 'test -z' is given
    gitster committed May 26, 2016
  15. @gitster

    Merge branch 'jc/test-seq' into maint

    Test fix.
    
    * jc/test-seq:
      test-lib-functions.sh: rewrite test_seq without Perl
      test-lib-functions.sh: remove misleading comment on test_seq
    gitster committed May 26, 2016
  16. @gitster

    Merge branch 'tb/t5601-sed-fix' into maint

    Test fix.
    
    * tb/t5601-sed-fix:
      t5601: Remove trailing space in sed expression
    gitster committed May 26, 2016
  17. @gitster

    Merge branch 'va/i18n-remote-comment-to-align' into maint

    Message fix.
    
    * va/i18n-remote-comment-to-align:
      i18n: remote: add comment for translators
    gitster committed May 26, 2016
  18. @gitster

    Merge branch 'va/mailinfo-doc-typofix' into maint

    Typofix.
    
    * va/mailinfo-doc-typofix:
      Documentation/git-mailinfo: fix typo
    gitster committed May 26, 2016
  19. @gitster

    Merge branch 'maint-2.7' into maint

    * maint-2.7:
      archive-tar: convert snprintf to xsnprintf
    gitster committed May 26, 2016
  20. @gitster

    Merge branch 'jk/war-on-sprintf' into maint-2.7

    * jk/war-on-sprintf:
      archive-tar: convert snprintf to xsnprintf
    gitster committed May 26, 2016
  21. @peff @gitster

    archive-tar: convert snprintf to xsnprintf

    Commit f2f0267 (archive-tar: use xsnprintf for trivial
    formatting, 2015-09-24) converted cases of "sprintf" to
    "xsnprintf", but accidentally left one as just "snprintf".
    This meant that we could silently truncate the resulting
    buffer instead of flagging an error.
    
    In practice, this is impossible to achieve, as we are
    formatting a ustar checksum, which can be at most 7
    characters. But the point of xsnprintf is to document and
    check for "should be impossible" conditions; this site was
    just accidentally mis-converted during f2f0267.
    
    Noticed-by: Paul Green <Paul.Green@stratus.com>
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster May 26, 2016
Commits on May 23, 2016
  1. @gitster

    Git 2.9-rc0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 23, 2016
  2. @gitster

    Merge branch 'svn-travis' of git://bogomips.org/git-svn

    * 'svn-travis' of git://bogomips.org/git-svn:
      travis-ci: enable Git SVN tests t91xx on Linux
    gitster committed May 23, 2016
  3. @gitster

    Merge branch 'jc/rerere-multi'

    * jc/rerere-multi:
      rerere: remove an null statement
      rerere: plug memory leaks upon "rerere forget" failure
    gitster committed May 23, 2016
  4. @gitster

    Merge branch 'da/difftool'

    "git difftool" learned to handle unmerged paths correctly in
    dir-diff mode.
    
    * da/difftool:
      difftool: handle unmerged files in dir-diff mode
      difftool: initialize variables for readability
    gitster committed May 23, 2016
  5. @gitster

    Merge branch 'jk/test-z-n-unquoted'

    t9xxx series has been updated primarily for readability, while
    fixing small bugs in it.  A few scripted Porcelains have also been
    updated to fix possible bugs around their use of "test -z" and
    "test -n".
    
    * jk/test-z-n-unquoted:
      always quote shell arguments to test -z/-n
      t9103: modernize test style
      t9107: switch inverted single/double quotes in test
      t9107: use "return 1" instead of "exit 1"
      t9100,t3419: enclose all test code in single-quotes
      t/lib-git-svn: drop $remote_git_svn and $git_svn_id
    gitster committed May 23, 2016
  6. @gitster

    Merge branch 'ar/diff-args-osx-precompose'

    Many commands normalize command line arguments from NFD to NFC
    variant of UTF-8 on OSX, but commands in the "diff" family did
    not, causing "git diff $path" to complain that no such path is
    known to Git.  They have been taught to do the normalization.
    
    * ar/diff-args-osx-precompose:
      diff: run arguments through precompose_argv
    gitster committed May 23, 2016
  7. @gitster

    Merge branch 'jc/doc-lint'

    Find common mistakes when writing gitlink: in our documentation and
    drive the check from "make check-docs".
    
    I am not entirely happy with the way the script chooses what input
    file to validate, but it is not worse than not having anything, so
    let's move it forward and have the logic improved later when people
    care about it deeply.
    
    * jc/doc-lint:
      ci: validate "linkgit:" in documentation
    gitster committed May 23, 2016
  8. @gitster

    Merge branch 'js/perf-rebase-i'

    Add perf test for "rebase -i"
    
    * js/perf-rebase-i:
      perf: run "rebase -i" under perf
      perf: make the tests work in worktrees
      perf: let's disable symlinks when they are not available
    gitster committed May 23, 2016
  9. @gitster

    Merge branch 'jc/test-parse-options-expect'

    t0040 had too many unnecessary repetitions in its test data.  Teach
    test-parse-options program so that a caller can tell what it
    expects in its output, so that these repetitions can be cleaned up.
    
    * jc/test-parse-options-expect:
      t0040: convert a few tests to use test-parse-options --expect
      t0040: remove unused test helpers
      test-parse-options: --expect=<string> option to simplify tests
      test-parse-options: fix output when callback option fails
    gitster committed May 23, 2016
  10. @gitster

    Merge branch 'pb/commit-verbose-config'

    "git commit" learned to pay attention to "commit.verbose"
    configuration variable and act as if "--verbose" option was
    given from the command line.
    
    * pb/commit-verbose-config:
      commit: add a commit.verbose config variable
      t7507-commit-verbose: improve test coverage by testing number of diffs
      parse-options.c: make OPTION_COUNTUP respect "unspecified" values
      t/t7507: improve test coverage
      t0040-parse-options: improve test coverage
      test-parse-options: print quiet as integer
      t0040-test-parse-options.sh: fix style issues
    gitster committed May 23, 2016
  11. @gitster

    Merge branch 'xy/format-patch-base'

    "git format-patch" learned a new "--base" option to record what
    (public, well-known) commit the original series was built on in
    its output.
    
    * xy/format-patch-base:
      format-patch: introduce format.useAutoBase configuration
      format-patch: introduce --base=auto option
      format-patch: add '--base' option to record base tree info
      patch-ids: make commit_patch_id() a public helper function
    gitster committed May 23, 2016
  12. @gitster

    Merge branch 'tb/core-eol-fix'

    A couple of bugs around core.autocrlf have been fixed.
    
    * tb/core-eol-fix:
      convert.c: ident + core.autocrlf didn't work
      t0027: test cases for combined attributes
      convert: allow core.autocrlf=input and core.eol=crlf
      t0027: make commit_chk_wrnNNO() reliable
    gitster committed May 23, 2016
  13. @gitster

    Merge branch 'nd/worktree-various-heads'

    The experimental "multiple worktree" feature gains more safety to
    forbid operations on a branch that is checked out or being actively
    worked on elsewhere, by noticing that e.g. it is being rebased.
    
    * nd/worktree-various-heads:
      branch: do not rename a branch under bisect or rebase
      worktree.c: check whether branch is bisected in another worktree
      wt-status.c: split bisect detection out of wt_status_get_state()
      worktree.c: check whether branch is rebased in another worktree
      worktree.c: avoid referencing to worktrees[i] multiple times
      wt-status.c: make wt_status_check_rebase() work on any worktree
      wt-status.c: split rebase detection out of wt_status_get_state()
      path.c: refactor and add worktree_git_path()
      worktree.c: mark current worktree
      worktree.c: make find_shared_symref() return struct worktree *
      worktree.c: store "id" instead of "git_dir"
      path.c: add git_common_path() and strbuf_git_common_path()
      dir.c: rename str(n)cmp_icase to fspath(n)cmp
    gitster committed May 23, 2016
  14. @gitster

    Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'

    "git commit --dry-run" reported "No, no, you cannot commit." in one
    case where "git commit" would have allowed you to commit, and this
    improves it a little bit ("git commit --dry-run --short" still does
    not give you the correct answer, for example).  This is a stop-gap
    measure in that "commit --short --dry-run" still gives an incorrect
    result.
    
    * ss/commit-dry-run-resolve-merge-to-no-op:
      wt-status.c: set commitable bit if there is a meaningful merge.
    gitster committed May 23, 2016
Something went wrong with that request. Please try again.