--
Schönen Tag Dame / Herr,
Brauchen Sie finanzielle Hilfe (Darlehen)?
Ob es sich um Privat- oder Firmenkredite handelt, sprechen Sie mit uns
bei CITI BANK (TÜRKEI), wir werden Ihre finanziellen Probleme lösen.
Unser Zinssatz beträgt 1,3%. Bitte bewerben Sie sich jetzt und füllen
Sie
On 2018-08-27 05:58 PM, Jeff King wrote:
[...]
>> 2. Is there no way to get git to do the filename reporting as a normal
>> GIT_TRACE behavior? I don't know anything about its internal workings,
>> but it surely must knows which file it operates on when it opens it and
>> sends its data as stdin
On Mon, Aug 27, 2018 at 07:06:59PM +, Brennan Conroy wrote:
> Hello, I work on a project that uses git. "git clean -xdf" is a common
> command to run to clean up the environment, however sometimes this
> command deletes the entire contents of two of the folders and all the
> files it deletes
On Mon, Aug 27, 2018 at 05:22:13PM -0700, Stas Bekman wrote:
> Your suggestions do the trick, Jeff. Thank you.
>
> 1. To benefit others who might be looking for something similar may I
> post your suggestions as an answer to:
>
On 2018-08-27 04:53 PM, Jeff King wrote:
> On Mon, Aug 27, 2018 at 04:23:34PM -0700, Stas Bekman wrote:
[...]
>> How can I get GIT_TRACE's run_command to show the arguments passed to
>> the filter? I looked at various other debug environment variables in
>> git's manual, but I don't see anything
On Mon, Aug 27, 2018 at 07:32:08PM +0200, Andrei Rybak wrote:
> On 2018-08-27 17:52, Duy Nguyen wrote:
> > On Mon, Aug 27, 2018 at 5:37 PM Torsten Bögershausen wrote:
> >>> In those cases, when it falls back to
> >>> configuration for line ending management, I want it to be
> >>> automatically
On Mon, Aug 27, 2018 at 04:23:34PM -0700, Stas Bekman wrote:
> I'm debugging the workings of a configured git content filter
> (nbstripout) and I'm trying to get GIT_TRACE to show me the files it's
> operating on, but it doesn't. Consider:
>
> $ GIT_TRACE=1 git pull origin master
> [...] removed
On Mon, Aug 27, 2018 at 06:25:26PM +0200, Johannes Schindelin wrote:
> On Sat, 25 Aug 2018, Jeff King wrote:
>
> > On Wed, Aug 22, 2018 at 04:16:00PM -0700, Gregory Oschwald wrote:
> >
> > diff --git a/builtin/commit.c b/builtin/commit.c
> > index 3bfeabc463..3670024a25 100644
> > ---
Hello,
I'm debugging the workings of a configured git content filter
(nbstripout) and I'm trying to get GIT_TRACE to show me the files it's
operating on, but it doesn't. Consider:
$ GIT_TRACE=1 git pull origin master
[...] removed irrelevant sections of the output
16:49:28.846707
On Mon, Aug 27, 2018 at 10:22:46AM +, Kirill Smelkov wrote:
> A minor comment from outside observer: running tests under something
> like
>
> -e and -o pipefail
>
> would automatically catch the mistake in the first place. Maybe `-o
> pipefail` is bashism (I had not checked), but `git
On Sun, Aug 26, 2018 at 01:37:41PM +0200, René Scharfe wrote:
> Am 14.08.2018 um 03:58 schrieb Jeff King:
> > Your suggestion can be implemented using khash (my patch below).
> >
> >> Before:
> >> Benchmark #1: ./git-cat-file --batch-all-objects --buffer --unordered
> >>
On Sat, Aug 25, 2018 at 08:50:28PM +0200, René Scharfe wrote:
> buffer is unlikely to contain a NUL character, so printing its contents
> using %s in a die() format is unsafe (detected with ASan).
Having mostly forgotten about our earlier discussion, I got confused by
this, thinking the problem
Hi AEvar,
On Mon, 13 Aug 2018, Ævar Arnfjörð Bjarmason wrote:
> * Re the second half of "Not everyone can travel or can afford to do
>so" from Derrick, there's been travel sponsorships in past years.
Just to make sure that you understand: there are many more reasons than
just travel costs
Hi,
On Mon, 6 Aug 2018, Eric Sunshine wrote:
> On Mon, Aug 6, 2018 at 9:20 PM Hilco Wijbenga
> wrote:
> > But your suggestion did make me think about what behaviour I would
> > like to see, exactly. I like that Git removes commits that no longer
> > serve any purpose (because I've included
Ævar Arnfjörð Bjarmason writes:
> I.e. making plain --force-with-lease harder to use by hiding it behind a
> config option gives the user fewer options than with --force to recover.
I agree with that. But I would consider it a good thing, if done
properly (i.e. suggest --force-with-lease that
When cloning a superproject with the option
--recurse-submodules='.', it is easy to find yourself wanting
a submodule active, but not having that submodule present in
the modules directory.
Signed-off-by: Stefan Beller
---
t/t2013-checkout-submodule.sh | 24
1 file
This is the continuation of f2d48994dc1 (submodule.c: submodule_move_head
works with broken submodules, 2017-04-18), which tones down the case of
"broken submodule" in case of a missing git directory of the submodule to
be only a warning.
Signed-off-by: Stefan Beller
---
submodule.c
"Derrick Stolee via GitGitGadget" writes:
> This patch series performs a decently-sized refactoring of the revision-walk
> machinery. Well, "refactoring" is probably the wrong word, as I don't
> actually remove the old code. Instead, when we see certain options in the
> 'rev_info' struct, we
Hi,
On Sat, 25 Aug 2018, Constantin Weißer wrote:
> I think there are two aspects to using "force with lease".
There is a third, very, very important aspect.
When you use --force-with-lease (and I, for one, do, all the time), keep
in mind that it assumes that you are at least aware of the
On Mon, Aug 27 2018, Junio C Hamano wrote:
[Scott, I hope you're still with us despite your recent attempt to
unsubscribe from git@ :)]
> Ævar Arnfjörð Bjarmason writes:
>
>> This was after/during a long discussion starting with:
>>
From: Derrick Stolee
When consuming a priority queue, it can be convenient to inspect
the next object that will be dequeued without actually dequeueing
it. Our existing library did not have such a 'peek' operation, so
add it as prio_queue_peek().
Add a reference-level comparison in
From: Derrick Stolee
The 'test_three_modes' method assumes we are using the 'test-tool
reach' command for our test. However, we may want to use the data
shape of our commit graph and the three modes (no commit-graph,
full commit-graph, partial commit-graph) for other git commands.
Split
From: Derrick Stolee
When running 'git rev-list --topo-order' and its kin, the topo_order
setting in struct rev_info implies the limited setting. This means
that the following things happen during prepare_revision_walk():
* revs->limited implies we run limit_list() to walk the entire
From: Derrick Stolee
The rev-list command is critical to Git's functionality. Ensure it
works in the three commit-graph environments constructed in
t6600-test-reach.sh. Here are a few important types of rev-list
operations:
* Basic: git rev-list --topo-order HEAD
* Range: git rev-list
From: Derrick Stolee
There are a few things that need to move around a little before
making a big refactoring in the topo-order logic:
1. We need access to record_author_date() and
compare_commits_by_author_date() in revision.c. These are used
currently by sort_in_topological_order() in
This patch series performs a decently-sized refactoring of the revision-walk
machinery. Well, "refactoring" is probably the wrong word, as I don't
actually remove the old code. Instead, when we see certain options in the
'rev_info' struct, we redirect the commit-walk logic to a new set of methods
From: Derrick Stolee
When running a command like 'git rev-list --topo-order HEAD',
Git performed the following steps:
1. Run limit_list(), which parses all reachable commits,
adds them to a linked list, and distributes UNINTERESTING
flags. If all unprocessed commits are UNINTERESTING,
unsubscribe git
On Mon, Aug 27 2018, Ævar Arnfjörð Bjarmason wrote:
> From: René Scharfe
>
> Object IDs to skip are stored in a shared static oid_array. Lookups do
> a binary search on the sorted array. The code checks if the object IDs
> are already in the correct order while loading and skips sorting in
Ævar Arnfjörð Bjarmason writes:
> This was after/during a long discussion starting with:
> https://public-inbox.org/git/cacbzzx7mex-6rhgh2fa9+yl03mjxs8xmye86hnvxbxjmyiz...@mail.gmail.com/
>
> It appears the only patch that got in from that discussion was my
> f17d642d3b ("push: document & test
On Mon, Aug 27 2018, Ævar Arnfjörð Bjarmason wrote:
> On Mon, Aug 27 2018, René Scharfe wrote:
>
>> Am 27.08.2018 um 09:37 schrieb Ævar Arnfjörð Bjarmason:
>>>
>>> On Sat, Aug 25 2018, René Scharfe wrote:
>>> [...]
>>> Now, I like yours much better. I'm just saying that currently the
>>>
On Mon, Aug 27 2018, René Scharfe wrote:
> Am 27.08.2018 um 09:37 schrieb Ævar Arnfjörð Bjarmason:
>>
>> On Sat, Aug 25 2018, René Scharfe wrote:
>> [...]
>> Now, I like yours much better. I'm just saying that currently the
>> patch/commit message combo is confusing about *what* it's
>> doing.
Several fsck tests used the exact same git-hash-object output, but had
copy/pasted that part of the setup code. Let's instead do that setup
once and use it in subsequent tests.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t5504-fetch-receive-strict.sh | 8
1 file changed, 4
Ever since the skipList support was first added in cd94c6f91 ("fsck:
git receive-pack: support excluding objects from fsck'ing",
2015-06-22) the documentation for the format has that the file is a
sorted list of object names.
Thus, anyone using the feature would have thought the list needed to
be
The recent 65a836fa6b ("fsck: add stress tests for fsck.skipList",
2018-07-27) added various stress tests for odd invocations of
fsck.skipList, but didn't tests for some very simple ones, such as
asserting that providing to skipList with a bad commit causes fsck to
exit with a non-zero exit code.
From: René Scharfe
buffer is unlikely to contain a NUL character, so printing its contents
using %s in a die() format is unsafe (detected with ASan).
Use an idiomatic strbuf_getline() loop instead, which ensures the buffer
is always NUL-terminated, supports CRLF files as well, accepts files
It's annoying not to be able to put comments and empty lines in the
skipList, when e.g. keeping a big central list of commits to skip in
/etc/gitconfig, which was my motivation for 1362df0d41 ("fetch:
implement fetch.fsck.*", 2018-07-27).
Implement that, and document what version of Git this was
From: René Scharfe
Object IDs to skip are stored in a shared static oid_array. Lookups do
a binary search on the sorted array. The code checks if the object IDs
are already in the correct order while loading and skips sorting in that
case. Lookups are done before reporting a (non-fatal)
There is currently no comment syntax for the fsck.skipList, this isn't
really by design, and it would be nice to have support for comments.
Document that this doesn't work, and test for how this errors
out. These tests reveal a current bug, if there's invalid input the
output will emit some of
On Mon, Aug 27 2018, Junio C Hamano wrote:
> Scott Johnson writes:
>
>> Hello Everyone:
>>
>> I'm considering writing a patch that adds a configuration variable
>> that will allow the user to default the command:
>>
>> git push --force
>>
>> to:
>>
>> git push --force-with-lease
>
> I actually
On Mon, Aug 27, 2018 at 05:55:43AM -0400, Eric Sunshine wrote:
> On Fri, Aug 24, 2018 at 7:25 PM Jeff King wrote:
> > On Fri, Aug 24, 2018 at 06:55:24PM -0400, Eric Sunshine wrote:
> > > On Fri, Aug 24, 2018 at 10:47 AM Duy Nguyen wrote:
> > > > > I was thinking that "worktree add" could start
Ævar Arnfjörð Bjarmason writes:
> Improve the portability of chainlint by using shorter here-docs. On
> AIX sed will complain about:
>
> sed: 0602-417 The label :hereslurp is greater than eight
> characters
Remind me again not to forget doing s/here-doc/label/ on this patch
before
Thomas Gummerer writes:
> Fair enough. I thought of the technical documentation as something
> that doesn't promise users anything, but rather describes how the
> internals work right now, which is what this bit of documentation
> attempted to write down.
That's fine. I'd rather keep it but
Nguyễn Thái Ngọc Duy writes:
> Running "test-tool read-cache 100" on webkit.git (275k files), reading
> v2 only takes 4.226 seconds, while v4 takes 5.711 seconds, 35% more
> time. The patch reduces read time on v4 to 4.319 seconds.
Nice.
> PS. I notice that v4 does not pad to align entries at
Jeff King writes:
> Actually, what I showed earlier does seem to have some weirdness with
> else-if. But I finally stumbled on something even better:
>
> - oidcmp(a, b) != 0
> + !oideq(a, b)
>
> Because of the isomorphisms that coccinelle knows about, that catches
> everything we want.
Nice
Scott Johnson writes:
> Hello Everyone:
>
> I'm considering writing a patch that adds a configuration variable
> that will allow the user to default the command:
>
> git push --force
>
> to:
>
> git push --force-with-lease
I actually consider "--force-with-lease" that does not say "this is
what
> -int init_patch_ids(struct patch_ids *ids)
> +int init_patch_ids(struct patch_ids *ids, struct repository *repo)
> {
> memset(ids, 0, sizeof(*ids));
> - diff_setup(>diffopts, the_repository);
> + diff_setup(>diffopts, repo);
Just realized when looking at this diff, though
Hello, I work on a project that uses git. "git clean -xdf" is a common command
to run to clean up the environment, however sometimes this command deletes the
entire contents of two of the folders and all the files it deletes are being
tracked which according to the documentation should not be
On Sun, Aug 26, 2018 at 3:03 AM Nguyễn Thái Ngọc Duy wrote:
>
> This function calls do_diff_cache() which eventually needs to set this
> "istate" to unpack_options->src_index (*). This is an unfornate fact
unfortunate
> diff --git a/diff.c b/diff.c
Unlike I thought in the cover letter, this is
On 2018-08-27 19:32, Andrei Rybak wrote:
>
> How about just using unconditional includes?
>
> global.gitconfig (synced across machines):
>
> [include]
> path = platform-specific.gitconfig
>
> And two version of file named "platform-specific.gitconfig", which
> are not synced, and
Jonathan Nieder writes:
> Junio C Hamano wrote:
>> Jonathan Nieder writes:
>>> Kyle Meyer wrote:
>
Subject: [PATCH v3] range-diff: update stale summary of --no-dual-color
> [...]
>>> Reviewed-by: Jonathan Nieder
>>
>> Sorry, too late. I'll revert the merge of the previous round out of
>>
Johannes Schindelin writes:
>> Please include this information in the commit message. It's super
>> helpful to find this kind of information about why a patch does what
>> it does when encountering a patch later "in the wild" (in git log -S
>> output).
>
> I thought I did include the relevant
On Sun, Aug 26, 2018 at 6:54 PM Gabriel Holodak wrote:
>
> I think I'm running into a bug with git diff on v2.18.0.
I cannot reproduce with the two files attached.
I suspected you might have a different diff algorithm configured,
so I tested
git diff --no-index old new
git diff
Thomas Gummerer writes:
> Agreed. I think it may be solvable if we'd actually get the
> information about what belongs to which side from the merge algorithm
> directly.
The merge machinery may (eh, rather, "does") know, but we do not
have a way to express that in the working tree file that
On Sun, Aug 26, 2018 at 3:03 AM Nguyễn Thái Ngọc Duy wrote:
>
> This continues the journey of getting rid of the_index at least in
> library code. The focus of part 4 is diff code. Since 'struct
> repository *' is passed around more (and even more in part 5), I take
> this opportunity to remove
On 2018-08-27 17:52, Duy Nguyen wrote:
> On Mon, Aug 27, 2018 at 5:37 PM Torsten Bögershausen wrote:
>>> In those cases, when it falls back to
>>> configuration for line ending management, I want it to be
>>> automatically configured based on the host platform.
>>
>
> An alternative is
You're very welcome, Johannes. And I'm hoping to have a few
more goodies live this fall/winter for public-inbox :>
On Mon, Aug 27, 2018 at 10:53 AM Duy Nguyen wrote:
>
> On Mon, Aug 27, 2018 at 5:37 PM Torsten Bögershausen wrote:
> > > In those cases, when it falls back to
> > > configuration for line ending management, I want it to be
> > > automatically configured based on the host platform.
> >
> > There
Greetings,
We are rebuilding Iraq after years of conflicts and we are inviting you to
take up contracts. We are determined to purchase your products in large
quantities, for use in all over our 18 governorates(provinces) as the task
of re-building Iraq covers every single sectormand facet of
Hi Peff,
On Sat, 25 Aug 2018, Jeff King wrote:
> On Wed, Aug 22, 2018 at 04:16:00PM -0700, Gregory Oschwald wrote:
>
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 3bfeabc463..3670024a25 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1440,6 +1440,7 @@ int
Hi Duy,
On Wed, 15 Aug 2018, Duy Nguyen wrote:
> On Tue, Aug 14, 2018 at 7:43 PM Derrick Stolee wrote:
> > 2. Number of other commit tag-lines (Reviewed-By, Helped-By,
> > Reported-By, etc.).
> >
> > Using git repo:
> >
> > $ git log --since=2018-01-01 junio/next|grep by:|grep -v
> >
Hi Junio,
On Tue, 14 Aug 2018, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Tue, Aug 14, 2018 at 01:43:38PM -0400, Derrick Stolee wrote:
> >
> >> On 8/13/2018 5:54 PM, Jeff King wrote:
> >> > So I try not to think too hard on metrics, and just use them to get a
> >> > rough view on who
On Mon, Aug 27, 2018 at 5:37 PM Torsten Bögershausen wrote:
> > In those cases, when it falls back to
> > configuration for line ending management, I want it to be
> > automatically configured based on the host platform.
>
> There is
> git config core.eol native
An alternative is supporting
On Mon, Aug 27, 2018 at 09:10:33AM -0500, Robert Dailey wrote:
> Is there an 'auto' setting for the 'core.autocrlf' config? Reason I
> ask is, I want that setting to be 'input' on linux but 'true' on
> Windows. I have a global .gitconfig that I sync across different
> platforms with Google Drive,
Am 27.08.2018 um 09:37 schrieb Ævar Arnfjörð Bjarmason:
>
> On Sat, Aug 25 2018, René Scharfe wrote:
>
>> diff --git a/Documentation/config.txt b/Documentation/config.txt
>> index 2fa65b7516..80ab570579 100644
>> --- a/Documentation/config.txt
>> +++ b/Documentation/config.txt
>> @@ -1715,7
Thanks, it really helped to understand.
Since what I want to do is to run git pull/push from within a script in a
Jenkins job and Jenkins already has the git user stored, I thougth is
odd to store them at a git credential helper.
My solution is running (before git pull/push):
git config
Hi Eric,
I would like to take five minutes to thank you for public-inbox. It is
invaluable for me in the meantime. And I think I will never be able to
thank you enough for it.
Just a couple of things where it is super useful to me:
- Recently, my mail provider started dropping mails left and
Is there an 'auto' setting for the 'core.autocrlf' config? Reason I
ask is, I want that setting to be 'input' on linux but 'true' on
Windows. I have a global .gitconfig that I sync across different
platforms with Google Drive, and I hate to manage 2 copies of it on
each platform (linux and
Hi Peff,
On Mon, 13 Aug 2018, Jeff King wrote:
> For the past several years, we've held a Git Contributor Summit as part
> of the Git Merge conference. I'd like to get opinions from the community
> to help plan future installments. Any feedback or opinion is welcome,
> but some obvious things to
On 8/27/2018 9:22 AM, Johannes Schindelin wrote:
Point in favor of the pure-online meeting: the informal standup on IRC
every second Friday. I really try to attend it (it is a bit awkward
because it is on a Friday evening in my timezone, right at the time when I
want to unwind from the work
Hi Peff & everybody,
On Mon, 13 Aug 2018, Jeff King wrote:
> On Mon, Aug 13, 2018 at 12:58:54PM -0400, Derrick Stolee wrote:
>
> > I would be up for two meetings a year. I would expect that the variety of
> > locations would allow a larger set of contributors to make at least one
> > meeting a
Hi,
On Thu, 16 Aug 2018, Junio C Hamano wrote:
> Phillip Wood writes:
>
> > This commit implements a minimal fix which fixes the crash and allows
> > the user to successfully commit a conflict resolution with 'git rebase
> > --continue'. It does not write .git/rebase-merge/patch,
> >
On 8/26/2018 4:56 PM, brian m. carlson wrote:
On Sat, Aug 25, 2018 at 04:00:31AM -0400, Jeff King wrote:
This is a follow-up to the discussion in:
https://public-inbox.org/git/20180822030344.ga14...@sigill.intra.peff.net/
The general idea is that the majority of callers don't care about
On 8/27/2018 8:31 AM, Derrick Stolee wrote:
On 8/25/2018 4:36 AM, Jeff King wrote:
On Sat, Aug 25, 2018 at 04:07:15AM -0400, Jeff King wrote:
diff --git a/contrib/coccinelle/object_id.cocci
b/contrib/coccinelle/object_id.cocci
index 5869979be7..548c02336d 100644
---
On 8/25/2018 4:36 AM, Jeff King wrote:
On Sat, Aug 25, 2018 at 04:07:15AM -0400, Jeff King wrote:
diff --git a/contrib/coccinelle/object_id.cocci
b/contrib/coccinelle/object_id.cocci
index 5869979be7..548c02336d 100644
--- a/contrib/coccinelle/object_id.cocci
+++
Hi Junio,
On Wed, 8 Aug 2018, Junio C Hamano wrote:
> Stefan Beller writes:
>
> > On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote:
> >>
> >> This commit introduces a rebase option `--quiet`. While `--quiet` is
> >> commonly perceived as opposite to `--verbose`, this is not the case for
> >>
Hi Junio,
On Wed, 8 Aug 2018, Junio C Hamano wrote:
> Pratik Karki writes:
>
> > This commit converts the equivalent part of the shell script
> > `git-legacy-rebase.sh` to run the pre-rebase hook (unless disabled), and
> > to interrupt the rebase with error if the hook fails.
> >
> >
On Tue, Aug 14, 2018 at 01:47:21PM +0200, SZEDER Gábor wrote:
> The test 'pack-objects to file can use bitmap' added in 645c432d61
> (pack-objects: use reachability bitmap index when generating
> non-stdout pack, 2016-09-10) is silently buggy and doesn't check what
> it's supposed to.
>
> In
On Fri, Aug 24, 2018 at 7:25 PM Jeff King wrote:
> On Fri, Aug 24, 2018 at 06:55:24PM -0400, Eric Sunshine wrote:
> > On Fri, Aug 24, 2018 at 10:47 AM Duy Nguyen wrote:
> > > > I was thinking that "worktree add" could start respecting the --force
> > > > option as an escape hatch.
> > >
> > >
i have been trying to contact you
On Sat, Aug 25 2018, René Scharfe wrote:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 2fa65b7516..80ab570579 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1715,7 +1715,7 @@ doing the same for `receive.fsck.` and
> `fetch.fsck.`
>
81 matches
Mail list logo
