1. 28 Nov, 2016 4 commits
  2. 23 Nov, 2016 1 commit
  3. 22 Nov, 2016 5 commits
  4. 21 Nov, 2016 2 commits
  5. 17 Nov, 2016 4 commits
  6. 14 Nov, 2016 2 commits
  7. 13 Nov, 2016 1 commit
  8. 11 Nov, 2016 13 commits
    • Junio C Hamano's avatar
      Git 2.11.0-rc1 · 3ab22813
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      3ab22813
    • Junio C Hamano's avatar
      Merge branch 'rt/fetch-pack-error-message-fix' · 37181175
      Junio C Hamano authored
      An error message in fetch-pack executable that was newly marked for
      translation was misspelt, which has been fixed.
      
      * rt/fetch-pack-error-message-fix:
        fetch-pack.c: correct command at the beginning of an error message
      37181175
    • Junio C Hamano's avatar
      Merge branch 'ps/common-info-doc' · 12133d52
      Junio C Hamano authored
      Doc fix.
      
      * ps/common-info-doc:
        doc: fix location of 'info/' with $GIT_COMMON_DIR
      12133d52
    • Junio C Hamano's avatar
      Merge branch 'js/pwd-var-vs-pwd-cmd-fix' · 7f2a3921
      Junio C Hamano authored
      Last minute fixes to two fixups merged to 'master' recently.
      
      * js/pwd-var-vs-pwd-cmd-fix:
        t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables
      7f2a3921
    • Junio C Hamano's avatar
      Merge branch 'ls/macos-update' · 332fd565
      Junio C Hamano authored
      Portability update and workaround for builds on recent Mac OS X.
      
      * ls/macos-update:
        travis-ci: disable GIT_TEST_HTTPD for macOS
        Makefile: set NO_OPENSSL on macOS by default
      332fd565
    • Junio C Hamano's avatar
      Merge branch 'js/prepare-sequencer' · 5de732f6
      Junio C Hamano authored
      Silence a clang warning introduced by a recently graduated topic.
      
      * js/prepare-sequencer:
        sequencer: silence -Wtautological-constant-out-of-range-compare
      5de732f6
    • Junio C Hamano's avatar
      Merge branch 'ls/filter-process' · b18f6a00
      Junio C Hamano authored
      Test portability improvements and optimization for an
      already-graduated topic.
      
      * ls/filter-process:
        t0021: remove debugging cruft
      b18f6a00
    • Junio C Hamano's avatar
      Merge branch 'as/merge-attr-sleep' · f5a8ad4c
      Junio C Hamano authored
      Fix for a racy false-positive test failure.
      
      * as/merge-attr-sleep:
        t6026: clarify the point of "kill $(cat sleep.pid)"
        t6026: ensure that long-running script really is
        Revert "t6026-merge-attr: don't fail if sleep exits early"
        Revert "t6026-merge-attr: ensure that the merge driver was called"
        t6026-merge-attr: ensure that the merge driver was called
        t6026-merge-attr: don't fail if sleep exits early
      f5a8ad4c
    • Ralf Thielow's avatar
      fetch-pack.c: correct command at the beginning of an error message · dfbfb9f3
      Ralf Thielow authored
      One error message in fetch-pack.c uses 'git fetch_pack' at the beginning
      which is not a git command.  Use 'git fetch-pack' instead.
      Signed-off-by: default avatarRalf Thielow <ralf.thielow@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      dfbfb9f3
    • Junio C Hamano's avatar
      t0021: remove debugging cruft · a0d8b60d
      Junio C Hamano authored
      The redirection of the standard error stream to a temporary file is
      a leftover cruft during debugging.  Remove it.
      
      Besides, it is reported by folks on the Windows that the test is
      flaky with this redirection; somebody gets confused and this
      merely-redirected-to file gets marked as delete-pending by git.exe
      and makes it finish with a non-zero exit status when "git checkout"
      finishes.  Windows folks may want to figure that one out, but for
      the purpose of this test, it shouldn't become a show-stopper.
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      a0d8b60d
    • Johannes Sixt's avatar
      t6026: clarify the point of "kill $(cat sleep.pid)" · fdf4f6c7
      Johannes Sixt authored
      We lengthened the time the leftover process sleeps in the previous
      commit to make sure it will be there while 'git merge' runs and
      finishes.  It therefore needs to be killed before leaving the test.
      And it needs to be killed even when 'git merge' fails, so it has to
      be triggered via test_when_finished mechanism.
      
      Explain all that in a large comment, and move the use site of
      test_when_finished to immediately before 'git merge' invocation,
      where the process is spawned.
      Signed-off-by: default avatarJohannes Sixt <j6t@kdbg.org>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      fdf4f6c7
    • Johannes Sixt's avatar
      t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables · 71dd5047
      Johannes Sixt authored
      We have to use $PWD instead of $(pwd) because on Windows the latter
      would add a C: style path to bash's Unix-style $PATH variable, which
      becomes confused by the colon after the drive letter. ($PWD is a
      Unix-style path.)
      
      In the case of GIT_ALTERNATE_OBJECT_DIRECTORIES, bash on Windows
      assembles a Unix-style path list with the colon as separators. It
      converts the value to a Windows-style path list with the semicolon as
      path separator when it forwards the variable to git.exe. The same
      confusion happens when bash's original value is contaminated with
      Windows style paths.
      Signed-off-by: default avatarJohannes Sixt <j6t@kdbg.org>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      71dd5047
    • Patrick Steinhardt's avatar
      doc: fix location of 'info/' with $GIT_COMMON_DIR · 3285b7ba
      Patrick Steinhardt authored
      With the introduction of the $GIT_COMMON_DIR variable, the
      repository layout manual was changed to reflect the location for
      many files in case the variable is set. While adding the new
      locations, one typo snuck in regarding the location of the
      'info/' folder, which is falsely claimed to reside at
      "$GIT_COMMON_DIR/index".
      
      Fix the typo to point to "$GIT_COMMON_DIR/info/" instead.
      Signed-off-by: default avatarPatrick Steinhardt <ps@pks.im>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      3285b7ba
  9. 10 Nov, 2016 8 commits