git-for-windows/git — pull request #10 by t-b (2014-10-13 16:05:24+00:00)
Title: Merging rebase to v2.1.2

Original shears script:
```
start_merging_rebase "3c2874a"
mark onto

# Branch: refs/rewritten/junio/notyet
bud
pick c5d67b1 Makefile: do not depend on curl-config
mark refs/rewritten/junio/notyet

# Branch: unicode
bud
pick b7d7da5 Unicode file name support (gitk and git-gui)
mark unicode

# Branch: hide-dotgit
bud
pick c0d38ef core.hidedotfiles: hide '.git' dir by default
pick dbb22e6 When initializing .git/, record the current setting of core.hideDotFiles
pick f8b7f55 mingw: add tests for the hidden attribute on the git directory
mark hide-dotgit

# Branch: am-submodules
bud
pick 1a5a5e4 git am: ignore dirty submodules
mark am-submodules

# Branch: criss-cross-merge
bud
pick dcfb241 criss cross rename failure workaround
mark criss-cross-merge

# Branch: deny-current-branch
bud
pick f6ef373 Add a few more values for receive.denyCurrentBranch
pick af84456 Let deny.currentBranch=updateInstead ignore submodules
mark deny-current-branch

# Branch: git-gui
bud
pick 0befca7 Revert "git-gui: set GIT_DIR and GIT_WORK_TREE after setup"
pick 56cda11 git-gui: provide question helper for retry fallback on Windows
pick b5eb4a4 git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
mark git-gui

# Branch: gitk
bud
pick efd5f2a Work around the command line limit on Windows
pick ffa28b4 Fix another invocation of git from gitk with an overly long command-line
pick a325ef9 gitk: Use an external icon file on Windows
mark gitk

# Branch: gitweb-syntax
bud
pick 482a93f gitweb: Allow line number toggling with Javascript
pick b96a6fd Gitweb: make line number toggling work for Firefox and Safari
pick 26109b2 Gitweb: add support for Alex Gorbatchev's SyntaxHighlighter in Javascript
pick 2d8053b Only switch on the line number toggle when highlighting is activated
pick c61f812 gitweb (SyntaxHighlighter): interpret #l
mark gitweb-syntax

# Branch: jberezanski/wincred-sso-r2
bud
pick 0dd0cfb t0302: check helper can handle empty credentials
pick 52ab6cb wincred: handle empty username/password correctly
mark jberezanski/wincred-sso-r2

# Branch: pull-rebase-interactive
bud
pick dd3eebb Teach 'git pull' to handle --rebase=interactive
pick e46c4d2 Handle the branch..rebase value 'interactive'
pick bf5519e Teach 'git remote' that the config var branch.*.rebase can be 'interactive'
mark pull-rebase-interactive

# Branch: some-CR-fixes
bud
pick 1121762 submodule: Fix t7400, t7405, t7406 for msysGit
pick 29453a1 am: Use cat instead of echo to avoid DOS line-endings (fixes t4150)
pick 1d4af23 Windows: make sure that merge-octopus only outputs LF line endings
pick d98aa9f Push the NATIVE_CRLF Makefile variable to C and added a test for native.
pick 14b4175 MinGW: Update tests to handle a native eol of crlf
mark some-CR-fixes

# Branch: win-tests-fixes
bud
pick e3c761a work around misdetection of stdin attached to a tty
pick b9df112 Handle new t1501 test case properly with MinGW
pick 578331b t3102: Windows filesystems may not use a literal asterisk in filenames.
pick e172b39 t9350: point out that refs are not updated correctly
pick 9210d28 t1050: Fix invalid call to dd(1)
pick 6aeb027 Work around a problem identified by BuildHive
pick 35d5632 t0008: avoid absolute path on Windows as colon is used in the tests
pick 19fc75e t800[12]: work around MSys limitation
pick f7f0a79 tests: turn off git-daemon tests if FIFOs are not available
mark win-tests-fixes

# Branch: remote-hg-prerequisites
bud
pick 9faa058 fast-export: do not refer to non-existing marks
pick c9d910d transport-helper: add trailing --
pick 83ddf68 remote-helper: check helper status after import/export
fixup 0d452bd remote-helper: check helper status after import/export
pick c91d47a Always auto-gc after calling a fast-import transport
mark remote-hg-prerequisites

# Branch: http-msys-paths
bud
pick cee2ef3 Handle http.* config variables pointing to files gracefully on Windows
mark http-msys-paths

# Branch: fix-externals
bud
pick 1958343 Fixed wrong path delimiter in exe finding
pick acd4a9b Fix launching of externals from Unicode paths
pick 1cdf137 Make non-.exe externals work again
mark fix-externals

# Branch: fix-is-exe
bud
pick 90d8560 help: correct behavior for is_executable on Windows
mark fix-is-exe

# Branch: msysgit/tip4commit
bud
pick a283859 Add a README.md
mark msysgit/tip4commit

# Branch: t-b/sideband-bug
bud
pick ea8c6fc Config option to disable side-band-64k for transport
mark t-b/sideband-bug

# Branch: kasal/tests-no-posix
bud
pick c2a0ce3 Revert "test: fix t7001 cp to use POSIX options"
mark kasal/tests-no-posix

# Branch: kblees/kb/fscache-v4-tentative-1.8.5
rewind hide-dotgit # mingw: add tests for the hidden attribute on the git directory
pick dca462f Win32: make FILETIME conversion functions public
pick 0b21820 Win32: dirent.c: Move opendir down
pick d3bba01 Win32: Make the dirent implementation pluggable
pick 7f5b617 Win32: make the lstat implementation pluggable
pick 119a8f8 add infrastructure for read-only file system level caches
pick 2e646a9 Win32: add a cache below mingw's lstat and dirent implementations
pick 1a62aa8 fscache: load directories only once
mark kblees/kb/fscache-v4-tentative-1.8.5

# Branch: kblees/kb/long-paths-v2
rewind kblees/kb/fscache-v4-tentative-1.8.5 # fscache: load directories only once
pick 91fb22d Add a test demonstrating a problem with long submodule paths
pick 1ccf877 Win32: support long paths
pick 5d0b4ec Win32: fix 'lstat("dir/")' with long paths
mark kblees/kb/long-paths-v2

# Branch: kblees/kb/msysgit-2.1.0
bud
merge refs/rewritten/refs/rewritten/junio/notyet -C 24bbb38 # Merge 'refs/rewritten/junio/notyet' into HEAD
merge refs/rewritten/unicode -C ffa9869 # Merge 'unicode' into HEAD
merge refs/rewritten/hide-dotgit -C 9af43a3 # Merge 'hide-dotgit' into HEAD
merge refs/rewritten/am-submodules -C 516b629 # Merge 'am-submodules' into HEAD
merge refs/rewritten/criss-cross-merge -C 03bc917 # Merge 'criss-cross-merge' into HEAD
merge refs/rewritten/deny-current-branch -C 1962678 # Merge 'deny-current-branch' into HEAD
merge refs/rewritten/git-gui -C 3ac701b # Merge 'git-gui' into HEAD
merge refs/rewritten/gitk -C 39bd86a # Merge 'gitk' into HEAD
merge refs/rewritten/gitweb-syntax -C b186a66 # Merge 'gitweb-syntax' into HEAD
merge refs/rewritten/jberezanski/wincred-sso-r2 -C a9586f2 # Merge 'jberezanski/wincred-sso-r2' into HEAD
merge refs/rewritten/pull-rebase-interactive -C f7a9918 # Merge 'pull-rebase-interactive' into HEAD
merge refs/rewritten/some-CR-fixes -C 3e39b72 # Merge branch 'some-CR-fixes'
merge refs/rewritten/win-tests-fixes -C bddad1a # Merge 'win-tests-fixes' into HEAD
merge refs/rewritten/remote-hg-prerequisites -C d2fdfb4 # Merge 'remote-hg-prerequisites' into HEAD
merge refs/rewritten/http-msys-paths -C 09e536b # Merge 'http-msys-paths' into HEAD
merge refs/rewritten/fix-externals -C 7726851 # Merge 'fix-externals' into HEAD
merge refs/rewritten/fix-is-exe -C 9434230 # Merge 'fix-is-exe' into HEAD
merge refs/rewritten/msysgit/tip4commit -C 27e76d5 # Merge pull request #115 from msysgit/tip4commit
merge refs/rewritten/t-b/sideband-bug -C 02fac2a # Merge remote-tracking branch 't-b/sideband-bug'
merge refs/rewritten/kasal/tests-no-posix -C e52e4ef # Merge pull request #181 from kasal/tests-no-posix
merge refs/rewritten/kblees/kb/fscache-v4-tentative-1.8.5 -C 41bc59c # Merge remote-tracking branch 'kblees/kb/fscache-v4-tentative-1.8.5' into thicket-1.8.5.2
merge refs/rewritten/kblees/kb/long-paths-v2 -C 98ed09f # Merge pull request #122 from kblees/kb/long-paths-v2
mark kblees/kb/msysgit-2.1.0

# Branch: sschuberth/taskkill
bud
merge refs/rewritten/kblees/kb/msysgit-2.1.0 -C be148fa # Merge pull request #231 from kblees/kb/msysgit-2.1.0
mark be148fa

pick 23b4c7e git-gui/gitk: Do not use a Cygwin-specific kill flag on Windows
mark sschuberth/taskkill

# Branch: t-b/new-sdk-fixes
rewind be148fa # Merge pull request #231 from kblees/kb/msysgit-2.1.0
merge refs/rewritten/sschuberth/taskkill -C 8768113 # Merge pull request #239 from sschuberth/taskkill
mark 8768113

pick 95b7175 MinGW: Use MakeMaker to build the Perl libraries
pick 145186a Makefile: Set htmldir to match the default HTML docs location under MSYS
pick 9264b1f t7800: Use "test_cmp_text" in all places where "echo" is used
fixup 8b9bc73 t7800: Use "test_cmp_text" in all places where "echo" is used
pick 57a35fd t0061: Work around a line endings issue with newer versions of cat on MSYS
fixup 1e6e25c t0061: Work around a line endings issue with newer versions of cat on MSYS
mark t-b/new-sdk-fixes

# Branch: t-b/tb_more_use_of_test_cmp_bin
rewind 8768113 # Merge pull request #239 from sschuberth/taskkill
merge refs/rewritten/t-b/new-sdk-fixes -C cd79f58 # Merge pull request #1 from t-b/new-sdk-fixes
mark cd79f58

pick 098d1f5 t9300: use test_cmp_bin instead of test_cmp to compare binary files
mark t-b/tb_more_use_of_test_cmp_bin

# Branch: t-b/test-fixes-again
rewind cd79f58 # Merge pull request #1 from t-b/new-sdk-fixes
merge refs/rewritten/t-b/tb_more_use_of_test_cmp_bin -C 4261e45 # Merge pull request #2 from t-b/tb_more_use_of_test_cmp_bin
mark 4261e45

pick 01a6f1b t5000: Fix CRLF vs LF issue
pick a84833f t2025: Tell tail explicitly to read from stdin
pick 3b72f3e t5503: Mark flaky tests as known breakages
pick e008904 t1508: Be more clever than msys path substitution
mark t-b/test-fixes-again

# Branch: t-b/dont_execute_test_which_errors_out
rewind 4261e45 # Merge pull request #2 from t-b/tb_more_use_of_test_cmp_bin
merge refs/rewritten/t-b/test-fixes-again -C 545b284 # Merge pull request #3 from t-b/test-fixes-again
mark 545b284

pick aaafeac t0027: Disable test on MINGW
mark t-b/dont_execute_test_which_errors_out

# Branch: t-b/use-libpcre
rewind 545b284 # Merge pull request #3 from t-b/test-fixes-again
pick f94f038 Enable support for perl regular expressions (LIBPCRE)
mark t-b/use-libpcre

# Branch: dscho/mingw-tests
rewind 545b284 # Merge pull request #3 from t-b/test-fixes-again
merge refs/rewritten/t-b/dont_execute_test_which_errors_out -C 2aebb6c # Merge pull request #5 from t-b/dont_execute_test_which_errors_out
merge refs/rewritten/t-b/use-libpcre -C 49e78c2 # Merge pull request #4 from t-b/use-libpcre
mark 49e78c2

pick 75c154e t0027: Tests for core.eol=native, eol=lf, eol=crlf
pick f7ed2f6 Mark t0027-auto-crlf as cheap enough for MinGW
mark dscho/mingw-tests

rewind 49e78c2 # Merge pull request #4 from t-b/use-libpcre
merge refs/rewritten/dscho/mingw-tests -C 3c2874a # Merge pull request #7 from dscho/mingw-tests

cleanup refs/rewritten/junio/notyet unicode hide-dotgit am-submodules criss-cross-merge deny-current-branch git-gui gitk gitweb-syntax jberezanski/wincred-sso-r2 pull-rebase-interactive some-CR-fixes win-tests-fixes remote-hg-prerequisites http-msys-paths fix-externals fix-is-exe msysgit/tip4commit t-b/sideband-bug kasal/tests-no-posix kblees/kb/fscache-v4-tentative-1.8.5 kblees/kb/long-paths-v2 kblees/kb/msysgit-2.1.0 sschuberth/taskkill t-b/new-sdk-fixes t-b/tb_more_use_of_test_cmp_bin t-b/test-fixes-again t-b/dont_execute_test_which_errors_out t-b/use-libpcre dscho/mingw-tests be148fa 8768113 cd79f58 4261e45 545b284 49e78c2

# Rebase 3c2874a..3c2874a onto 3c2dc76
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out
```

My changes:
```diff
$ diff -Nur orig new
--- orig Mon Oct 13 15:32:04 2014
+++ new Mon Oct 13 15:32:31 2014
@@ -192,10 +192,6 @@

pick 95b7175 MinGW: Use MakeMaker to build the Perl libraries
pick 145186a Makefile: Set htmldir to match the default HTML docs location under MSYS
-pick 9264b1f t7800: Use "test_cmp_text" in all places where "echo" is used
-fixup 8b9bc73 t7800: Use "test_cmp_text" in all places where "echo" is used
-pick 57a35fd t0061: Work around a line endings issue with newer versions of cat on MSYS
-fixup 1e6e25c t0061: Work around a line endings issue with newer versions of cat on MSYS
mark t-b/new-sdk-fixes

# Branch: t-b/tb_more_use_of_test_cmp_bin
```

All tests pass.