Commit Graph

47342 Commits

Author SHA1 Message Date
Johannes Schindelin
e8cb19e5dd Do not re-define _CONSOLE_FONT_INFOEX when compiling with MSys2
MSys2 already has that structure.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:56:58 +01:00
Johannes Schindelin
d594d61c1a Avoid redefining S_* constants
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:56:13 +01:00
Johannes Schindelin
8e8c7416c0 Port header fixes from MSys2
MSys2' Git build script has some changes we should put into Git for
Windows' source code proper.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:55:36 +01:00
Johannes Schindelin
b9e7a5531f Help debugging with MSys2 by optionally executing bash with strace
MSys2's strace facility is very useful for debugging... With this patch,
the bash will be executed through strace if the environment variable
GIT_STRACE_COMMANDS is set, which comes in real handy when investigating
issues in the test suite.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:50:06 +01:00
Sebastian Schuberth
8ffc0c2027 Merge pull request #8 from dscho/mingw-prefix
MINGW: install into /mingw/bin/ by default
2014-10-24 09:37:46 +02:00
Sebastian Schuberth
535c28908f Merge pull request #14 from dscho/readme
Adjust README.md to reflect the new Git for Windows home
2014-10-15 09:05:46 +02:00
Johannes Schindelin
f69afe0146 Adjust README.md to reflect the new Git for Windows home
Git for Windows switched orgs, to reflect the fact that msysGit is no
longer used to develop the project, but instead the Git for Windows SDK.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2014-10-14 15:14:40 -05:00
Sebastian Schuberth
6899e65922 Merge pull request #10 from t-b/mergeing-rebase-to-v2.1.2
Merging rebase to v2.1.2
2014-10-13 21:54:13 +02:00
Thomas Braun
d69ba2384e Merge pull request #7 from dscho/mingw-tests
Prepare for more thorough testing when building in MinGW
2014-10-13 17:33:46 +02:00
Johannes Schindelin
8cc203c372 Mark t0027-auto-crlf as cheap enough for MinGW
t0027 is marked expensive, but really, for MinGW we want to run these
tests always.

Suggested by Thomas Braun.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2014-10-13 17:33:45 +02:00
Thomas Braun
217da4af24 Merge pull request #4 from t-b/use-libpcre
Enable support for perl regular expressions (LIBPCRE)
2014-10-13 17:33:44 +02:00
Torsten Bögershausen
cdfea26f77 t0027: Tests for core.eol=native, eol=lf, eol=crlf
Add test cases for core.eol "native" and "" (unset).
(MINGW uses CRLF, all other systems LF as native line endings)

Add test cases for the attributes "eol=lf" and "eol=crlf"

Other minor changes:
- Use the more portable 'tr' instead of 'od -c' to convert '\n' into 'Q'
  and '\0' into 'N'
- Style fixes for shell functions according to the coding guide lines
- Replace "txtbin" with "attr"

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-10-13 17:33:44 +02:00
Thomas Braun
817347c612 Merge pull request #5 from t-b/dont_execute_test_which_errors_out
t0027: Disable test on MINGW
2014-10-13 17:33:43 +02:00
Thomas Braun
60959ddf28 Enable support for perl regular expressions (LIBPCRE)
Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
2014-10-13 17:33:42 +02:00
Thomas Braun
e14cea7862 t0027: Disable test on MINGW
We can't mmap 2GB of RAM on our 32bit platform, so
just disable the test.

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
2014-10-13 17:33:41 +02:00
Thomas Braun
06e8ed3ab8 Merge pull request #3 from t-b/test-fixes-again
Final test fixes
2014-10-13 17:33:40 +02:00
Thomas Braun
1e0473a198 t1508: Be more clever than msys path substitution
A string of the form "@/abcd" is considered a file path
by the msys layer and therefore translated to a windows path.

Here the trick is to double the slashes.

