This reverts commit 3a8b35c3e3
A quick test showed that this is unnecessary. Unfortunately,
the commit message does not explain the specific reason for
the patch. It could be issues with FAT or Windows shares.
We hope that this is fixed since we switched to Tcl/Tk 8.5.5.
The commit message of 3a76fdaf98
explains that GCC >= 4 does not need SNPRINTF_SIZE_CORR, but
the ifdef tested for < 3, instead of < 4. This is fixed.
Thanks to Johannes Sixt for spotting the bug.
This commit changes handling of the msysgit specific settings, so
that they can be applied to Junio's git.git. Some msysgit
settings differ from the standard MinGW settings. We move them
into a ifndef block that is only evaluated if a file
THIS_IS_MSYSGIT is present in the parent directory, which will be
the case for an msysgit working environment, and we assume that
such a file is not present accidentally.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
On Windows, file names are case-insensitive, and some versions of
TortoisePlink do not handle -batch well (i.e. they do not understand,
neither ignore it).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As reported in msysGit issue 96, plink wants to interact with the user
asking if a host key should be accepted, but this just blocks the
terminal, as plink tries to get the answer from stdin. However, stdin
is already connected to Git that wants to send input to the remote
command.
Rather than blocking, just call plink with -batch so that it will error
out with an error message.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
msysGit issue 258 tracks a problem opening a browser onto file paths
that contain spaces or parentheses when calling the web--browse
script. This path modifies how the start command is called to solve
this.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
The logic in 83ae209 (checkout branch: prime cache-tree fully,
2009-04-20) is bogus; checkout can switch branches with a dirty
index and in such a case the tree won't match HEAD.
Add t2014-switch to catch this breakage.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Cloning into an existing empty directory is now allowed:
commit 55892d2398
("Allow cloning to an existing empty directory")
Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Not as verbose as the recursive merge driver, but better still.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
On some systems, giving a value of type time_t to printf "%lo" that
expects an unsigned long would give a type mismatch warning.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
GCC babbles something about "type-punned" pointers. Just add an extra
layer of casting to avoid the warning.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
GCC 4.4.0 on Windows does not like the format %zu. It is quite unlikely,
though, that we need more merge bases than a %d can display, so replace
the %zu by a %d.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
POSIX only requires sed to work on text files and MERGE_RR is not a text
file. Some versions of sed complain that this file is not newline
terminated, and exit non-zero. Use perl instead which does not have a
problem with it.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
These two lines appear to be unnecessary. They set variables which are not
used afterwards. The primary motivation to remove them is that the sed
invocation exits non-zero for seds which require newline termination of
input files.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Some versions of sed exit non-zero if the file they are supplied is not
newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed. So
rework this test to avoid doing so.
This affects tests t8001-annotate.sh and t8002-blame.sh.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Some versions of sed exit non-zero if the file they are supplied is not
newline terminated. Solaris's /usr/xpg4/bin/sed is one such sed. In
this case the sed invocation can be avoided entirely since the resulting
file is equivalent to a previously created file. So, just copy that file
into place instead.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Not all versions of grep understand backslashed extended regular
expressions. Possibly only gnu grep does.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Fredrik Skolmli and Thomas Rast noticed that it was left unstated that
"git clean" ran from a subdirectory will not affect anything outside it,
with or without path limiters.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
* maint:
improve error message in config.c
t4018-diff-funcname: add cpp xfuncname pattern to syntax test
Work around BSD whose typeof(tv.tv_sec) != time_t
git-am.txt: reword extra headers in message body
git-am.txt: Use date or value instead of time or timestamp
git-am.txt: add an 'a', say what 'it' is, simplify a sentence
dir.c: Fix two minor grammatical errors in comments
git-svn: fix a sloppy Getopt::Long usage
According to POSIX, tv_sec is supposed to be a time_t, but OpenBSD
(and FreeBSD, too) defines it to be a long, which triggers a type
mismatch when a pointer to it is given to localtime_r().
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
It's nice to know that 'it' is git-am or the subject line. Whitespace
implies characters so just remove characters.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Add completion for --confirm, --suppress-cc, and --smtp-encryption
command line arguments. Add completion for aliasfiletype and confirm
configuration variables.
Since --smtp-ssl is deprecated, replace it with --smtp-encryption and
the two options ssl and tls.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
