Commit Graph

58535 Commits

Author SHA1 Message Date
Johannes Schindelin
3625902ee3 Skip t9020 with MSys2
POSIX-to-Windows path mangling would make it fail.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-04-04 08:02:52 +02:00
Johannes Schindelin
c3642ee3c9 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>
2016-04-04 08:02:51 +02:00
Thomas Braun
5a458fc681 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>
2016-04-04 08:02:50 +02:00
Thomas Braun
5263ac7808 t5503: Mark flaky tests as known breakages
As non reliable tests are nasty.

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
2016-04-04 08:02:50 +02:00
Stepan Kasal
52e37d2545 Revert "test: fix t7001 cp to use POSIX options"
This reverts commit 00764ca1, as our ancient version of "cp" has
problems about the "new" POSIX option "-P" (yields exit code 1).
2016-04-04 08:02:49 +02:00
Karsten Blees
3bd798c8d8 t800[12]: work around MSys limitation
MSys works very hard to convert Unix-style paths into DOS-style ones.
*Very* hard.

So hard, indeed, that

	git blame -L/hello/,/green/

is translated into something like

	git blame -LC:/msysgit/hello/,C:/msysgit/green/

As seen in msys_p2w in src\msys\msys\rt\src\winsup\cygwin\path.cc, line
3204ff:

	case '-':
	  //
	  // here we check for POSIX paths as attributes to a POSIX switch.
	  //
	...

seemingly absolute POSIX paths in single-letter options get expanded by
msys.dll unless they contain '=' or ';'.

So a quick and very dirty fix is to use '-L/;*evil/'. (Using an equal sign
works only when it is before a comma, so in the above example, /=*green/
would still be converted to a DOS-style path.)

Commit-message-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-04-04 08:02:48 +02:00
Sverre Rabbelier
f597da56f5 t9350: point out that refs are not updated correctly
This happens only when the corresponding commits are not exported in
the current fast-export run. This can happen either when the relevant
commit is already marked, or when the commit is explicitly marked
as UNINTERESTING with a negative ref by another argument.

This breaks fast-export basec remote helpers.

Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
2016-04-04 08:02:48 +02:00
Johannes Schindelin
4e0f10ac85 Handle new t1501 test case properly with MinGW
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-04-04 08:02:47 +02:00
Johannes Schindelin
d80fc90904 mingw: mark t9100's test cases with appropriate prereqs
Many a test requires either POSIXPERM (to change the executable bit) or
SYMLINKS, and neither are available on Windows.

This lets t9100-git-svn-basic.sh pass in Git for Windows' SDK.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-04-04 08:02:01 +02:00
Johannes Schindelin
47571a6769 Start the merging-rebase to v2.8.1
This commit starts the rebase of 5840b06 to fdeee3d
2016-04-04 08:02:00 +02:00
Johannes Schindelin
dfa7d5a9aa fixup! DEBUG
This was a commit not intended for `master`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-04-04 07:59:36 +02:00
Junio C Hamano
d95553a6b8 Git 2.8.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
v2.8.1
2016-04-03 10:14:12 -07:00
Junio C Hamano
6e4de7fca3 Merge branch 'mm/readme-markdown' into maint
* 'mm/readme-markdown':
  git.spec.in: use README.md, not README
2016-04-03 10:13:09 -07:00
Matthieu Moy
c7089e0ee9 git.spec.in: use README.md, not README
The file was renamed in 4ad21f5 (README: use markdown syntax,
2016-02-25), but that commit forgot to update git.spec.in, which
caused the rpmbuild target in the Makefile to fail.

Reported-by: Ron Isaacson <isaacson.ljits@gmail.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-04-03 10:12:48 -07:00
Johannes Schindelin
71c3301cac Merge pull request #661 from shiftkey/patch-1
Update CONTRIBUTING.md to Contributor Covenant v1.4
2016-04-02 14:12:11 +02:00
Johannes Schindelin
af5a5e06e5 Merge branch 'spawn-with-spaces'
This change lets us spawn .bat scripts whose paths contain spaces.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-04-02 13:51:48 +02:00
Johannes Schindelin
8086988cd7 mingw: support spawning programs containing spaces in their names
The CreateProcessW() function does not really support spaces in its
first argument, lpApplicationName. But it supports passing NULL as
lpApplicationName, which makes it figure out the application from the
(possibly quoted) first argument of lpCommandLine.

Let's use that trick (if we are certain that the first argument matches
the executable's path) to support launching programs whose path contains
spaces.

This fixes https://github.com/git-for-windows/git/issue/692

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-04-02 13:07:13 +02:00
Johannes Schindelin
29d557eaa5 DEBUG
GDB cannot handle executables compiled with ASLR support, and it has
serious problems figuring out source code locations corresponding to the
current instruction pointer when compiled with -O2.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-04-02 13:05:50 +02:00
Johannes Schindelin
fce9915e62 Merge pull request #677 from yaras/fix-git-675
Fixed masking username with asterisks when reading credentials
2016-03-29 10:27:20 +02:00
Johannes Schindelin
2c979b21b3 Merge pull request #665 from yaras/fix-git-664
Fix initial git gui message encoding
2016-03-29 10:26:50 +02:00
Johannes Schindelin
1cf0d2e46d git gui: fix staging a second line to a 1-line file
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes https://github.com/git-for-windows/git/issues/515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:50 +02:00
Johannes Schindelin
9b5baa1b00 Merge pull request #620 from sidecut/sidecut-gitk-list-references-window-width
Make the "list references" default window width wider
2016-03-29 10:26:49 +02:00
Johannes Schindelin
7292b98a0e Merge pull request #662 from shiftkey/issue_template
added issue template mirroring wiki notes
2016-03-29 10:26:48 +02:00
Johannes Schindelin
77e779f1ac Merge branch 'consolez'
This fixes an issue where the Git wrapper would terminate upon Ctrl+C,
even in the case when its child process would *not* terminate.

