.
This changes the error message from
$ git mv file no-such-dir/
fatal: renaming 'file' failed: Not a directory
to
$ git mv file no-such-dir/
fatal: destination directory does not exist, source=file,
destination=no-such-dir/
Signed-off-by: Johannes Sixt j...@kdbg.org
---
builtin/mv.c | 2
Am 09.01.2014 23:42, schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
The previous commit c57f628 (mv: let 'git mv file no-such-dir/' error out)
relies on that rename(src, dst/) fails if directory dst does not
exist (note the trailing slash). This does not work as expected
Am 1/16/2014 7:19, schrieb Misha Penkov:
I have a file in a git repo. It has changed during the last two
commits. I want to see the changes made in these two commits. The
following command should work:
git diff HEAD^^
but that doesn't get me the expected results. Read on for details.
[Cc Pat, who added git.rc]
Am 1/22/2014 0:48, schrieb Junio C Hamano:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
Note that I am merely guessing that short-digit version numbers
are acceptable by now after seeing
https://sourceware.org/ml/binutils/2012-07/msg00199.html
Ah, nice
Am 1/22/2014 17:12, schrieb Junio C Hamano:
Johannes Sixt j.s...@viscovery.net writes:
[Cc Pat, who added git.rc]
Am 1/22/2014 0:48, schrieb Junio C Hamano:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
Note that I am merely guessing that short-digit version numbers
are acceptable
From: Johannes Sixt j...@kdbg.org
If the git version number consists of less than three period
separated numbers, then the Windows resource file compilation
issues a syntax error:
$ touch git.rc
$ make V=1 git.res
GIT_VERSION = 1.9.rc0
windres -O coff \
-DMAJOR=1 -DMINOR=9
Am 1/23/2014 13:02, schrieb Pat Thoyts:
On 23 January 2014 07:28, Johannes Sixt j.s...@viscovery.net wrote:
@@ -1773,7 +1773,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
git.res: git.rc GIT-VERSION-FILE
$(QUIET_RC)$(RC) \
- $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist
Am 2/6/2014 12:54, schrieb konst...@ngs.ru:
However I typed the checkout directory in file
..git/info/sparse-checkout by using different formats with
and without the leading and the trailing slashes, with and
without asterisk after trailing slash, having tried all
the possible combinations,
Am 09.02.2014 12:01, schrieb Stefan-W. Hahn:
Good morning,
when diffing output where files have CRLF line ending, the coloring
seems wrong, because in changed lines the CR (^M) is highlighted,
even if the line ending has not changed.
...
If WS_CR_AT_EOL is set in ecbdata-ws_rule, it works
Running test suite of 'next' on Windows fails in t5310-pack-bitmaps with
the following symptoms. I haven't followed the topic. Have there been
patches floating that addressed the problem in one way or another?
(gdb) run
Starting program: D:\Src\mingw-git\t\trash
Am 2/12/2014 12:56, schrieb Erik Faye-Lund:
On Wed, Feb 12, 2014 at 8:27 AM, Johannes Sixt j.s...@viscovery.net wrote:
Running test suite of 'next' on Windows fails in t5310-pack-bitmaps with
the following symptoms. I haven't followed the topic. Have there been
patches floating that addressed
Am 2/12/2014 13:55, schrieb David Kastrup:
Johannes Sixt j.s...@viscovery.net writes:
Running test suite of 'next' on Windows fails in t5310-pack-bitmaps with
the following symptoms. I haven't followed the topic. Have there been
patches floating that addressed the problem in one way
Am 2/12/2014 20:30, schrieb Stefan Zager:
On Wed, Feb 12, 2014 at 11:22 AM, Karsten Blees karsten.bl...@gmail.com
wrote:
Am 12.02.2014 19:37, schrieb Erik Faye-Lund:
ReOpenFile, that's fantastic. Thanks a lot!
...but should be loaded dynamically via GetProcAddress, or are we ready to
drop
Am 14.02.2014 17:47, schrieb Stefan-W. Hahn:
It's the right solution. IOW, you should place something like this in
your .gitattributes:
*.html whitespace=cr-at-eol
Sorry, but this is not possible, because I have files of both sorts (mainly
C/C++) files in my repository and cannot change
Am 2/28/2014 0:38, schrieb Lee Hopkins:
If I understand the issue correctly, the problem is that packed-refs
are always case-sensitive, even if core.ignorecase=true. OTOH,
core.ignorecase is intended to affect filenames of the worktree, not
anything else, BTW.
checking / updating _unpacked_
Am 2/28/2014 6:37, schrieb Jeff King:
On Fri, Feb 28, 2014 at 12:04:18PM +0900, Brian Gesiak wrote:
No test asserts that git branch -u refs/heads/my-branch my-branch
emits a warning. Add a test that does so.
For an operation like git branch foo origin where setting up the
tracking is a
Am 2/28/2014 8:14, schrieb Jeff King:
I didn't think we bothered to make sh -x work robustly. I don't mind
if we do, but git grep -E 'test_(i18n)?cmp .*err shows many potential
problem spots.
Hmm. Looks like it is only a problem if you are calling a shell function
(since it is the shell
Am 01.03.2014 12:21, schrieb Faiz Kothari:
Signed-off-by: Faiz Kothari faiz.of...@gmail.com
---
Implemented write_or_die.c:strbuf_write_or_die() and used in relevant places
to substitute write_or_die(). I spotted other places where strbuf can be used
in place of buf[MAX_PATH] but that would
didn't forward the patch, yet.
--- 8 ---
From: Johannes Sixt j...@kdbg.org
Date: Tue, 25 Sep 2012 14:08:02 +0200
Subject: [PATCH] userdiff: have 'cpp' hunk header pattern catch more C++ anchor
points
The hunk header pattern 'cpp' is intended for C and C++ source code, but
it is actually not very
Am 3/6/2014 22:28, schrieb Jeff King:
On Wed, Mar 05, 2014 at 08:58:26AM +0100, Johannes Sixt wrote:
The pattern I chose also catches variable definition, not just
functions. That is what I need, but it hurts grep --function-context
That's the reason I didn't forward the patch, yet
Am 3/5/2014 1:10, schrieb Junio C Hamano:
* nd/gitignore-trailing-whitespace (2014-02-10) 2 commits
- dir: ignore trailing spaces in exclude patterns
- dir: warn about trailing spaces in exclude patterns
Warn and then ignore trailing whitespaces in .gitignore files,
unless they are
From: Johannes Sixt j...@kdbg.org
The Windows API does not preserve file names with trailing spaces (and
dots), but rather strips them. Our tools (MSYS bash, git) base the POSIX
emulation on the Windows API. As a consequence, it is impossible for bash
on Windows to allocate a file whose name has
Am 3/14/2014 4:54, schrieb Jeff King:
On Fri, Mar 07, 2014 at 08:23:05AM +0100, Johannes Sixt wrote:
No, I meant lines like
static double var;
-static int old;
+static int new;
The motivation is to show hints where in a file the change is located:
Anything that could
Am 15.03.2014 00:57, schrieb Uwe Storbeck:
when variables may contain backslash sequences.
Backslash sequences are interpreted as control characters
by the echo command of some shells (e.g. dash).
Signed-off-by: Uwe Storbeck u...@ibr.ch
---
t/test-lib.sh | 4 ++--
1 file changed, 2
Cc René; do you have any comments regarding grep --function-context?
Am 3/18/2014 6:24, schrieb Jeff King:
On Fri, Mar 14, 2014 at 07:56:46AM +0100, Johannes Sixt wrote:
Consider this code:
void above()
{}
static int Y;
static int A;
int bar()
{
return X;
}
void
attempt to
change the infrastructure [2], and it is the reason for the widened Cc
list.
Two patches also extend the word regexp.
[1] http://article.gmane.org/gmane.comp.version-control.git/243408
[2] http://thread.gmane.org/gmane.comp.version-control.git/187269/focus=187497
Johannes Sixt (10
Do not split constants such as 123U, 456ll, 789UL at the first U or
second L.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
userdiff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/userdiff.c b/userdiff.c
index 434535b..8830417 100644
--- a/userdiff.c
+++ b/userdiff.c
The character sequences -* and .* are valid C++ operators. Keep them
together in --word-diff mode.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
userdiff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/userdiff.c b/userdiff.c
index 10b61ec..434535b 100644
--- a/userdiff.c
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t4018-diff-funcname.sh | 4
t/t4018/java-class-member-function | 8
2 files changed, 8 insertions(+), 4 deletions(-)
create mode 100644 t/t4018/java-class-member-function
diff --git a/t/t4018-diff-funcname.sh b/t/t4018
-by: Johannes Sixt j...@kdbg.org
---
t/t4018-diff-funcname.sh | 60 +++-
t/t4018/README | 18 +++
2 files changed, 72 insertions(+), 6 deletions(-)
create mode 100644 t/t4018/README
diff --git a/t/t4018-diff-funcname.sh b/t/t4018
There is one subtlety: The old test case 'perl pattern gets full line of
POD header' does not have its own new test case, but the feature is
tested nevertheless by placing the RIGHT tag at the end of the expected
hunk header in t4018/perl-skip-sub-in-pod.
Signed-off-by: Johannes Sixt j
Most of the tests show C++ code, but there is also a union definition and
a GNU style function definition that are not recognized.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t4018/cpp-class-constructor | 5 +
t/t4018/cpp-class-constructor-mem-init | 6 ++
t/t4018
on. Remove the largish here-document and use only
tiny files.
While we are touching these tests, convert grep to test_i18ngrep as the
texts checked for may undergo translation in the future.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t4018-diff-funcname.sh | 52
A later patch changes the built-in cpp pattern. These test cases
demonstrate aspects of the pattern that we do not want to change.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t4018/cpp-c++-function | 4
t/t4018/cpp-class-definition | 4
t/t4018/cpp-class
For the test case matches to end of line, extend the pattern by a few
wildcards so that the pattern captures the RIGHT token, which is needed
for verification, without mentioning it in the pattern.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t4018-diff-funcname.sh | 40
) it is
no longer rejected, but can appear as a hunk header if it occurs at
the beginning of a line:
next:;
IMO, the benefits of the change outweigh the (possible) regressions by a
large margin.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t4018/cpp-class-constructor | 1 -
t/t4018/cpp
Am 21.03.2014 23:00, schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
Add an infrastructure that simplifies adding new tests of the hunk
header regular expressions.
To add new tests, a file with the syntax to test can be dropped in the
directory t4018. The README file explains
Am 24.03.2014 22:39, schrieb Jeff King:
On Mon, Mar 24, 2014 at 05:36:59PM -0400, Jeff King wrote:
+How to write RIGHT test cases
+=
+
+Insert the word ChangeMe (exactly this form) at a distance of
+at least two lines from the line that must appear in the hunk
Am 3/19/2014 1:46, schrieb sza...@chromium.org:
This adds a Windows implementation of pread. Note that it is NOT
safe to intersperse calls to read() and pread() on a file
descriptor. According to the ReadFile spec, using the 'overlapped'
argument should not affect the implicit position
Am 3/27/2014 19:48, schrieb Junio C Hamano:
From: Kirill Smelkov k...@mns.spb.ru
Date: Mon, 24 Feb 2014 20:21:46 +0400
...
By the way, in general I do not appreciate people lying on the Date:
with an in-body header in their patches, either in the original or
in rerolls.
format-patch is
Am 3/27/2014 19:50, schrieb David A. Dalrymple (and Bhushan G. Lodha):
From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu
This test builds a sample C file, adding and removing functions, and
checks that the right commits are filtered by --function-name matching.
This is probably the
Please do not cull the Cc list.
Am 3/28/2014 11:07, schrieb Marat Radchenko:
Jeff King peff at peff.net writes:
I'm not sure what an actual SIGPIPE death looks like on Windows.
There is no SIGPIPE death on Windows due to total absence of SIGPIPE.
raise(unsupported int) just causes ugly
Am 28.03.2014 18:06, schrieb Junio C Hamano:
Johannes Sixt j.s...@viscovery.net writes:
Am 3/27/2014 19:48, schrieb Junio C Hamano:
From: Kirill Smelkov k...@mns.spb.ru
Date: Mon, 24 Feb 2014 20:21:46 +0400
...
By the way, in general I do not appreciate people lying on the Date
Am 28.03.2014 19:36, schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
Am 28.03.2014 18:06, schrieb Junio C Hamano:
Johannes Sixt j.s...@viscovery.net writes:
Am 3/27/2014 19:48, schrieb Junio C Hamano:
From: Kirill Smelkov k...@mns.spb.ru
Date: Mon, 24 Feb 2014 20:21:46 +0400
Am 04.04.2014 22:58, schrieb Junio C Hamano:
* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
- Enable index-pack threading in msysgit.
What is the status of this topic? A failure report exists
($gmane/245170), and I am aware of Duy's $gmane/245034 but that was
where the discussion
Am 4/7/2014 1:34, schrieb Michael Haggerty:
Because remove_lock_file() can be called any time by the signal
handler, it is important that any lock_file objects that are in the
lock_file_list are always in a valid state. And since lock_file
objects are often reused (but are never removed from
Am 4/7/2014 13:13, schrieb Michael Haggerty:
On 04/07/2014 08:16 AM, Johannes Sixt wrote:
Am 4/7/2014 1:34, schrieb Michael Haggerty:
So, instead of encoding part of the lock_file state in the filename
field, add a new bit LOCK_FLAGS_LOCKFILE_ACTIVE to flags, and use
this bit to distinguish
Am 05.04.2014 11:19, schrieb Johannes Sixt:
Am 04.04.2014 22:58, schrieb Junio C Hamano:
* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
- Enable index-pack threading in msysgit.
What is the status of this topic? A failure report exists
($gmane/245170), and I am aware of Duy's
Am 08.04.2014 02:39, schrieb Duy Nguyen:
On Tue, Apr 8, 2014 at 1:35 AM, Johannes Sixt j...@kdbg.org wrote:
Am 05.04.2014 11:19, schrieb Johannes Sixt:
Am 04.04.2014 22:58, schrieb Junio C Hamano:
* sz/mingw-index-pack-threaded (2014-03-19) 1 commit
- Enable index-pack threading in msysgit
Am 10.04.2014 20:54, schrieb Yiannis Marangos:
+ssize_t xpread(int fd, void *buf, size_t len, off_t offset)
+{
+ ssize_t nr;
+ if (len MAX_IO_SIZE)
+ len = MAX_IO_SIZE;
Odd indentation here.
-- Hannes
--
To unsubscribe from this list: send the line unsubscribe git in
the
Am 4/14/2014 15:54, schrieb Michael Haggerty:
diff --git a/lockfile.c b/lockfile.c
index 664b0c3..1453a7a 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -292,6 +292,9 @@ int commit_lock_file(struct lock_file *lk)
if (lk-fd = 0 close_lock_file(lk))
return -1;
+ if
, and we can get away
without volatile in the filename case in practice.
Suggested-by: Johannes Sixt j.s...@viscovery.net
Not a big deal, but just in case you re-roll again and you do not forget:
Johannes Sixt j...@kdbg.org
is preferred.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Am 4/15/2014 10:44, schrieb Erik Faye-Lund:
From: Erik Faye-Lund kusmab...@googlemail.com
On Windows, absolute paths might start with a DOS drive prefix,
which this check fails to recognize.
Unfortunately, we cannot simply use the file_name_is_absolute
helper in File::Spec::Functions,
Am 4/24/2014 10:24, schrieb Jussi Peltonen:
I installed git to my Windows 7 workstation and cloned
http://git.ipxe.org/ipxe.git; by using the Git GUI.
ipxe-23042014/src tree looks like this in Cygwin bash:
Files have no permissions, same goes with subfolders, e.g.
$ ls -l config/
total
Am 26.04.2014 01:25, schrieb Marius Ungureanu:
New keywords: foreach, break, in, try, finally, as, is, typeof, var,
default, fixed, checked, unchecked, this, lock, readonly, unsafe,
ref, out, base, null, delegate, continue.
Removed keywords: instanceof. It's only in Java.
Moved keywords to
Am 26.04.2014 11:55, schrieb Marius Ungureanu:
On 26 Apr 2014, at 10:10, Johannes Sixt j...@kdbg.org wrote:
Am 26.04.2014 01:25, schrieb Marius Ungureanu:
diff --git a/userdiff.c b/userdiff.c
index fad52d6..7612c5d 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -133,14 +133,14 @@ PATTERNS(cpp
Am 26.04.2014 20:33, schrieb Marius Ungureanu:
... add as many unit tests I can.
Great! Keep in mind that quantity is secondary. Quality counts.
I’ll start a new thread with the new
patch as soon as I’m done with it.
If possible, do not start a new thread, but post your new patch as a
reply
Am 27.04.2014 15:47, schrieb Marius Ungureanu:
---
Thanks. Please signed off your patch.
When you re-send, please place [PATCH v3 n/m] in the subject (and drop
the Re:) and note what you changed compared to the previous (or all
earlier) rounds. The place for this note is here, after the ---
Am 27.04.2014 18:46, schrieb Marius Ungureanu:
Is it okay though if I add a few tests to show what is broken?
I think this can’t be solved at a regex level.
It's OK to add tests that show breakages even if there is no immediate
solution.
You can mark a userdiff test case that demonstrates a
Am 4/28/2014 13:44, schrieb Erik Faye-Lund:
On Mon, Apr 28, 2014 at 1:42 PM, Stepan Kasal ka...@ucw.cz wrote:
From: Paolo Bonzini bonz...@gnu.org
Date: Mon, 21 May 2012 09:52:42 +0200
Backported from Gnulib.
2012-05-21 Paolo Bonzini bonz...@gnu.org
poll/select: prevent
Am 04.05.2014 08:35, schrieb Michael Haggerty:
On 05/03/2014 10:12 PM, brian m. carlson wrote:
I specifically did not choose sha1 since it
looks weird to have sha1-sha1 and I didn't want to rename lots of
variables.
That means that we will have sha1-oid all over the place, right?
Only
Am 04.05.2014 08:07, schrieb Michael Haggerty:
On 05/03/2014 10:12 PM, brian m. carlson wrote:
Introduce a structure for object IDs. This allows us to obtain the benefits
of compile-time checking for misuse. The structure is expected to remain
the same size and have the same alignment
Am 04.05.2014 12:55, schrieb Andreas Schwab:
Johannes Sixt j...@kdbg.org writes:
I think that a compiler that has different size and alignment requirements
for the proposed struct object_id and an unsigned char[20] would, strictly
speaking, not be a C compiler.
Unlike arrays, a struct can
Am 5/7/2014 0:59, schrieb dtur...@twopensource.com:
From: David Turner dtur...@twitter.com
Make it possible to change the case of a filename on a
case-insensitive filesystem using git mv. Change git mv to allow
moves where the destination file exists if either the destination file
has the
Am 5/7/2014 19:46, schrieb Junio C Hamano:
David Turner dtur...@twopensource.com writes:
On Wed, 2014-05-07 at 08:17 +0200, Johannes Sixt wrote:
} else if (cache_name_pos(src, length) 0)
bad = _(not under version control);
- else if (lstat(dst, st
I know I'm late in the show, but can we please, PLEASE
*NOT* feed the troll?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Am 5/13/2014 1:10, schrieb Max Kirillov:
--- a/t/t7007-show.sh
+++ b/t/t7007-show.sh
@@ -25,6 +25,7 @@ test_expect_success 'set up a bit of history' '
git checkout -b side HEAD^^
test_commit side2
test_commit side3
+ test_merge merge main3
'
Broken -chain.
--
Am 5/13/2014 11:09, schrieb Erik Faye-Lund:
On Mon, May 12, 2014 at 9:16 PM, Thomas-Louis Laforest
tllafor...@arbault.ca wrote:
When running this command on Git for Windows (version 1.9.2-preview20140411)
git reset --quiet --hard with one file having read/write lock git ask this
question :
anyway? ;-)
Therefore, here's just a work-around patch to keep things going on
Windows. Any opinions from the Windows corner?
--- 8 ---
From: Johannes Sixt j...@kdbg.org
Subject: [PATCH] mingw: turn the always-failing fchmod stub into
always-succeeding
A recent change introduced new call sites
Am 5/20/2014 15:50, schrieb Elia Pinto:
# If we don't already have a -f flag and the submodule
has never been checked out
- if test -z $subsha1 -a -z $force
+ if test -z $subsha1 || test -z $force
Should not be ||, but !
:
test_i18ngrep ! foo bar
Convert incorrect uses to this syntax.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t4018-diff-funcname.sh | 8
t/t9800-git-p4-basic.sh | 2 +-
t/t9807-git-p4-submit.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t4018-diff
Am 17.08.2014 00:55, schrieb René Scharfe:
Most struct child_process variables are cleared using memset right after
declaration. Provide a macro, CHILD_PROCESS_INIT, that can be used to
initialize them statically instead. That's shorter, doesn't require a
function call and is slightly more
Am 19.08.2014 19:15, schrieb Robin Rosenberg:
Using the original filename suffix for the temporary input files to
the merge tool confuses IDEs like Eclipse. This patch introduces
a configurtion option, mergetool.tmpsuffix, which get appended to
the temporary file name. That way the user can
Am 21.08.2014 00:19, schrieb Junio C Hamano:
For that, we need to catch an index whose entries are not sorted and
error out, perhaps when read_index_from() iterates over the mmapped
index entries. We can even draw that hopelessly corrupt line
above the breakage you are addressing and add a
Am 05.09.2014 12:06, schrieb Chris Packham:
In check_patch_format we feed $1 to a block that attempts to determine
the patch format. Since we've already redirected $1 to stdin there is no
need to redirect it again when we invoke tr. This prevents the following
errors when invoking git am
Am 07.09.2014 10:06, schrieb Eric Wong:
diff --git a/git-svn.perl b/git-svn.perl
index 1f41ee1..47cd6ea 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1477,10 +1477,20 @@ sub cmd_commit_diff {
}
}
-
sub cmd_info {
- my $path = canonicalize_path(defined($_[0]) ? $_[0] :
Am 07.09.2014 21:49, schrieb Jonathan Nieder:
+enum object_type;
Enum forward declarations are a relatively new C feature. They certainly
don't exist pre-C99.
-- Hannes
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Am 08.09.2014 13:25, schrieb Colin Yates:
For example, let's imagine that #f1 removed fileA, some time later #d1
Assumption: #d1 is in the branch you call develop HEAD.
added a line to that file. If I was doing a merge then of course this
should be a conflict, however applying #f1 to develop
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 j...@kdbg.org
---
t/t9300-fast-import.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast
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 j...@kdbg.org
---
Am 12.09.2014 um 20:14 schrieb Thomas Braun:
May I suggest to use test_cmp_bin instead of plain cmp?
Of course! I did
Am 06.09.2014 um 09:50 schrieb Michael Haggerty:
It's bad manners. Especially since, if unlink_or_warn() failed, the
memory wasn't restored to its original contents.
I do not see how the old code did not restore the file name. Except for
this nit, the patch looks good.
So make our own copy
Am 13.09.2014 um 00:48 schrieb Junio C Hamano:
The pre-receive and post-receive hooks were designed to be an
improvement over old style update and post-update hooks that used to
take the update information on the command line and were limited by
the command line length limit. They take the
Am 14.09.2014 um 08:38 schrieb Michael Haggerty:
On 09/14/2014 08:27 AM, Michael Haggerty wrote:
On 09/13/2014 09:41 AM, Johannes Sixt wrote:
Am 06.09.2014 um 09:50 schrieb Michael Haggerty:
It's bad manners. Especially since, if unlink_or_warn() failed, the
memory wasn't restored to its
Am 18.09.2014 um 18:57 schrieb Patrick Reynolds:
Blocked and ignored signals -- but not caught signals -- are inherited
across exec. Some callers with sloppy signal-handling behavior can call
git with SIGPIPE blocked or ignored, even non-deterministically. When
SIGPIPE is blocked or ignored,
does not have that
member.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
compat/mingw.h | 7 ++-
t/t0005-signals.sh | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/compat/mingw.h b/compat/mingw.h
index 0b5f2fe..0e42653 100644
--- a/compat/mingw.h
+++ b/compat
Am 28.09.2014 um 09:50 schrieb Ben Walton:
Oracle Studio compilers don't allow for static variables in functions
that are defined to be inline. GNU C does permit this. Let's reference
the C99 standard though, which doesn't allow for inline functions to
contain modifiable static variables.
Am 28.09.2014 um 22:42 schrieb Ben Walton:
On Sun, Sep 28, 2014 at 8:15 PM, Johannes Sixt j...@kdbg.org
mailto:j...@kdbg.org wrote:
Am 28.09.2014 um 09:50 schrieb Ben Walton:
-inline uint64_t getnanotime(void)
+uint64_t getnanotime(void)
But then the function could stay
Am 28.09.2014 um 15:24 schrieb Marat Radchenko:
This commit touches regcomp.c and poll.c from Gnulib,
both were fixed upstream in 2012 the same way.
Wrt ShellExecute, see [1].
[1]: http://blogs.msdn.com/b/oldnewthing/archive/2006/11/08/1035971.aspx
Please do not force readers to visit a
.
--- 8 ---
Subject: [PATCH] fixup! setup.c: support multi-checkout repo setup
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t1501-worktree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index e6ac7a4..4df7a2f 100755
--- a/t
paths, but $TRASH_DIRECTORY is in
POSIX-MSYS-style /c/foo/bar.
--- 8 ---
Subject: [PATCH] fixup! prune: strategies for linked checkouts
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t2026-prune-linked-checkouts.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t2026
Am 06.10.2014 um 07:17 schrieb Marat Radchenko:
On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:
This patch series fixes building on modern MinGW and MinGW-W64 (including
x86_64!).
Junio, ping?
Sorry, I forgot to report that this updated series works now for me.
The
Am 07.10.2014 um 21:01 schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
Am 06.10.2014 um 07:17 schrieb Marat Radchenko:
On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:
This patch series fixes building on modern MinGW and MinGW-W64 (including
x86_64!).
Junio
Am 10.10.2014 um 20:48 schrieb David Aguilar:
On Fri, Oct 10, 2014 at 01:19:40PM +0200, Jakub Narębski wrote:
David Aguilar wrote:
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.
Previously, foo/bar.ext in the worktree would result in e.g.
Am 14.10.2014 um 04:32 schrieb Jess Austin:
diff --git a/contrib/completion/git-prompt.sh
b/contrib/completion/git-prompt.sh
index c5473dc..d7559ff 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -84,6 +84,11 @@
# GIT_PS1_SHOWCOLORHINTS to a
Am 14.10.2014 um 21:57 schrieb Junio C Hamano:
+static void dissociate_from_references(void)
+{
+ struct child_process cmd;
+
+ memset(cmd, 0, sizeof(cmd));
We have CHILD_PROCESS_INIT these days.
+ argv_array_pushl(cmd.args, repack, -a, -d, NULL);
+ cmd.git_cmd = 1;
+
Am 23.10.2014 um 14:34 schrieb Henning Moll:
i need to squash several commits into a single one in a automated
way. I know that there is interactive rebase, which can also be
automated using GIT_SEQUENCE_EDITOR. Unfortunately my history is very
large and i need to squash deep down in the
Am 26.10.2014 um 02:38 schrieb David Aguilar:
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 7ef36b9..fdbd768 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -62,6 +62,8 @@ launch_merge_tool () {
else
run_merge_tool $merge_tool
An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does
not quit it, but is treated as if 'yes' was answered to the prompt and
all following prompts, which is contrary to the user's intent. Fix the
error check.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
Found while reviewing
Am 09.11.2014 um 02:59 schrieb Jeff King:
test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
- test_when_finished git branch -d a || git branch -d a/b
+ test_when_finished git branch -d one || git branch -d one/two
- git branch a/b master
- echo
Am 12.11.2014 22:59, schrieb Jeff King:
On Wed, Nov 12, 2014 at 09:20:22PM +0100, Johannes Sixt wrote:
Am 09.11.2014 um 02:59 schrieb Jeff King:
test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
- test_when_finished git branch -d a || git branch -d a/b
1 - 100 of 1147 matches
Mail list logo
