Skip to content
Commits on May 30, 2016
  1. Final batch before 2.9-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    committed May 29, 2016
  2. Merge branch 'ak/t0008-ksh88-workaround'

    Test portability workaround.
    
    * ak/t0008-ksh88-workaround:
      t0008: 4 tests fail with ksh88
    committed May 29, 2016
  3. Merge branch 'js/t6044-use-test-seq'

    Test portability fix.
    
    * js/t6044-use-test-seq:
      t6044: replace seq by test_seq
    committed May 29, 2016
  4. Merge branch 'ak/t4204-shell-portability'

    Update a test to run also under ksh88.
    
    * ak/t4204-shell-portability:
      t4204: do not let $name variable clobbered
    committed May 29, 2016
  5. Merge branch 'rj/log-decorate-auto'

    We forgot to add "git log --decorate=auto" to documentation when we
    added the feature back in v2.1.0 timeframe.
    
    * rj/log-decorate-auto:
      log: document the --decorate=auto option
    committed May 29, 2016
  6. Merge branch 'mr/send-email-doc-gmail-2fa'

    Give hints to GMail users with two-factor auth enabled that
    they need app-specific-password when using send-email.
    
    * mr/send-email-doc-gmail-2fa:
      Documentation: add instructions to help setup gmail 2FA
    committed May 29, 2016
  7. Merge branch 'kb/msys2-tty'

    The "are we talking with TTY, doing an interactive session?"
    detection has been updated to work better for "Git for Windows".
    
    * kb/msys2-tty:
      mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)
    committed May 29, 2016
Commits on May 27, 2016
  1. @rappazzo

    Documentation: add instructions to help setup gmail 2FA

    For those who use two-factor authentication with gmail, git-send-email
    will not work unless it is setup with an app-specific password. The
    example for setting up git-send-email for use with gmail will now
    include information on generating and storing the app-specific password.
    
    Signed-off-by: Michael Rappazzo <rappazzo@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    rappazzo committed with May 27, 2016
  2. log: document the --decorate=auto option

    Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with May 27, 2016
Commits on May 26, 2016
  1. Sync with maint

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

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    committed May 26, 2016
  3. 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
    committed May 26, 2016
  4. Merge branch 'ls/travis-build-doc' into maint

    CI test was taught to build documentation pages.
    
    * ls/travis-build-doc:
      travis-ci: build documentation
    committed May 26, 2016
  5. 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
    committed May 26, 2016
  6. 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
    committed May 26, 2016
  7. 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
    committed May 26, 2016
  8. 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
    committed May 26, 2016
  9. Merge branch 'lp/typofixes' into maint

    Typofixes.
    
    * lp/typofixes:
      typofix: assorted typofixes in comments, documentation and messages
    committed May 26, 2016
  10. 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
    committed May 26, 2016
  11. 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
    committed May 26, 2016
  12. 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
    committed May 26, 2016
  13. 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
    committed May 26, 2016
  14. 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
    committed May 26, 2016
  15. 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
    committed May 26, 2016
  16. Merge branch 'tb/t5601-sed-fix' into maint

    Test fix.
    
    * tb/t5601-sed-fix:
      t5601: Remove trailing space in sed expression
    committed May 26, 2016
  17. Merge branch 'va/i18n-remote-comment-to-align' into maint

    Message fix.
    
    * va/i18n-remote-comment-to-align:
      i18n: remote: add comment for translators
    committed May 26, 2016
  18. Merge branch 'va/mailinfo-doc-typofix' into maint

    Typofix.
    
    * va/mailinfo-doc-typofix:
      Documentation/git-mailinfo: fix typo
    committed May 26, 2016
  19. Merge branch 'maint-2.7' into maint

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

    mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)

    MSYS2 emulates pseudo terminals via named pipes, and isatty() returns 0
    for such file descriptors. Therefore, some interactive functionality
    (such as launching a pager, asking if a failed unlink should be repeated
    etc.) doesn't work when run in a terminal emulator that uses MSYS2's
    ptys (such as mintty).
    
    However, MSYS2 uses special names for its pty pipes ('msys-*-pty*'),
    which allows us to distinguish them from normal piped input / output.
    
    On startup, check if stdin / stdout / stderr are connected to such pipes
    using the NtQueryObject API from NTDll.dll. If the names match, adjust
    the flags in MSVCRT's ioinfo structure accordingly.
    
    Signed-off-by: Karsten Blees <blees@dcon.de>
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    kblees committed with Apr 27, 2016
  21. Merge branch 'jk/war-on-sprintf' into maint-2.7

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

    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 May 26, 2016
Commits on May 24, 2016
  1. t4204: do not let $name variable clobbered

    test_patch_id_file_order shell function uses $name variable to hold
    one filename, and calls another shell function calc_patch_id as a
    downstream of one pipeline.  The called function, however, also uses
    the same $name variable.  With a shell implementation that runs the
    callee in the current shell environment, the caller's $name would
    be clobbered by the callee's use of the same variable.
    
    This hasn't been an issue with dash and bash.  ksh93 reveals the
    breakage in the test script.
    
    Fix it by using a distinct variable name in the callee.
    
    Reported-by: Armin Kunaschik <megabreit@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    committed May 23, 2016
Commits on May 23, 2016
  1. Git 2.9-rc0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    committed May 23, 2016
  2. 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
    committed May 23, 2016
  3. Merge branch 'jc/rerere-multi'

    * jc/rerere-multi:
      rerere: remove an null statement
      rerere: plug memory leaks upon "rerere forget" failure
    committed May 23, 2016
Something went wrong with that request. Please try again.