The msys patch translation can be studied with the following
test program:

 #include <stdio.h>
 #include <stdlib.h>

 int main(int argc, char** argv)
 {
 unsigned int i;
 for(i=1; i < argc; i++)
 	printf("argv[%d]=%s\n",i, argv[i]);

 exit(0);
 }

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
2014-10-13 17:33:38 +02:00
Thomas Braun
0c03fcc97f t5503: Mark flaky tests as known breakages
As non reliable tests are nasty.

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
2014-10-13 17:33:38 +02:00
Thomas Braun
5a37902769 t2025: Tell tail explicitly to read from stdin
Our current version of bash 3.1.17(5) can not parse the following snippet
correctly
p=abcd
abspath=/$p
subdir="x$(echo "$p" | tail -c $((253 - ${#abspath})))"
as it returns
tail: cannot open `253' for reading: No such file or directory

This is fixed in bash 3.1.20(4), I did not check earlier versions.

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
2014-10-13 17:33:38 +02:00
Thomas Braun
232ce5fc3a t5000: Fix CRLF vs LF issue
All CRLF vs LF errors are introduced by the tr tool.

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
2014-10-13 17:33:37 +02:00
Thomas Braun
c3051dfbd6 Merge pull request #2 from t-b/tb_more_use_of_test_cmp_bin
t9300: use test_cmp_bin instead of test_cmp to compare binary files
2014-10-13 17:33:36 +02:00
Johannes Sixt
0f77827492 t9300: use test_cmp_bin instead of test_cmp to compare binary files
test_cmp is intended to produce diff output for human consumption. The
input in one instance in t9300-fast-import.sh are binary files, however.
Use test_cmp_bin to compare the files.

This was noticed because on Windows we have a special implementation of
test_cmp in pure bash code (to ignore differences due to intermittent CR
in actual output), and bash runs into an infinite loop due to the binary
nature of the input.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-10-13 17:33:35 +02:00
Thomas Braun
ccb6a7ac5c Merge pull request #1 from t-b/new-sdk-fixes
Fixes for the new SDK
2014-10-13 17:33:34 +02:00
Sebastian Schuberth
0f2f24589e Makefile: Set htmldir to match the default HTML docs location under MSYS
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2014-10-13 17:33:33 +02:00
Sebastian Schuberth
895849c943 MinGW: Use MakeMaker to build the Perl libraries
This way the libraries get properly installed into the "site_perl"
directory and we just have to move them out of the "mingw" directory.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2014-10-13 17:33:33 +02:00
Thomas Braun
7d0d5cf4f3 Merge pull request #239 from sschuberth/taskkill
git-gui/gitk: Do not use a Cygwin-specific kill flag on Windows
2014-10-13 17:33:32 +02:00
Sebastian Schuberth
d0243ad1a5 git-gui/gitk: Do not use a Cygwin-specific kill flag on Windows
Windows does not necessarily mean Cygwin, it could also be MSYS. The
latter ships with a version of "kill" that does not understand "-f". In
msysgit this was addressed shipping Cygwin's version of kill.

Properly fix this by using the stock Windows "taskkill" command instead,
which is available since Windows XP Professional.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
2014-10-13 17:33:31 +02:00
Thomas Braun
672abffbd1 Merge pull request #231 from kblees/kb/msysgit-2.1.0
Rebasing merge to Git v2.1.0
2014-10-13 17:33:29 +02:00
Thomas Braun
53ee2b9a6e Merge pull request #122 from kblees/kb/long-paths-v2
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2014-10-13 17:33:28 +02:00
Thomas Braun
52591b9f2a Merge remote-tracking branch 'kblees/kb/fscache-v4-tentative-1.8.5' into thicket-1.8.5.2 2014-10-13 17:33:27 +02:00
Thomas Braun
c9ff21bb3f Merge pull request #181 from kasal/tests-no-posix
Revert "test: fix t7001 cp to use POSIX options"
2014-10-13 17:33:27 +02:00
Thomas Braun
6c5514542f Merge remote-tracking branch 't-b/sideband-bug'
This will allow us to work around the push issues pointed out in
https://github.com/msysgit/git/issues/101.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2014-10-13 17:33:27 +02:00
Thomas Braun
0ac7ef04d4 Merge pull request #115 from msysgit/tip4commit
Mention tip4commit
2014-10-13 17:33:26 +02:00
Thomas Braun
3d7d03e6b8 Merge 'fix-is-exe' into HEAD 2014-10-13 17:33:26 +02:00
Thomas Braun
99a56399f9 Merge 'fix-externals' into HEAD 2014-10-13 17:33:25 +02:00
Thomas Braun
167d538ac8 Merge 'http-msys-paths' into HEAD 2014-10-13 17:33:25 +02:00
Thomas Braun
01c5df714a Merge 'remote-hg-prerequisites' into HEAD
These fixes were necessary for Sverre Rabbelier's remote-hg to work,
but for some magic reason they are not necessary for the current
remote-hg. Makes you wonder how that one gets away with it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2014-10-13 17:33:24 +02:00
Thomas Braun
d8ce1ae1e9 Merge 'win-tests-fixes' into HEAD 2014-10-13 17:33:24 +02:00
Thomas Braun
88cae5885e Merge branch 'some-CR-fixes'
This branch contains some hacks so that Git produces less CR, and then
some tests.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2014-10-13 17:33:23 +02:00
Thomas Braun
9d5839de34 Merge 'pull-rebase-interactive' into HEAD 2014-10-13 17:33:23 +02:00
Thomas Braun
abbd3499b4 Merge 'jberezanski/wincred-sso-r2' into HEAD 2014-10-13 17:33:22 +02:00
Thomas Braun
ddd114f905 Merge 'gitweb-syntax' into HEAD 2014-10-13 17:33:22 +02:00
Thomas Braun
06039426d1 Merge 'gitk' into HEAD 2014-10-13 17:33:22 +02:00
Thomas Braun
a3f4eb96c3 Merge 'git-gui' into HEAD 2014-10-13 17:33:21 +02:00
Thomas Braun
90f2fa804d Merge 'deny-current-branch' into HEAD 2014-10-13 17:33:21 +02:00
Thomas Braun
d82080f91a Merge 'criss-cross-merge' into HEAD 2014-10-13 17:33:20 +02:00
Thomas Braun
e16decf0b8 Merge 'am-submodules' into HEAD 2014-10-13 17:33:20 +02:00
Thomas Braun
411e946374 Merge 'hide-dotgit' into HEAD 2014-10-13 17:33:19 +02:00
Thomas Braun
3075a93e44 Merge 'unicode' into HEAD 2014-10-13 17:33:19 +02:00
Thomas Braun
584641d9b0 Merge 'refs/rewritten/junio/notyet' into HEAD 2014-10-13 17:33:19 +02:00