> Patches are welcome.
I'd be happy to patch git-contacts to link to the message you just
sent, then maybe someone more qualified would know where to start... :)
Frederick
On Fri, Sep 21, 2018 at 01:18:30AM -0400, Eric Sunshine wrote:
> On Wed, Sep 19, 2018 at 6:49 PM Junio C Hamano wrote:
> >
On Thu, Sep 20, 2018 at 1:47 PM wrote:
> On Thu, Sep 20, 2018 at 06:23:03PM +0200, Duy Nguyen wrote:
> > On Wed, Sep 19, 2018 at 03:59:58PM -0700, Junio C Hamano wrote:
> > > > @@ -23,7 +26,7 @@ OPTIONS
> > > >
> > > > --mode=::
> > > > Specify layout mode. See configuration variable column.ui
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The tip of 'next' hasn't been rewo
On Wed, Sep 19, 2018 at 6:49 PM Junio C Hamano wrote:
> Frederick Eaton writes:
> > By the way for some reason git-contacts shows more names when I run it
> > on the patch hash than when I give it the patch name:
> >
> > $ ./contrib/contacts/git-contacts 222580cb60ee64f7b81fed64ec8fbfc81952557f
>
Junio C Hamano writes:
> Well, reading builtin/merge-base.c::handle_fork_point(), I think the
> intended behaviour is:
>
> - die() when input is not well formed (e.g. bad commit object,
>ambigous ref name, etc.); there is an error worth reporting in
>this case.
>
> - show one that used
Eric Sunshine writes:
> On Wed, Sep 19, 2018 at 6:25 PM Alexander Mills
> wrote:
>> The following command sequence exits with 1, and no stderr
>>
>> base='remotes/origin/dev';
>> fork_point="$(git merge-base --fork-point "$base")";
>>
>> I cannot figure out why it's exiting with 1, but there is
On Thu, Sep 20, 2018 at 10:26:47PM -0400, Eric Sunshine wrote:
> On Wed, Sep 19, 2018 at 8:00 PM brian m. carlson
> wrote:
> > (I am having trouble getting make style to work, though, because it
> > seems to invoke clang-format as a git subcommand, and I don't think that
> > works. I may send a
On Wed, Sep 19, 2018 at 6:25 PM Alexander Mills
wrote:
> The following command sequence exits with 1, and no stderr
>
> base='remotes/origin/dev';
> fork_point="$(git merge-base --fork-point "$base")";
>
> I cannot figure out why it's exiting with 1, but there is no stdout/stderr
Unable to reprod
On Wed, Sep 19, 2018 at 8:00 PM brian m. carlson
wrote:
> (I am having trouble getting make style to work, though, because it
> seems to invoke clang-format as a git subcommand, and I don't think that
> works. I may send a patch.)
You're probably missing this piece:
https://llvm.org/svn/llvm-pro
On Wed, Sep 19, 2018 at 10:10 AM Ævar Arnfjörð Bjarmason
wrote:
> Before this change the "git reflog expire" command didn't report any
> progress. This is the second command (after "pack-refs --all --prune")
> that the "gc" command will run.
> [...]
> That may just be some artifact of the reposito
On Thu, Sep 20, 2018 at 9:43 PM Matthew DeVore wrote:
> Add two guidelines:
Probably s/two/three/ or s/two/several/ since the patch now adds three
guidelines.
> - pipe characters should appear at the end of lines, and not cause
>indentation
The "not cause indentation" bit is outdated since
Instead of using a line-continuation and pipe on the second line, take
advantage of the shell's implicit line continuation after a pipe
character. So for example, instead of
some long line \
| next line
use
some long line |
next line
And add a blank line
Some pipes in tests lose the exit code of git processes, which can mask
unexpected behavior like crashes. Split these pipes up so that git
commands are only at the end of pipes rather than the beginning or
middle.
The violations fixed in this patch were found in the process of fixing
pipe placemen
'git ... | foo' will mask any errors or crashes in git, so split up such
pipes in this file.
One testcase uses several separate pipe sequences in a row which are
awkward to split up. Wrap the split-up pipe in a function so the
awkwardness is not repeated. Also change that testcase's surrounding
qu
Two of the commits have changed drastically (see second and third points below)
so I'm sending this again.
Summary of changes since last time:
- Remove the hacky linter check which makes sure pipes are placed at the end of
the line in tests - I may add this back in a more polished form when I
Fix various places where the ordering was obviously wrong, meaning it
was easy to find with grep.
Signed-off-by: Matthew DeVore
---
t/t-basic.sh | 2 +-
t/t0021-conversion.sh | 4 +--
t/t1300-config.sh | 4 +--
t/t1303-wacky-conf
Add two guidelines:
- pipe characters should appear at the end of lines, and not cause
indentation
- pipes should be avoided when they swallow exit codes that can
potentially fail
---
Documentation/CodingGuidelines | 27 +++
1 file changed, 27 insertions(+)
diff -
Jonathan Tan writes:
> The hard part for me lies in how to communicate to future readers of the
> code that they cannot remove this section to simplify the code. We would
> need a more complicated comment, something like this:
That suggests two things.
- Perhaps quickfetch() is misnamed. It i
> Jonathan Tan writes:
>
> > + if (repository_format_partial_clone) {
> > + /*
> > +* For the purposes of the connectivity check,
> > +* check_connected() considers all objects promised by
> > +* promisor objects as existing, which means that the
>
Junio C Hamano writes:
> Nguyễn Thái Ngọc Duy writes:
>
>> Commit b0db704652 (pathspec: allow querying for attributes -
>> 2017-03-13) adds new pathspec magic 'attr' but only with
>> match_pathspec(). "git add" has some pathspec related code that still
>> does not know about 'attr' and will bai
Junio C Hamano writes:
> I also noticed that 2/6 made "commti_contains --tag" enclosed in dq
> pair for one test, but the next test after it has the identical one.
>
> Here is what I queued in the meantime.
> ...
And of course, I find out that 3/6 needs a matching update after
I've almost finish
Jonathan Tan writes:
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 61bec5d21..e9640fe5a 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -938,6 +938,25 @@ static int quickfetch(struct ref *ref_map)
>*/
> if (deepen)
> return -1;
> +
> + if (re
On Thu, Sep 20, 2018 at 03:47:34PM -0400, Jeff King wrote:
> On Thu, Sep 20, 2018 at 02:04:13PM -0400, Taylor Blau wrote:
>
> > The recently-introduced "core.alternateRefsCommand" allows callers to
> > specify with high flexibility the tips that they wish to advertise from
> > alternates. This flex
On Thu, Sep 20, 2018 at 04:00:34PM -0400, Taylor Blau wrote:
> > My "rev-list --alternate-refs" patches _do_ use the refnames, since you
> > could do something like "--source" that cares about them. But there's
> > some awkwardness there, because the names are in a different namespace
> > than the
On Thu, Sep 20, 2018 at 03:37:51PM -0400, Jeff King wrote:
> On Thu, Sep 20, 2018 at 02:04:11PM -0400, Taylor Blau wrote:
>
> > diff --git a/Documentation/config.txt b/Documentation/config.txt
> > index 112041f407..b908bc5825 100644
> > --- a/Documentation/config.txt
> > +++ b/Documentation/config.
On Thu, Sep 20, 2018 at 02:04:13PM -0400, Taylor Blau wrote:
> The recently-introduced "core.alternateRefsCommand" allows callers to
> specify with high flexibility the tips that they wish to advertise from
> alternates. This flexibility comes at the cost of some inconvenience
> when the caller on
On Thu, Sep 20, 2018 at 02:04:11PM -0400, Taylor Blau wrote:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 112041f407..b908bc5825 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -616,6 +616,12 @@ core.preferSymlinkRefs::
> This is so
On Thu, Sep 20, 2018 at 11:35:23AM -0700, Stefan Beller wrote:
> > This optimization is a good one and works well, particularly when the
> > upstream repository has a relatively normal number of references. When
> > the upstream has a pathologically _large_ number of references, the
> > advertisem
On Thu, Sep 20, 2018 at 02:04:05PM -0400, Taylor Blau wrote:
> This is a series to customize Git's behavior when listing references
> from an alternate repository. It is motivated by the following example:
>
> Consider an upstream repository, a fork of it, and a local copy of that
> fork. Ideally
Martin Ågren writes:
> In the "Reporting Bugs" section of git(1), we refer to the mailing list,
> but we do not give any hint about where the archives might be found.
And why is it a good idea to give that information in Reporting Bugs
section? Are we asking the bug reporters to look for simila
Hi Stefan,
On Thu, Sep 20, 2018 at 11:35:23AM -0700, Stefan Beller wrote:
> > To make the reference advertisement manageable even with a large number
> > of references, let's allow the fork to select which ones it thinks might
> > be "interesting", and only advertise those. This makes the advertis
Ramsay Jones writes:
> Yes, this was one of my first concerns (I even asked Elijah what
> compiler options he used), but I was getting useful results without
> passing CFLAGS, so I just ignored that issue ... :-D
> ...
> Indeed. This bothered me as well. The 'compat' directory does not
> follow t
When fetching an object that is known as a promisor object to the local
repository, the connectivity check in quickfetch() in builtin/fetch.c
succeeds, causing object transfer to be bypassed. However, this should
not happen if that object is merely promised and not actually present.
Because this h
Ben Peart writes:
> This round has one code change based on feedback. Other changes are just
> rewording commit messages.
Thanks. I think the only remaining issue is what to do with the
interaction between extra/additional error message that comes from
the updates in 3/5 and the test framework
On Thu, Sep 20, 2018 at 11:04 AM Taylor Blau wrote:
>
> Hi,
>
> This is a series to customize Git's behavior when listing references
> from an alternate repository. It is motivated by the following example:
>
> Consider an upstream repository, a fork of it, and a local copy of that
> fork. Ideally
ATENÇÃO;
Sua caixa de correio excedeu o limite de armazenamento, que é de 5 GB como
definido pelo administrador, que está atualmente em execução no 10.9GB, você
pode não ser capaz de enviar ou receber novas mensagens até que você re-validar
a sua caixa de correio. Para revalidar sua caixa de co
The recently-introduced "core.alternateRefsCommand" allows callers to
specify with high flexibility the tips that they wish to advertise from
alternates. This flexibility comes at the cost of some inconvenience
when the caller only wishes to limit the advertisement to one or more
prefixes.
For exa
Hi,
This is a series to customize Git's behavior when listing references
from an alternate repository. It is motivated by the following example:
Consider an upstream repository, a fork of it, and a local copy of that
fork. Ideally, running "git pull upstream" from the local copy followed
by a "gi
When in a repository containing one or more alternates, Git would
sometimes like to list references from its alternates. For example, 'git
receive-pack' list the objects pointed to by alternate references as
special ".have" references.
Listing ".have" references is designed to make pushing changes
To list alternate references, 'read_alternate_refs' creates a child
process running 'git for-each-ref' in the alternate's Git directory.
Prepare to run other commands besides 'git for-each-ref' by introducing
and moving the relevant code from 'read_alternate_refs' to
'fill_alternate_refs_command'.
On Thu, Sep 20, 2018 at 06:23:03PM +0200, Duy Nguyen wrote:
> On Wed, Sep 19, 2018 at 03:59:58PM -0700, Junio C Hamano wrote:
> > > @@ -23,7 +26,7 @@ OPTIONS
> > >
> > > --mode=::
> > > Specify layout mode. See configuration variable column.ui for option
> > > - syntax.
> > > + syntax (in git-
Greetings,
Can we discuss business here in the internet ? Contact me for more details.
Ahmed Zama
If a .gitignore contains a ! entry, git check-ignore will still say
the matching file is ignored if the file is not in the index.
Simple case to reproduce:
$ git init .
$ echo "*.c" > .gitignore
$ echo '!a.c' >> .gitignore
$ touch a.c b.c
$ git check-ignore a.c b.c
a.c
b.c
$ git add *.c
The follo
Eric Sunshine writes:
> On Tue, Sep 18, 2018 at 1:48 AM Ævar Arnfjörð Bjarmason
> wrote:
>> "Work the same" is incorrect and needs to be "Works the same
>> way". Fixes grammar in document anion I added in the recently landed
>
> I, too, find those "document anions" problematic. Perhaps the
> phy
When --multiple is given, the remaining arguments are remote names,
not one remote followed by zero or more refspec. Detect this case,
disable refspec completion, and pretend no remote is seen in order to
complete multiple of them.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
contrib/completion/git-c
On Wed, Sep 19, 2018 at 03:59:58PM -0700, Junio C Hamano wrote:
> > @@ -23,7 +26,7 @@ OPTIONS
> >
> > --mode=::
> > Specify layout mode. See configuration variable column.ui for option
> > - syntax.
> > + syntax (in git-config(1)).
I think we usually link to other commands with "linkgit
On Wed, Sep 19, 2018 at 07:22:44PM +0200, Ævar Arnfjörð Bjarmason wrote:
> >> @@ -225,14 +226,20 @@ static void mark_reachable(struct
> >> expire_reflog_policy_cb *cb)
> >> struct commit_list *pending;
> >> timestamp_t expire_limit = cb->mark_limit;
> >> struct commit_list
On 20/09/18 15:26, Junio C Hamano wrote:
> Ramsay Jones writes:
>
>> Commit ef3ca95475 ("Add missing includes and forward declarations",
>> 2018-08-15) resulted from the author employing a manual method to
>> create a C file consisting of a pair of pre-processor #include
>> lines (for 'git-com
On Tue, 18 Sep 2018 19:12:57 +0200
SZEDER Gábor wrote:
> Hi Antonio,
>
> it appears that this patch (and its previous versions as well) is
> responsible for triggering occasional test failures in
> 't7814-grep-recurse-submodules.sh', more frequently, about once in
> every ten runs, on macOS on T
On 20/09/18 00:38, Derrick Stolee wrote:
> On 9/18/2018 8:15 PM, Ramsay Jones wrote:
>> Signed-off-by: Ramsay Jones
>> ---
>> commit-reach.h | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/commit-reach.h b/commit-reach.h
>> index 7d313e2975..f41d8f6ba3 100644
KES writes:
> PS. for `git push --force` there is alternative: --force-with-lease
> Is there something similar to --force-with-lease but for `git pull -v
> --rebase`?
Curious.
For "push", you are competing with the other pushers who want to
update the repository over there, and there is need f
Ramsay Jones writes:
> Commit ef3ca95475 ("Add missing includes and forward declarations",
> 2018-08-15) resulted from the author employing a manual method to
> create a C file consisting of a pair of pre-processor #include
> lines (for 'git-compat-util.h' and a given toplevel header), and
> fixi
Shulhan writes:
> For someone who use editor that display trailing white spaces, issuing
> interactive rebase will print two empty lines at the end of rebase with the
> last line contains tab,
>
> # However, if you remove everything, the rebase will be aborted.
> #
> #\t
> # Note that e
"brian m. carlson" writes:
> I think "make style" and the EditorConfig file are complementary. "make
> style" autoformats code into a diff. I agree that if we always used
> clang-format to format code, then this would be a non-issue in the
> EditorConfig file, since we'd just tell people to for
On 9/20/2018 9:38 AM, Martin Ågren wrote:
On Thu, 20 Sep 2018 at 14:50, Derrick Stolee wrote:
On 9/19/2018 12:30 PM, Martin Ågren wrote:
The full name, by the way, is not the "commit-graph file" with a dash,
cf. the synopsis. Use the dashless form. (The next commit will fix the
remaining few i
On Thu, 20 Sep 2018 at 14:50, Derrick Stolee wrote:
>
> On 9/19/2018 12:30 PM, Martin Ågren wrote:
> > The full name, by the way, is not the "commit-graph file" with a dash,
> > cf. the synopsis. Use the dashless form. (The next commit will fix the
> > remaining few instances of the "commit-graph
On 9/19/2018 5:21 PM, Martin Ågren wrote:
On Wed, 19 Sep 2018 at 23:04, Ævar Arnfjörð Bjarmason wrote:
Fix a regression in my recent 7b0f229222 ("commit-graph write: add
progress output", 2018-09-17), the newly added progress output for
"commit-graph write" didn't check the --quiet option.
Tha
On 9/19/2018 12:30 PM, Martin Ågren wrote:
This document sometimes refers to the "commit graph file" as just "the
graph file". This saves a couple of words here and there at the risk of
confusion. In particular, the documentation for `git commit-graph read`
appears to suggest that there are indee
On 9/19/2018 12:30 PM, Martin Ågren wrote:
While we're here, fix an instance of "folder" to be "directory".
These changes are clearly good. Thanks!
On 9/18/2018 8:13 PM, Ramsay Jones wrote:
Signed-off-by: Ramsay Jones
---
midx.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/midx.h b/midx.h
index a210f1af2a..622ddac472 100644
--- a/midx.h
+++ b/midx.h
@@ -3,6 +3,9 @@
#include "repository.h"
+struct object_id;
+struct pac
On 9/18/2018 8:15 PM, Ramsay Jones wrote:
Signed-off-by: Ramsay Jones
---
commit-reach.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/commit-reach.h b/commit-reach.h
index 7d313e2975..f41d8f6ba3 100644
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -1,12 +1,13 @@
#
On 9/19/2018 12:30 PM, Martin Ågren wrote:
We have a couple of bullet items which span multiple lines, and where we
have prefixed each line with a `*`. (This might be the result of a text
editor trying to help.) This results in each line being typeset as a
separate bullet item. Drop the extra `*`
Hi.
TL;DR; Some local commits are lost while `git pull -v --rebase`
[alias]
tree= log --graph --decorate --pretty=oneline --abbrev-commit
changes = log --graph --decorate --pretty=oneline --abbrev-commit
--cherry-pick --boundary --left-right
$ git fetch origin
remote: C
You are lucky to have £1,800,000.00GBP as your compensation grant.
JC
64 matches
Mail list logo
