Hi Junio,
Ralf completed his work on German l10n for Git 2.7.0, please pull.
The following changes since commit 28274d02c489f4c7e68153056e9061a46f62d7a0:
Git 2.7-rc3 (2015-12-28 14:00:52 -0800)
are available in the git repository at:
git://github.com/git-l10n/git-po tags/l10n-2.7.0-rnd2+de
On 2016-01-01 22.14, Ramsay Jones wrote:
>
>
> On 01/01/16 17:49, Torsten Bögershausen wrote:
>> On 2016-01-01 18.14, Ramsay Jones wrote:
>>> Hi Torsten,
>>>
>>> On 01/01/16 15:36, Torsten Bögershausen wrote:
The (last) test case
'conflict markers contain CRLF when core.eol=crlf'
>
On 01/01/16 17:49, Torsten Bögershausen wrote:
> On 2016-01-01 18.14, Ramsay Jones wrote:
>> Hi Torsten,
>>
>> On 01/01/16 15:36, Torsten Bögershausen wrote:
>>> The (last) test case
>>> 'conflict markers contain CRLF when core.eol=crlf'
>>>
>>> does not work as expected under Mac OS: "wc -l" is
On 2016-01-01 18.14, Ramsay Jones wrote:
> Hi Torsten,
>
> On 01/01/16 15:36, Torsten Bögershausen wrote:
>> The (last) test case
>> 'conflict markers contain CRLF when core.eol=crlf'
>>
>> does not work as expected under Mac OS: "wc -l" is not portable and the line
>> test $(sed -n "/\.txt\r$/p"
Hi Torsten,
On 01/01/16 15:36, Torsten Bögershausen wrote:
> The (last) test case
> 'conflict markers contain CRLF when core.eol=crlf'
>
> does not work as expected under Mac OS: "wc -l" is not portable and the line
> test $(sed -n "/\.txt\r$/p" output.txt | wc -l) = 3
> fails.
Hmm, I have never
On 01/01/2016 03:58 PM, Johannes Schindelin wrote:
> Hi Michael,
>
> On Tue, 29 Dec 2015, Michael Haggerty wrote:
>
>> On 09/28/2015 06:12 PM, Johannes Schindelin wrote:
>>> Git has a config variable to indicate that it is operating on a file
>>> system that is case-insensitive: core.ignoreCase.
I have a program which tries to collect info from lots of branches and
generate some table from that data into another branch.
For performance reasons, I'd like to do that from fast-import, and as
long as I know the name of all the files I need to consult, everything
is fine since I can use the "l
The (last) test case
'conflict markers contain CRLF when core.eol=crlf'
does not work as expected under Mac OS: "wc -l" is not portable and the line
test $(sed -n "/\.txt\r$/p" output.txt | wc -l) = 3
fails.
(The other problem is that the usage of "\r" in a sed expression is not portable
either.)
On a case insenstive file system x is the same as X.
When a file named "X" exist, e.g. ">x && git add x" does not work as expected,
use file name "Y" instead.
Signed-off-by: Torsten Bögershausen
---
t/t3400-rebase.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t34
Hi Junio,
On Wed, 30 Dec 2015, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > So maybe
> >
> > fcreate_or_truncate(const char *path)
> > {
> > FILE *ret = fopen(path, "w");
> >
> > if (!ret && errno == EPERM) {
> > if (!unlink(pa
Hi Michael,
On Tue, 29 Dec 2015, Michael Haggerty wrote:
> On 09/28/2015 06:12 PM, Johannes Schindelin wrote:
> > Git has a config variable to indicate that it is operating on a file
> > system that is case-insensitive: core.ignoreCase. But the
> > `dir_inside_of()` function did not respect that.
Hi Eli,
On Thu, 31 Dec 2015, Eli Woods wrote:
> This may not be a bug specifically for Git GUI, it may better be
> reported to WISH
> or even Microsoft.
Well, let's find out where the bug occurs. I have a *hunch* that the
answer lies with gui.geometry in .git/config. Delete/rename it and try
ag
On Thu, Dec 31, 2015 at 01:47:21AM -0500, Eric Sunshine wrote:
> On Tue, Dec 29, 2015 at 2:27 AM, Jeff King wrote:
> > Because we must match both "Author" and "author" here, we
> > could not use skip_prefix, and had to hand-code a partial
> > case-insensitive match. Now that we have skip_prefix_c
On Thu, Dec 31, 2015 at 01:40:46AM -0500, Eric Sunshine wrote:
> > diff --git a/builtin/log.c b/builtin/log.c
> > @@ -677,10 +677,10 @@ static void add_header(const char *value)
> > - if (!strncasecmp(value, "to: ", 4))
> > - item = string_list_append(&extra_to, value + 4);
> >
On Fri, Jan 01, 2016 at 03:42:06AM -0500, Jeff King wrote:
> On Thu, Dec 31, 2015 at 01:21:42AM -0500, Eric Sunshine wrote:
>
> > > - item->string[len] = '\0';
> > > + len = strlen(item->string);
> > > + while (len && item->string[len - 1] == '\n')
> > > + item->st
On Thu, Dec 31, 2015 at 01:21:42AM -0500, Eric Sunshine wrote:
> > - item->string[len] = '\0';
> > + len = strlen(item->string);
> > + while (len && item->string[len - 1] == '\n')
> > + item->string[--len] = '\0';
>
> Not a strong objection, but this implementation
16 matches
Mail list logo
