On Sat, Nov 24, 2018 at 04:47:19PM +0900, Junio C Hamano wrote:
> Junio C Hamano writes:
> a better workaround might be to write into unique output filenames
> (act1.out, act2.out, etc.); that way, you do not have to worry about
> the output file for the next request getting clobbered by a stale
Some expected failures of git-http-backend leaves running its children
(receive-pack or upload-pack) which still hold opened descriptors
to act.err and with some probability they live long enough to write
there their failure messages after next test has already truncated
the files. This causes
Junio C Hamano writes:
> Max Kirillov writes:
>
>> diff --git a/t/t5562-http-backend-content-length.sh
>> b/t/t5562-http-backend-content-length.sh
>> index 90d890d02f..bb53f82c0c 100755
>> --- a/t/t5562-http-backend-content-length.sh
>> +++ b/t/t5562-http-backend-content-length.sh
>> @@ -25,6
Max Kirillov writes:
> diff --git a/t/t5562-http-backend-content-length.sh
> b/t/t5562-http-backend-content-length.sh
> index 90d890d02f..bb53f82c0c 100755
> --- a/t/t5562-http-backend-content-length.sh
> +++ b/t/t5562-http-backend-content-length.sh
> @@ -25,6 +25,8 @@ test_http_env() {
>
Some expected failures of git-http-backend leave running its children
(receive-pack or upload-pack) which still hold opened descriptors
to act.err and with some probability they live long enough to write
their failure messages after next test has already truncated
the files. This causes occasional
David Mandelberg writes:
> It seems that git is overwriting my local files on merge if they're in
> .gitignore. See command transcript below. I searched `git help config`
> and Google, but I couldn't find any way to prevent it. Am I missing
> something? (The reason I care about ignored files is
Junio C Hamano writes:
> Ævar Arnfjörð Bjarmason writes:
>
>> if (rev->rdiff1) {
>> +struct diff_options opts;
>> +memcpy(, >diffopt, sizeof(opts));
>> +opts.output_format &= ~(DIFF_FORMAT_DIFFSTAT |
>> DIFF_FORMAT_SUMMARY);
>> +
>>
Ævar Arnfjörð Bjarmason writes:
> Change the narrow test added in 31e2617a5f ("format-patch: add
> --range-diff option to embed diff in cover letter", 2018-07-22) to
> test the full output. This test would have spotted a regression in the
> output if it wasn't beating around the bush and tested
Hi,
It seems that git is overwriting my local files on merge if they're in
.gitignore. See command transcript below. I searched `git help config`
and Google, but I couldn't find any way to prevent it. Am I missing
something? (The reason I care about ignored files is that I'm using git
with a
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> The `%lld` format is supported on Linux and macOS, but not on Windows.
> This issue has been reported ten days ago (Message-ID:
> nycvar.qro.7.76.6.1811121300520...@tvgsbejvaqbjf.bet), but the
> corresponding topic
Thanks for a patch.
Greg Hurrell writes:
> Commit 7cb6ac1e4b made the diff format omit ellipses by default, but
> there is still this place in the documentation where we show examples of
> output with ellipses.
We prefer to cite an existing commit with its title and date these
days, not just
Jeff King writes:
>> +if ((o->pickaxe_opts & DIFF_PICKAXE_KIND_G) &&
>> +((!textconv_one && diff_filespec_is_binary(o->repo, p->one)) ||
>> + (!textconv_two && diff_filespec_is_binary(o->repo, p->two
>> +return 0;
>
> If the user passes "-a" to treat binary
Ævar Arnfjörð Bjarmason writes:
> On Wed, Nov 21 2018, Thomas Braun wrote:
>
>> The -S option of log looks for differences that changes the
>> number of occurrences of the specified string (i.e. addition/deletion)
>> in a file.
>>
> ...
> This should just be part of 1/2 since the behavior is
Ævar Arnfjörð Bjarmason writes:
> if (rev->rdiff1) {
> + struct diff_options opts;
> + memcpy(, >diffopt, sizeof(opts));
> + opts.output_format &= ~(DIFF_FORMAT_DIFFSTAT |
> DIFF_FORMAT_SUMMARY);
> +
> fprintf_ln(rev->diffopt.file, "%s",
Jeff King writes:
> Yeah, my intent had been to circle back around to this, but I just
> hadn't gotten to it. I'm still pondering a config option or similar,
> though I remain unconvinced that the cases in which you've showed it
> being slow are actually realistic or worth worrying about (and
Denton Liu writes:
> I just realised that there is a slight problem with the proposed change.
> When we do a merge and there are no merge conflicts, at the end of the
> merge, we get dropped into an editor with this text:
>
> Merge branch 'master' into new
>
> # Please enter a commit
Johannes Schindelin writes:
> To fix this, I prepared a GitGitGadget PR
> (https://github.com/gitgitgadget/git/pull/87) and will submit it as soon
> as I am satisfied that the build works.
Thanks. This won't be in the upcoming release anyway, so we can fix
it up without "oops, let's pile
Am 23.11.18 um 19:19 schrieb Frank Schäfer:
The CR marker ^M doesn't show up in '-' lines of diffs when the ending
of the removed line is CR+LF.
It shows up as expected in '-' lines when the ending of the removed line
is CR only.
It also always shows up as expected in '+' lines.
Is your
The CR marker ^M doesn't show up in '-' lines of diffs when the ending
of the removed line is CR+LF.
It shows up as expected in '-' lines when the ending of the removed line
is CR only.
It also always shows up as expected in '+' lines.
These are the diffs of the 6 possible line ending changes:
Tested-by: Carlo Marcelo Arenas Belón
IMHO leaving the shebang might be better if only for consistency but
could go eitherway
Carlo
On Thu, Nov 22, 2018 at 3:43 PM Max Kirillov wrote:
> also edited the test to include only push_plain case,
> and repeat it several times, to avoid running irrelevant
> cases, the failure never happened again.
as I explained previously[1] and as odd as it might seem the
push_plain case ONLY
On Fri, 23 Nov 2018 at 11:13, Johannes Schindelin
wrote:
> On Mon, 30 Oct 2017, Pranit Bauva wrote:
>
> > On Fri, Oct 27, 2017 at 10:58 PM, Martin Ågren
> > wrote:
> > > On 27 October 2017 at 17:06, Pranit Bauva wrote:
> > >> +static void free_terms(struct bisect_terms *terms)
> > >> +{
> > >>
Hi Carlo,
On Thu, 22 Nov 2018, Carlo Marcelo Arenas Belón wrote:
> Subject: [PATCH] entry: remove windows fallback to inode checking
>
> this test is really FS specific, so is better to avoid any compiled
> assumptions about the platform and let the user drive the fallback
> through
Hi Peff,
On Thu, 22 Nov 2018, Jeff King wrote:
> On Thu, Nov 22, 2018 at 01:48:53PM +0100, Johannes Schindelin wrote:
>
> > So YMMV with git-s. My rule of thumb is: if I want to use this
> > myself only, I'll make it an alias. If I want to ship it (e.g. with Git
> > for Windows), I'll make it a
From: Phillip Wood
When using --color-moved-ws=allow-indentation-change allow lines with
the same indentation change to be grouped across blank lines. For now
this only works if the blank lines have been moved as well, not for
blocks that have just had their indentation changed.
This completes
From: Phillip Wood
Add documentation for --no-color-moved.
Signed-off-by: Phillip Wood
---
Documentation/diff-options.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 0378cd574e..151690f814 100644
---
From: Phillip Wood
Most of the messages and documentation use 'whitespace' rather than
'white space' or 'white spaces' convert to latter two to the former for
consistency.
Signed-off-by: Phillip Wood
---
Documentation/diff-options.txt | 4 ++--
Documentation/git-cat-file.txt | 8
From: Phillip Wood
Allow --no-color-moved-ws and --color-moved-ws=no to cancel any previous
--color-moved-ws option.
Signed-off-by: Phillip Wood
---
Documentation/diff-options.txt | 7 +++
diff.c | 6 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff
From: Phillip Wood
'diff --color-moved-ws=allow-indentation-change' can highlight lines
that have internal whitespace changes rather than indentation
changes. For example in commit 1a07e59c3e ("Update messages in
preparation for i18n", 2018-07-21) the lines
- die (_("must end with
From: Phillip Wood
When running
git diff --color-moved-ws=allow-indentation-change v2.18.0 v2.19.0
cmp_in_block_with_wsd() is called 694908327 times. Of those 42.7%
return after comparing a and b. By comparing the lengths first we can
return early in all but 0.03% of those cases without
From: Phillip Wood
Currently when using --color-moved=zebra the color of moved blocks
depends on the number of lines separating them. This means that adding
an odd number of unmoved lines between blocks that are already separated
by one or more unmoved lines will change the color of subsequent
From: Phillip Wood
Thanks to Stefan for his feedback on v1. I've updated patches 2 & 8 in
response to those comments - see the range-diff below for details (the
patch numbers are off by one in the range diff, I think because the
first patch is unchanged and so it was used as the merge base by
From: Phillip Wood
'diff --color-moved-ws=allow-indentation-change' can color lines as
moved when they are in fact different. For example in commit
1a07e59c3e ("Update messages in preparation for i18n", 2018-07-21) the
lines
- die (_("must end with a color"));
+
From: Phillip Wood
Currently diff --color-moved-ws=allow-indentation-change does not
support indentation that contains a mix of tabs and spaces. For
example in commit 546f70f377 ("convert.h: drop 'extern' from function
declaration", 2018-06-30) the function parameters in the following
lines are
Hi,
I'm managing many bare repositories for development teams.
One service we want to offer is to let developers retrieve old state
of the repository up to 30 days. For example, one developer
(accidently) removed (push -f) a branch/tag and realize few days later
(after vacations) that it was an
Hi Pranit,
(Cc:ing Tanushree because they will try to pick up this patch series as
part of the Outreachy program.)
On Mon, 30 Oct 2017, Pranit Bauva wrote:
> On Fri, Oct 27, 2017 at 10:58 PM, Martin Ågren wrote:
> > On 27 October 2017 at 17:06, Pranit Bauva wrote:
> >> +static void
Hi Paul,
On Thu, 22 Nov 2018, Paul Gureghian wrote:
> I installed 2.19.2 on windows 7 , 32 bit and it wont launch.
This has been reported on Gitter and fixed in
https://github.com/git-for-windows/MINGW-packages/commit/deb0395d031401ffe55024fb066267e2ea8d032b
For the time being, please either
Outlook
Prezado usuário da conta,
Alguns de seus e-mails recebidos foram colocados em status pendente devido à
recente atualização em nosso banco de dados. Para receber suas mensagens,
Clique no link abaixo para entrar e aguardar a resposta do Webmail.
CLIQUE
Jeff King wrote:
> On Thu, Nov 22, 2018 at 11:58:36AM +0100, Greg Hurrell wrote:
>
> > diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
> > index 706916c94c..33776459d0 100644
> > --- a/Documentation/diff-format.txt
> > +++ b/Documentation/diff-format.txt
> > @@ -26,12
Commit 7cb6ac1e4b made the diff format omit ellipses by default, but
there is still this place in the documentation where we show examples of
output with ellipses.
The GIT_PRINT_SHA1_ELLIPSIS environment variable can be used, for now,
to bring back the old output format, but that is already
Outlook
Prezado usuário da conta,
Alguns de seus e-mails recebidos foram colocados em status pendente devido à
recente atualização em nosso banco de dados. Para receber suas mensagens,
Clique no link abaixo para entrar e aguardar a resposta do Webmail.
CLIQUE
41 matches
Mail list logo