Note: while the original intention was to fix running Git Bash in
ConsoleZ, the bug fix applies also to running

	C:\Program Files\Git\bin\bash -l -i

in a cmd window.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:47 +02:00
Johannes Schindelin
dd729e809d Merge branch 'gitk-cursor-keys'
This patch needs to be contributed to gitk proper, of course.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:47 +02:00
Johannes Schindelin
12763a50fb Merge branch 'clean-long-paths'
This addresses https://github.com/git-for-windows/git/issues/521

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:46 +02:00
Johannes Schindelin
f6a0d76424 Merge branch 'git-wrapper-interpolate'
There was a bug in the wrapper where it would interpolate incorrectly if
the name of the environment variable to expand was longer than the value.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:45 +02:00
Johannes Schindelin
1b8a0eabf8 Merge branch 'home-bin' 2016-03-29 10:26:44 +02:00
Johannes Schindelin
991f736c96 Merge branch 'conhost-git-bash' 2016-03-29 10:26:44 +02:00
Johannes Schindelin
a9e192842d Merge branch 'bash-redirector' 2016-03-29 10:26:43 +02:00
Johannes Schindelin
9423dde3bf Merge branch 'pinnable'
Part 2/3 of fixing https://github.com/git-for-windows/git/issues/263

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:42 +02:00
Johannes Schindelin
f2b24f1305 Merge branch 'git-wrapper--command'
This topic branch adds the --command=<command> option that allows
starting the Git Bash (or Git CMD) with different terminal emulators
than the one encoded via embedded string resources.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:42 +02:00
Johannes Schindelin
569ad754ad Merge 'git-wrapper' into HEAD
Use msysGit's `git-wrapper` instead of the builtins. This works around
two issues:

- when the file system does not allow hard links, we would waste over
  800 megabyte by having 109 copies of a multi-megabyte executable

- even when the file system allows hard links, the Windows Explorer
  counts the disk usage as if it did not. Many users complained about
  Git for Windows using too much space (when it actually did not). We
  can easily avoid those user complaints by merging this branch.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:41 +02:00
Johannes Schindelin
adb7a272f9 Merge 'aslr' into HEAD
Address Space Layout Randomization (ASLR) allows executables' memory
layout to change at random between runs, and therefore offers a quite
decent protection against many attacks.

We enable ASLR because MSYS2's C compiler offers support for ASLR, and
whatever performance impact it has is neglible, according to
https://insights.sei.cmu.edu/cert/2014/02/differences-between-aslr-on-windows-and-linux.html

This merges the part of https://github.com/git-for-windows/git/pull/612
that does not break Git ;-)

This fixes https://github.com/git-for-windows/git/issues/608

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:40 +02:00
Johannes Schindelin
9ba9f31db1 Merge 'unc-alternates' into HEAD 2016-03-29 10:26:39 +02:00
Johannes Schindelin
6bae3d3f45 Merge pull request #552 from duncansmart/fix-vcproj-gen
Fix Visual Studio .sln/.vcproj generation.
2016-03-29 10:26:39 +02:00
Johannes Schindelin
33b719157e Merge pull request #487 from dscho/default-username
Improve the default user name & email logic
2016-03-29 10:26:38 +02:00
Johannes Schindelin
175fc23ca1 Merge pull request #486 from dscho/mmap-no-error
Better mmap() emulation
2016-03-29 10:26:38 +02:00
Johannes Schindelin
ca81412b07 Merge branch 'msys2-git-gui'
This topic branch addresses the bug where Git for Windows 2.x' Git GUI
failed to generate a working shortcut via Repository>Create Desktop
Shortcut.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:37 +02:00
Johannes Schindelin
cf9b3504ea Merge pull request #443 from kblees/kb/nanosecond-file-times-v2.5.3
nanosecond file times for v2.5.3
2016-03-29 10:26:36 +02:00
Johannes Schindelin
f7bbf9afae Merge pull request #305 from dscho/msysgit_issues_182
Allow `add -p` and `add -i` with a large number of files
2016-03-29 10:26:36 +02:00
Johannes Schindelin
63e77ba95a Merge pull request #246 from uecasm/patch-1
Verify memoized files can be reloaded before using them
2016-03-29 10:26:35 +02:00
Johannes Schindelin
84e8725f60 Merge branch 'program-data-config'
This branch introduces support for reading the "Windows-wide" Git
configuration from `%PROGRAMDATA%\Git\config`. As these settings are
intended to be shared between *all* Git-related software, that config
file takes an even lower precedence than `$(prefix)/etc/gitconfig`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:35 +02:00
Johannes Schindelin
2fe226cc2b Merge pull request #159 from dscho/vagrant
Add Vagrant support (easy Linux VM setup)
2016-03-29 10:26:34 +02:00
Johannes Schindelin
45b076136c Merge pull request #156 from kblees/kb/symlinks
Symlink support
2016-03-29 10:26:33 +02:00
Johannes Schindelin
3e75956064 Merge 'sideband-bug' into HEAD
This works around the push-over-git-protocol issues pointed out in
https://github.com/msysgit/git/issues/101.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:33 +02:00
Johannes Schindelin
4361e57b48 Merge 'readme' into HEAD
Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2016-03-29 10:26:32 +02:00
Johannes Schindelin
4e3b0d06a9 Merge 'fix-is-exe' into HEAD 2016-03-29 10:26:32 +02:00
Johannes Schindelin
3fc27ebedc Merge 'fix-externals' into HEAD 2016-03-29 10:26:31 +02:00
Johannes Schindelin
11dfa969c0 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>
2016-03-29 10:26:30 +02:00