Commit Graph

48472 Commits

Author SHA1 Message Date
Johannes Schindelin
9a770c593d Teach 'git pull' to handle --rebase=interactive
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 20:02:48 +01:00
Johannes Schindelin
a7f17aa223 Start the merging-rebase to v2.3.0
This commit starts the rebase of 3fa02b8 to 42de6ed
2015-02-22 19:58:07 +01:00
dscho
ff4771bae9 Merge pull request #26 from dscho/msys2
Fixes required to build Git for Windows with MSys2
2015-02-22 20:39:24 +01:00
Johannes Schindelin
119830d2d6 MSys2: Fix t9700 assumption about directory separators
This test assumed that there are no two equivalent directory separators.
However, on Windows, the back slash and the forward slash *are*
equivalent. Let's paper over this issue by converting the backward
slashes to forward ones in the test that fails with MSys2 otherwise.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:20 +01:00
Johannes Schindelin
b528e9430a Git.pm: stop assuming that absolute paths start with a slash
This fixes t7800 with MSys2.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:19 +01:00
Johannes Schindelin
1f8add0600 mingw: Prepare the TMP environment variable for shell scripts
When shell scripts access a $TMP variable containing backslashes, they
will be mistaken for escape characters. Let's not let that happen by
converting them to forward slashes.

This fixes t7800 with MSys2.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:19 +01:00
Johannes Schindelin
5c658f4f5b Tests: optionally skip redirecting stdin/stdout/stderr
There is a really useful debugging technique developed by Sverre
Rabbelier that inserts "bash &&" somewhere in the test scripts, letting
the developer interact at given points with the current state.

Another debugging technique, used a lot by this here coder, is to run
certain executables via gdb by guarding a "gdb -args" call in
bin-wrappers/git.

Both techniques were disabled by 781f76b1(test-lib: redirect stdin of
tests).

Let's reinstate the ability to run an interactive shell by making the
redirection optional: setting the TEST_NO_REDIRECT environment variable
will skip the redirection.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:19 +01:00
Johannes Schindelin
a9b3c2b408 t5516: override MinGW-specific pwd override
This test is susceptible to MSys2's posix-to-windows path mangling; Let's
just use POSIX paths throughout and let the tests pass.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:19 +01:00
Johannes Schindelin
3153820216 fixup! t5000: Fix CRLF vs LF issue
MSys2's `tr` does not introduce any CRLFs...

This reverts commit 01a6f1b248.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:19 +01:00
Johannes Schindelin
34fc6de873 Tests (MinGW): Disable mkfifo-based tests
With MSys2, there is actually an implementation of mkfifo available. The
only problem is that it is only emulating named pipes through the MSys2
runtime; The Win32 API has no idea about named pipes, hence the Git
executable cannot access those pipes either.

The symptom is that Git fails with a '<name>: No such file or directory'
because MSys2 emulates named pipes through special-crafted '.lnk' files.

The solution is to tell the test suite explicitly that we cannot use
named pipes when we want to test a MinGW Git.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:18 +01:00
Johannes Schindelin
93dd46ccbf Tests (MinGW): Do not bother to test funny file names
MSys2 actually allows to create files or directories whose names contain
tabs, newlines or colors, even if plain Win32 API cannot access them.
As we are using an MSys2 bash to run the tests, such files or
directories are created successfully, but Git has no chance to work with
them because it is a regular Windows program, hence limited by the Win32
API.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:18 +01:00
Johannes Schindelin
fb3ca797e6 Special-case the MSYS2_TZ environment variable
With MSys2, the "TZ" environment variable gets filtered out when calling
non-MSys2 executables. The reason is that Windows' time zone handling is
substantially different from the POSIX one.

However, we just taught Git for Windows' fork of the MSys2 runtime to
pass on the timezone in a different environment variable, MSYS2_TZ for
the sole purpose of Git being able to reinterpret it correctly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:18 +01:00
Johannes Schindelin
ad5d003251 Error out when mingw_startup() *and* NO_UNSETENV are active
The unsetenv code has no idea to update our environ_size, therefore
causing segmentation faults when environment variables are removed
without compat/mingw.c's knowing (MinGW's optimized lookup would try
to strcmp() against NULL in such a case).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:18 +01:00
Johannes Schindelin
af5bef8d6d Squash compile warning with MSys2
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:18 +01:00
Johannes Schindelin
626bfc1a0d Let's use gettext and Python with MSys2
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:17 +01:00
Johannes Schindelin
5bf9db5118 Build Python stuff with MSys2
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:17 +01:00
Johannes Schindelin
393f70f609 WIP: Support 64-bit MSys2
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:17 +01:00
Johannes Schindelin
d4fcc46ee3 Start supporting MSys2 in config.mak.uname
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2015-02-22 18:57:17 +01:00
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
dscho
daea1991fd Merge pull request #24 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2015-02-19 12:36:26 +01:00
The Gitter Badger
e125602277 Added Gitter badge 2015-02-11 15:24:26 +00:00
Junio C Hamano
9874fca712 Git 2.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
v2.3.0
2015-02-05 13:23:56 -08:00
Junio C Hamano
0d1c285af2 Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po:
  l10n: ca.po: Fix trailing whitespace
