Am 5/26/2014 20:56, schrieb Caleb Thompson:
Signed-off-by: Caleb Thompson ca...@calebthompson.io
---
t/t7507-commit-verbose.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
index 6d778ed..3b06d73 100755
---
Am 5/22/2014 10:38, schrieb Elia Pinto:
2014-05-22 8:49 GMT+02:00 Matthieu Moy matthieu@grenoble-inp.fr:
Elia Pinto gitter.spi...@gmail.com writes:
@@ -1059,13 +1059,17 @@ cmd_summary() {
while read mod_src mod_dst sha1_src sha1_dst status sm_path
do
Am 5/22/2014 15:19, schrieb David Kastrup:
Torsten Bögershausen tbo...@web.de writes:
On 2014-05-22 14.48, Elia Pinto wrote:
Found by check-non-portable-shell.pl
Thanks for picking this up
-export TEST_DIRECTORY=$(pwd)/../../../t
+TEST_DIRECTORY=$(pwd)/../../../t export TEST_DIRECTORY
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 !
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/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 :
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.
--
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/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
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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
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
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
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
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
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/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
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
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 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
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 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/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 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
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 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
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 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 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
[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/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.
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
.
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 12/18/2013 15:53, schrieb Nguyễn Thái Ngọc Duy:
The code that's not converted to use parse_options() often does
if (!starts_with(arg, foo=)) {
value = atoi(arg + 4);
}
This patch removes those magic numbers with skip_prefix()
Signed-off-by: Nguyễn Thái Ngọc Duy
From: Johannes Sixt j...@kdbg.org
The recent 5de460a2 (Refactor per-line part of getblobdiffline and its
support) introduced blobdiffmaybeseehere, and accidentally forgot the '$'
to access the parameter as a TCL variable. This resulted in a failing
Back button with the error
can't use non
Am 12/9/2013 3:23, schrieb Brett Randall:
* fixup! or squash! on it's own would default to fixing-up the
previous commit (or result of previous step of rebase if that was a
squash/fixup).
Why would you want that? To fixup the previous commit, just use 'git
commit --amend'. What am I missing?
Am 11/26/2013 0:43, schrieb Jonathan Nieder:
Heikki Hokkanen wrote:
If running git config on each prompt seems too expensive, do you have
any better ideas?
Perhaps a GIT_PS1_NOT_FOR_THESE_REPOS=repo1:repo2:repo3 setting would
work.
Yeah, but... I find the wish to show the bash prompt in
Am 23.11.2013 14:18, schrieb Heikki Hokkanen:
If bash.prompt is set to false, disable the prompt. This is useful
for huge repositories like the home directory.
Signed-off-by: Heikki Hokkanen h...@users.sf.net
---
git-prompt.sh performance seems to be quite bad for big repositories, so
Am 11/20/2013 13:03, schrieb Matthew Cengia:
The only changes I expect are these:
mattcen@sonar:prisonpc(wtf)$ git --no-pager diff --numstat --oneline
\ $(git merge-base wtf origin/22869-new-kernel)
origin/22869-new-kernel 37 0 client/kernel/README 2797
0
Am 11/20/2013 12:47, schrieb Alexander GQ Gerasiov:
1. I have repository with tree like this:
dir1/
file1
file2
file3
dir2/
subdir1/
some files
2. Current branch is B.
3. I want to get dir1 from branch A, and save it's content on current
Am 20.11.2013 22:09, schrieb Eris Belew:
System: Windows Server 2008 R2
Git: git version 1.8.4.msysgit.0
Shell: Powershell V3 (No third-party modules loaded)
Summary:
When specifying a pathspec including a branch/commit, path separator
characters are not translated. Since tab-completion
Am 11/20/2013 4:49, schrieb Matthew Cengia:
The other day I was merging a feature branch (shown below as
origin/22869-new-kernel) into my staging release (shown below as 'wtf'),
and it *reverted* a bucket-load of changes I'd made on other branches
which had been merged into staging before. I
Am 11.11.2013 22:29, schrieb Jens Lehmann:
The diff below fixes the problem you describe for me. (But I do not
consider it a worthwhile fix in its current form because a line
starting with Submodule might appear in a perfectly normal commit
message, while diff --git most probably won't).
Am 09.11.2013 01:48, schrieb Jason St. John:
-`--since=date1` limits to commits newer than `date1`, and using it
-with `--grep=pattern` further limits to commits whose log message
+'\--since=date1' limits to commits newer than `date1`, and using it
+with '\--grep=pattern' further limits to
Am 09.11.2013 12:35, schrieb Torsten Bögershausen:
On 2013-11-08 23.29, Jeff King wrote:
On Fri, Nov 08, 2013 at 06:10:30PM +0100, Torsten Bögershausen wrote:
Side question:
Do we have enough test coverage for htonll()/ntohll(),
or do we want do the module test which I send a couple of days
() uses start_command() to invoke the command; consequently,
the limits of the system still apply, but are diagnosed only at execve()
time. But these limits are more lenient than the 1K that git_connect()
imposed.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
Am 05.11.2013 08:14, schrieb Johannes
git_connect has grown large due to the many different protocols syntaxes
that are supported. Move the part of the function that parses the URL to
connect to into a separate function for readability.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
Apart from this simplification, the protocol
Am 05.11.2013 21:45, schrieb Torsten Bögershausen:
On 2013-11-05 20.39, Johannes Sixt wrote:
Thanks for picking this up, please see some minor nits inline,
and git_connect() is at the end
-struct child_process *git_connect(int fd[2], const char *url_orig
Am 11/4/2013 22:20, schrieb Torsten Bögershausen:
Bug fix for msygit in t5601 : use $PWD insted of $(pwd)
Not really. $PWD is /c/foo/bar style, but $(pwd) is c:/foo/bar, which is
equally good.
test_expect_success 'clone with excess parameters (2)' '
rm -fr dst
- test_must_fail
Am 02.11.2013 21:47, schrieb Sebastian Schuberth:
So maybe it's a good point now to also change the MINGW prerequisite
name to MSYS as part of your patch, and then name the functions more
appropriately?
It's too late. The series is already in master, and I see no point in a
follow-up patch of
Am 02.11.2013 21:33, schrieb Sebastian Schuberth:
On 26.10.2013 21:17, Johannes Sixt wrote:
In a number of tests, output that was produced by a shell script is
compared to expected output using test_cmp. Unfortunately, the MSYS
bash--
when invoked via git, such as in hooks--converts LF
Am 01.11.2013 20:34, schrieb Junio C Hamano:
In $gmane/234730, J6t pointed out that rev-list --exclude needs a
matching updates to the globbing option rev-parse supports.
Here is a follow-up to do just that. They are meant to be applied on
top of the two patch series that has been cooking in
Just a heads-up: This patch breaks t5601 totally on Windows. Test #4, a
local clone via file: protocol, fails already. I'm investigating now.
-- Hannes
--
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
Am 10/29/2013 22:07, schrieb Torsten Bögershausen:
@@ -610,17 +623,17 @@ struct child_process *git_connect(int fd[2], const char
*url_orig,
} else
end = host;
- path = strchr(end, c);
- if (path !has_dos_drive_prefix(end)) {
- if (c == ':') {
-
Am 10/30/2013 11:58, schrieb Nicolas Cornu:
This scrollbar is not optional and is useful if there is a lot of tags or
branches.
If this is the only case where the scrollbar is useful, i.e., it would
be handy only once every other week, then it is better to remember that
you can pan around in
Am 28.10.2013 10:13, schrieb Ben Walton:
Solaris' tr (both /usr/bin/ and /usr/xpg4/bin) uses the System V
semantics for tr whereby string1's length is truncated to the length
of string2 if string2 is shorter. The BSD semantics, as used by GNU tr
see string2 padded to the length of string1
Am 28.10.2013 20:22, schrieb Jonathan Nieder:
The git build system supports a NO_PERL switch to avoid installing
perl bindings or other features (like git add --patch) that rely on
perl on runtime, but even with NO_PERL it has not been possible for a
long time to run tests without perl.
is opened during the test run. Request man
format explicitly to keep the test silent.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
I've posted this patch to the msysgit list in July, and Dscho has picked
it up for Git on Windows.
t/t3200-branch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/lib-credential.sh | 4
t/t7407-submodule-foreach.sh | 4
t/t9001-send-email.sh| 1 -
3 files changed, 9 deletions(-)
diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index 3c43ff1..957ae93 100755
--- a/t/lib
.
Patch 1 replaces test_cmp with cmp when binary data is compared.
Patch 2 is the actual fix.
Patch 3 removes some work-arounds that are not necessary anymore.
Johannes Sixt (3):
t5300-pack-object: do not compare binary data using test_cmp
Windows: a test_cmp that is agnostic to random LF CRLF
701 - 800 of 1147 matches
Mail list logo
