Am 28.04.2015 um 21:52 schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
I set none of these. But I do commit CRLF and expect to get CRLF
back. Am I commiting binary files? Am I doing something that Git does
not support? Am I on [my] own?
I think these specific sentences are merely
Am 27.04.2015 um 21:45 schrieb Torsten Bögershausen:
On 04/27/2015 08:58 PM, Johannes Sixt wrote:
Am 27.04.2015 um 08:11 schrieb Stepan Kasal:
Git does not support CRLF as the internal line separator.
If you commit file in binary mode with CRLF, you are on your own.
When I commit my C source
Am 27.04.2015 um 08:11 schrieb Stepan Kasal:
Git does not support CRLF as the internal line separator.
If you commit file in binary mode with CRLF, you are on your own.
When I commit my C source code files with CRLF into the repository
(because I do not set any line ending options or
Am 25.04.2015 um 23:17 schrieb c...@qgenuity.com:
I have two sets of files.
A_Old is a large unversioned directory tree containing many files.
A_Updated is a git repository containing the files from A_Old, some of
which have been modified. A_Updated also contains new files.
I am looking for a
Windows does not have process groups. It is, therefore, the simplest
to pretend that each process is in its own process group.
While here, move the getppid() stub from its old location (between
two sync related functions) next to the two new functions.
Signed-off-by: Johannes Sixt j...@kdbg.org
Am 15.04.2015 um 20:48 schrieb Junio C Hamano:
The patch should do for now, but I suspect that it may give us a
better abstraction to make the is_foreground_fd(int fd) or even
is_foreground(void) the public API that would be implemented as
int we_are_in_the_foreground(void)
{
the history by replaying the merge commits (whose first
parent might be rewritten during the rebase, but the tips of side
branches these merges bring into the history are kept intact).
Surely there is no such mode right now,
Isn't it what Johannes Sixt j...@kdbg.org mentions here?:
[QUOTE]
If you
Am 25.03.2015 um 07:42 schrieb Eric Sunshine:
On Tue, Mar 24, 2015 at 1:20 AM, Paul Tan pyoka...@gmail.com wrote:
t0302 now tests git-credential-store's support for the XDG user-specific
configuration file $XDG_CONFIG_HOME/git/credentials. Specifically:
* Ensure that the XDG file is strictly
Am 22.03.2015 um 01:16 schrieb David A. Wheeler:
Warn cloners if there is no LICENSE* or COPYING* file that makes
the license clear. This is a useful warning, because if there is
no license somewhere, then local copyright laws (which forbid many uses)
and terms of service apply - and the cloner
Am 20.03.2015 um 11:13 schrieb Jeff King:
This script misses a trivial -chain in one of its tests,
but it also has a weird reverse: it includes an -chain
outside of any test_expect block! This cat should never
fail, but if it did, we would not notice, as it would cause
us to skip the follow-on
Am 17.03.2015 um 19:55 schrieb Jeff King:
+ echo $bogus .git/refs/heads/bogus..name
...
I assumed the final . in your example wasn't significant (it is not to
git), but let me know if I've run afoul of another weird restriction. :)
It was actually deliberate (with intents too
Am 17.03.2015 um 08:28 schrieb Jeff King:
+test_expect_success 'create history reachable only from a bogus-named ref' '
+ test_tick git commit --allow-empty -m master
+ base=$(git rev-parse HEAD)
+ test_tick git commit --allow-empty -m bogus
+ bogus=$(git rev-parse
Am 10.03.2015 um 23:54 schrieb Junio C Hamano:
Michael Haggerty mhag...@alum.mit.edu writes:
Well, that's true, but the eol attribute can regain its effect if
binary is followed by text or text=auto. So I guess the simplest
question is as follows. Suppose I have the following .gitattributes:
Am 28.02.2015 um 02:01 schrieb Stefan Beller:
Heavily inspired by the ideas of Duy, who wrote the first
patches nearly a year ago.
Nguyễn Thái Ngọc Duy (2):
upload-pack: only accept capabilities on the first want line
upload-pack: support out of band client capability requests
Stefan
the same as for the regular
path (where symbolic links are available). To fix this, just call
git update-index again.
This flaw was revealed by the earlier change that tightened
compare_diff_raw(), because a test case in t4008 depends on the
correctly updated index.
Signed-off-by: Johannes Sixt j
Am 20.02.2015 um 00:52 schrieb Mike Hommey:
Hi,
I was trying to use --color-words with a regex to check a diff, and it appears
it displays things out of order. Am I misunderstanding what my regexp should be
doing or is there a bug?
$ git diff -U3 HEAD^ dom/base/nsDOMFileReader.cpp
diff --git
Am 10.02.2015 um 12:46 schrieb Sergey Organov:
Johannes Sixt j...@kdbg.org writes:
Am 09.02.2015 um 13:53 schrieb Sergey Organov:
[...]
If you want a version of --preserve-merges that does what *you* need,
consider this commit:
git://repo.or.cz/git/mingw/j6t.git rebase-p-first
Am 09.02.2015 um 13:53 schrieb Sergey Organov:
Johannes Sixt j...@kdbg.org writes:
Am 07.02.2015 um 22:32 schrieb Sebastian Schuberth:
On 06.02.2015 22:28, Sergey Organov wrote:
# Now rebase my work.
git rebase -f HEAD~1
# What? Where is my Precious change in a???
cat a
/SCRIPT
I.e
Am 07.02.2015 um 22:32 schrieb Sebastian Schuberth:
On 06.02.2015 22:28, Sergey Organov wrote:
# Now rebase my work.
git rebase -f HEAD~1
# What? Where is my Precious change in a???
cat a
/SCRIPT
I.e., the modification marked [!] was silently lost during rebase!
Just a wild guess:
Am 04.02.2015 um 16:19 schrieb Peter Krefting:
Using git branch --no-merged I can get a list of branches that I have
that I haven't merged into my current branch.
Assuming v2.0.0 is a tag, using git branch --no-merged v2.0.0 you can
see which branches haven't been merged into v2.0.0.
-- Hannes
that check the output
for Binary files differ still pass.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t1050-large.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index f5a9119..f9f3d13 100755
--- a/t/t1050-large.sh
+++ b/t
the run-time short).
The files are now large text files, not binary files. But since they
are larger than core.bigfilethreshold they are diagnosed as binary
by Git. For this reason, the 'git diff' tests that check the output
for Binary files differ still pass.
Signed-off-by: Johannes Sixt j
to
allocate them.
While we are here, replace cmp with test_cmp_bin to document the
binary-ness of the comparison, which was hinted at by a comment, but not
stated explicitly.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
I won't mind if the first paragraph of the proposed commit message is
removed
Am 13.01.2015 um 19:56 schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
The new code does change some properties of the generated files:
- They are a bit smaller.
- They are not sparse anymore.
- They do not compress well anymore.
- The smaller of the four files is now
Am 13.01.2015 um 22:47 schrieb Jeff King:
On Tue, Jan 13, 2015 at 06:36:27PM +0100, Johannes Sixt wrote:
For some unknown reason, the dd on my Windows box segfaults every now
and than, but since recently, it does so much more often than it used
to, which makes running the test suite
Am 10.01.2015 um 07:49 schrieb Richard Hansen:
Make sure hooks are executed at the top-level directory and that
GIT_PREFIX is set (as documented).
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/t1020-subdirectory.sh | 34 ++
1 file changed, 34
Am 02.01.2015 um 18:03 schrieb Robert Dailey:
On Fri, Jan 2, 2015 at 10:49 AM, Robert Dailey rcdailey.li...@gmail.com
wrote:
I have a function like so:
void MyClass::SomeFunction(int someParameter)
{
// Stuff changed in here
}
When I do `git diff` on the file containing this
Am 02.01.2015 um 17:49 schrieb Robert Dailey:
I have a function like so:
void MyClass::SomeFunction(int someParameter)
{
// Stuff changed in here
}
When I do `git diff` on the file containing this function, I get a
chunk showing some changed code in this function somewhere in the
Am 27.12.2014 um 19:49 schrieb Philip Oakley:
Hi,
In ee9be06 (perl: detect new files in MakeMaker builds, 2012-07-27)
there is a step to detect if there has been an update to the PM.* files,
however it appears that the logic is inverted in the comparison.
I need some extra eye's on this
Am 23.12.2014 um 09:45 schrieb Jeff King:
@@ -606,7 +606,7 @@ static ucs_char_t next_hfs_char(const char **in)
* but this is enough to catch anything that will convert
* to .git
*/
- return tolower(out);
+ return out;
Did
Am 09.12.2014 um 18:49 schrieb Jeff King:
+test_expect_success 'create repo with absurdly long refname' '
+ ref240=$_z40/$_z40/$_z40/$_z40/$_z40/$_z40
+ ref1440=$ref240/$ref240/$ref240/$ref240/$ref240/$ref240
+ git init long
+ (
+ cd long
+
Am 20.11.2014 um 16:17 schrieb Jeff King:
+#define COLOR_FOREGROUND '3'
+#define COLOR_BACKGROUND '4'
This (COLOR_BACKGROUND) causes an ugly redefinition warning on Windows,
because we inherit a definition from a Windows header. How would you
like it fixed? A different name or #undef in front
Am 09.12.2014 um 20:49 schrieb Christoph Grüninger:
While browsing the changes, it is very easy to add (or remove) lines or
hunks for commit via the context menu. I would like to revert the
changes of a line or a hunk in a similar way. I have often white-space
or formatting changes I don't
Am 09.12.2014 um 21:21 schrieb Jeff King:
On Tue, Dec 09, 2014 at 09:14:29PM +0100, Johannes Sixt wrote:
Am 20.11.2014 um 16:17 schrieb Jeff King:
+#define COLOR_FOREGROUND '3'
+#define COLOR_BACKGROUND '4'
This (COLOR_BACKGROUND) causes an ugly redefinition warning on Windows,
because we
Am 05.12.2014 07:12, schrieb Sérgio Basto:
Hi,
I add 2 files that I want ignore on commits
git update-index --assume-unchanged configurations/local.defs
git update-index --assume-unchanged processor/default.defs
git diff -a
is clean
git diff .
is clean
git commit -a
nothing added to commit
test-genrandom can guarantee.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
Am 24.11.2014 um 17:00 schrieb Torsten Bögershausen:
The test suite passes, except
t5000 - not ok 48 - archive and :(glob)
fatal: pathspec '*.abc' did not match any files
I've this patch in my tree for a while.
t
Am 16.11.2014 um 08:21 schrieb Michael Haggerty:
@@ -559,9 +562,21 @@ int cmd_config(int argc, const char **argv, const char
*prefix)
if (given_config_source.blob)
die(editing blobs is not supported);
git_config(git_default_config, NULL);
-
with
O_APPEND|O_WRONLY, but without O_CREAT, and expects EISDIR when the
named file happens to be a directory.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
This version of the patch uses O_ACCMODE.
compat/mingw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat
Am 14.11.2014 um 22:04 schrieb Andreas Schwab:
Johannes Sixt j...@kdbg.org writes:
diff --git a/compat/mingw.c b/compat/mingw.c
index 2ee3fe3..fc64b73 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -312,7 +312,7 @@ int mingw_open (const char *filename, int oflags
(+cc msysgit)
Am 13.11.2014 um 10:08 schrieb Jeff King:
On Thu, Nov 13, 2014 at 09:50:24AM +0100, Johannes Sixt wrote:
That looks more like it is failing the actual test (i.e., the creation
of branch one when there is cruft in the reflog). My guess is that
calling open() on a directory
Am 13.11.2014 um 23:40 schrieb Mike Blume:
listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable
TTY on Yosemite and higher
Signed-off-by: Mike Blume blume.m...@gmail.com
Improved-by: Junio C Hamano gits...@pobox.com
---
t/lib-terminal.sh | 5 -
1 file changed, 4
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
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 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 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 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 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 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 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 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
.
--- 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 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
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.
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 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,
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 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
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 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
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 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 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 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 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
:
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 23.07.2014 23:28, schrieb Christoph Bonitz:
The scenario in the rename test makes unnecessary assumptions about
which file git file-tree will detect as a source for a copy-operations.
Furthermore, copy detection is not tested by checking the resulting
perforce revision history via p4
Am 21.07.2014 19:45, schrieb Johannes Schindelin:
Hi Junio,
On Mon, 21 Jul 2014, Junio C Hamano wrote:
Oh by the way, can somebody remind me why we spell these as
NOT_MINGW, instead of !MINGW?
I guess that is my mistake; when I introduced the use of NOT_MINGW I was
simply unaware of
Am 19.07.2014 11:45, schrieb John Keeping:
Since the argument to `--recurse-submodules` is mandatory, it does not
need to be stuck to the option with `=`.
Signed-off-by: John Keeping j...@keeping.me.uk
---
contrib/completion/git-completion.bash | 4
1 file changed, 4 insertions(+)
Am 18.07.2014 15:08, schrieb Nguyễn Thái Ngọc Duy:
diff --git a/lockfile.c b/lockfile.c
index 8fbcb6a..a70d107 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -280,3 +280,19 @@ void rollback_lock_file(struct lock_file *lk)
}
lk-filename[0] = 0;
}
+
+void
Am 16.07.2014 00:54, schrieb Karsten Blees:
There is no fchmod() on native Windows platforms (MinGW and MSVC), and the
equivalent Win32 API (SetFileInformationByHandle) requires Windows Vista.
Use chmod() instead.
Signed-off-by: Karsten Blees bl...@dcon.de
---
config.c | 8
1
Am 14.07.2014 14:53, schrieb Ephrim Khong:
diff --git a/t/t7702-repack-cyclic-alternate.sh
b/t/t7702-repack-cyclic-alternate.sh
new file mode 100755
index 000..3771613
--- /dev/null
+++ b/t/t7702-repack-cyclic-alternate.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Copyright (c) 2014 Ephrim
It looks like I totally missed the topic sk/mingw-unicode-spawn-args.
Now it's in master, and it breaks lots of test cases for me:
t0050-filesystem
t0110-urlmatch-normalization
t4014-format-patch
t4041-diff-submodule-option
t4120-apply-popt
t4201-shortlog
t4205-log-pretty-formats
Am 08.07.2014 21:34, schrieb Jens Lehmann:
And Msysgit complains
error: fchmod on c:/xxxt/trash
directory.t7613-merge-submodule/submodule_update_repo/.git/modules/sub1/config.lock
failed: Function not implemented
I'm not sure what this is about, seems to happen during the cp -R of
the
Am 7/1/2014 6:26, schrieb Torsten Bögershausen:
And as test -n tests for a non-zero string,
could we write like this (and drop the local ?)?
if test -n $1
then
dir=$1/
else
dir=
fi
These six lines can be written as
dir=$1${1:+/}
and 'local'
Am 27.06.2014 00:02, schrieb Junio C Hamano:
Four mingw series are still in limbo--are they in good enough shape
for Windows folks who wanted to upstream them?
I've now tested the Unicode patches a bit, and I didn't notice a
regression in my use-cases. The patches are good to go, IMHO.
--
Am 18.06.2014 19:33, schrieb Junio C Hamano:
In the meantime, are Windows folks happy with the four topics queued
on 'pu' so far? I would like to start moving them down to 'next'
and to 'master' soonish.
They consist of these individual patches:
$ git shortlog ^master \
Am 07.06.2014 09:57, schrieb Stepan Kasal:
From: Karsten Blees bl...@dcon.de
Date: Sat, 14 Jan 2012 22:24:19 +0100
Winansi.c has many static variables that are accessed and modified from
the [v][f]printf / fputs functions overridden in the file. This may cause
multi threaded git commands that
Am 13.06.2014 03:38, schrieb Joey Hess:
If git merge --no-commit is used to merge a commit adding a
file with an unusual mode -- specifically a symlink which has mode 12,
it fails to stage the right mode into the index.
This only happens when core.symlinks=false. I noticed it on FAT, but
Am 6/13/2014 14:33, schrieb Michael J Gruber:
with this loop, sorry:
for X in true false; do
for Y in false true; do
($X $Y || exit 1)
done
echo $X/last inner $Y: $?
done
gives
true/last inner true: 0
false/last inner true: 1
even though on both cases
Am 6/13/2014 15:06, schrieb Michael J Gruber:
Johannes Sixt venit, vidit, dixit 13.06.2014 14:54:
Am 6/13/2014 14:33, schrieb Michael J Gruber:
with this loop, sorry:
for X in true false; do
for Y in false true; do
($X $Y || exit 1)
done
echo $X/last inner $Y
Am 6/13/2014 15:31, schrieb Michael J Gruber:
rewrite of the form
a
b
test_must_fail c
d || exit 1
hoping that will make things both readable (by avoiding !) and concise
(by avoiding repeated exits).
Thanks!
Please note that we use 'test_must_fail' only for git invocations, but we
Am 12.06.2014 01:28, schrieb Pasha Bolokhov:
+test_expect_success setup '
+ mkdir repo-inside/
+ (
+ cd repo-inside/
+ for f in a b c d
+ do
+ echo DATA $f || exit 1
+ done
+ mkdir dir1 dir1/meta
Am 6/10/2014 1:05, schrieb Junio C Hamano:
Junio C Hamano gits...@pobox.com writes:
David Turner dtur...@twopensource.com writes:
Since Junio has picked up the first patch from previous versions of
this series, I'm just going to send the second (SSE) one. I decided
not to
Am 6/10/2014 1:23, schrieb Junio C Hamano:
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
# Always show modules deleted or type-changed
Am 6/10/2014 8:52, schrieb Johannes Sixt:
Am 6/10/2014 1:23, schrieb Junio C Hamano:
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
# Always show
Am 6/10/2014 16:55, schrieb Junio C Hamano:
Elia Pinto gitter.spi...@gmail.com writes:
@@ -832,7 +832,7 @@ Maybe you want to use 'update --init'?)
continue
fi
-if ! test -d $sm_path/.git -o -f $sm_path/.git
+if ! test -d
Am 07.06.2014 08:07, schrieb Arup Rakshit:
Hi,
I am working in a project, where I am using *Git*. Today, I have been advised
by my manager to do some change and it was an urgent request. I did the
change
and tested also, All was working fine. The big mistake I did, all the changes
I
Am 05.06.2014 10:05, schrieb Stepan Kasal:
mingw.c defines several wrapper functionsi, like mingw_unlink().
These wrappers are deployed by macros like this:
#define unlink mingw_unlink
The function itself is preceded by #undef, leaving the wrapper out
of the game for the rest of
Am 6/4/2014 5:13, schrieb David Turner:
It is possible to have two branches which are the same but for case.
This works great on the case-sensitive filesystems, but not so well on
case-insensitive filesystems. It is fairly typical to have
case-insensitive clients (Macs, say) with a
to tame down the subject line
if you think it's too strong ;)
--- 8 ---
From: Johannes Sixt j...@kdbg.org
Subject: [PATCH] fix brown paper bag breakage in t5150-request-pull.sh
The recent addition to the test case 'pull request format' interrupted
the single-quoted text, effectively adding a third
Am 6/1/2014 20:10, schrieb Jeremiah Mahler:
This is version 3 of the patch set to convert signal(2) to sigaction(2)
(previous discussion [1]).
[1]: http://marc.info/?l=gitm=140148352416926w=2
Changes in this revision include:
- Using NULL pointers instead of 0 as per the
Am 6/1/2014 20:10, schrieb Jeremiah Mahler:
Due to portability issues across UNIX versions sigaction(2) should be used
instead of signal(2).
From the signal(2) man page:
The behavior of signal() varies across UNIX versions, and has also var‐
ied historically across different versions
Am 5/28/2014 8:14, schrieb Jeremiah Mahler:
From signal(2)
The behavior of signal() varies across UNIX versions, and has also var‐
ied historically across different versions of Linux. Avoid its use:
use sigaction(2) instead. See Portability below.
This patch set replaces calls
Please do not cull the Cc list.
Am 5/27/2014 8:14, schrieb Jeremiah Mahler:
On Tue, May 27, 2014 at 07:46:59AM +0200, Johannes Sixt wrote:
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
601 - 700 of 1147 matches
Mail list logo