2015-02-02 12:05:56 -08:00
Alex Henrie
7471cf88f5 l10n: ca.po: Fix trailing whitespace
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-01-30 15:02:34 -07:00
Junio C Hamano
15598cf41b Git 2.3.0-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
v2.3.0-rc2
2015-01-27 14:39:53 -08:00
Junio C Hamano
ff76d36b35 Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po:
  l10n: de.po: correct singular form
  l10n: de.po: translate "leave behind" correctly
  l10n: de.po: fix typo
  l10n: ca.po: update translation
2015-01-27 11:01:05 -08:00
Jiang Xin
b4fde1e37d Merge branch 'master' of git://github.com/alexhenrie/git-po
* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation
2015-01-27 15:00:48 +08:00
Michael J Gruber
07586ebd4f l10n: de.po: correct singular form
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-26 19:36:04 +01:00
Michael J Gruber
2f334c6461 l10n: de.po: translate "leave behind" correctly
This message is about leaving orphaned commits behind, not about
behind an upstream branch. Try to make this clear.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-26 19:36:04 +01:00
Benedikt Heine
3b36ef9188 l10n: de.po: fix typo
Signed-off-by: Benedikt Heine <bebe@bebehei.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-26 19:36:04 +01:00
Alex Henrie
573ed5e147 l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-01-26 10:12:50 -07:00
Junio C Hamano
76afe74b10 Merge branch 'js/t1050'
* js/t1050:
  t1050-large: generate large files without dd
2015-01-22 13:46:45 -08:00
Junio C Hamano
67b5440d0d Merge branch 'ak/cat-file-clean-up'
* ak/cat-file-clean-up:
  cat-file: use "type" and "size" from outer scope
2015-01-22 13:46:38 -08:00
Junio C Hamano
d588d4d940 Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po:
  l10n: correct indentation of show-branch usage
  l10n: de.po: translate 3 messages
  l10n: zh_CN: various fixes on command arguments
  l10n: vi.po(2298t): Updated 3 new strings
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 2
  l10n: git.pot: v2.3.0 round 2 (3 updated)
  l10n: de.po: translate 13 new messages
  l10n: de.po: fix typo
  l10n: de.po: translate "track" as "versionieren"
  l10n: zh_CN: translations for git v2.3.0-rc0
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 1
  l10n: vi.po(2298t): Updated and change Plural-Forms
  l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
  l10n: ca.po: various fixes
2015-01-22 13:45:07 -08:00
Junio C Hamano
ab9432d375 Merge branch 'sh/asciidoc-git-version-fix'
* sh/asciidoc-git-version-fix:
  Documentation: fix version numbering
2015-01-22 13:44:47 -08:00
Sven van Haastregt
a4c044484e Documentation: fix version numbering
Version numbers in asciidoc-generated content (such as man pages)
went missing as of da8a366 (Documentation: refactor common operations
into variables).  Fix by putting the underscore back in the variable
name.

Signed-off-by: Sven van Haastregt <svenvh@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-22 13:44:14 -08:00
Junio C Hamano
ee443cf236 Merge branch 'jh/empty-notes'
* jh/empty-notes:
  Fix unclosed here document in t3301.sh
2015-01-22 13:42:37 -08:00
Kacper Kornet
85cb1d0ba8 Fix unclosed here document in t3301.sh
Commit 908a320363 introduced  indentation
to here documents in t3301.sh. However in one place <<-EOF was missing
-, which broke this test when run with mksh-50d. This commit fixes it.

Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-22 12:23:42 -08:00
Jiang Xin
1e60744913 l10n: correct indentation of show-branch usage
An indentation error was found right after we started l10n round 2, and
commit d6589d1 (show-branch: fix indentation of usage string) and this
update would fix it.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-21 15:35:37 +08:00
Jiang Xin
54d80a9343 Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
  l10n: de.po: translate 3 messages
  l10n: zh_CN: various fixes on command arguments
  l10n: vi.po(2298t): Updated 3 new strings
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 2
  l10n: git.pot: v2.3.0 round 2 (3 updated)
  l10n: de.po: translate 13 new messages
  l10n: de.po: fix typo
  l10n: de.po: translate "track" as "versionieren"
  l10n: zh_CN: translations for git v2.3.0-rc0
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 1
  l10n: vi.po(2298t): Updated and change Plural-Forms
  l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
  l10n: ca.po: various fixes
2015-01-21 14:20:53 +08:00
Junio C Hamano
627736ca79 Git 2.3.0-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
v2.3.0-rc1
2015-01-20 17:35:41 -08:00
Junio C Hamano
ea6e82c875 Merge branch 'jk/http-push-symref-fix'
* jk/http-push-symref-fix:
  http-push: trim trailing newline from remote symref
2015-01-20 17:31:50 -08:00
Junio C Hamano
17ad37112d Merge branch 'ak/show-branch-usage-string'
* ak/show-branch-usage-string:
  show-branch: fix indentation of usage string
2015-01-20 16:16:09 -08:00
Ralf Thielow
d6589d1ba4 show-branch: fix indentation of usage string
Noticed-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-20 16:12:54 -08:00
Junio C Hamano
d06ce4a508 Merge branch 'jk/colors'
* jk/colors:
  parse_color: fix return value for numeric color values 0-8
2015-01-20 15:57:22 -08:00
Jeff King
3759d27aca parse_color: fix return value for numeric color values 0-8
When commit 695d95d refactored the color parsing, it missed
a "return 0" when parsing literal numbers 0-8 (which
represent basic ANSI colors), leading us to report these
colors as an error.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-20 15:56:03 -08:00
Ralf Thielow
a235de4bd2 l10n: de.po: translate 3 messages
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-20 19:23:57 +01:00