On Wed, Feb 20, 2019 at 02:03:40PM +0100, Ævar Arnfjörð Bjarmason wrote:
> > I wanted to point a colleague of mine to one of the talks.
> > Unfortunately I could not find the recordings of the talks anywhere.
> >
> > Are these available?
>
> I have no insider knowledge, but can tell you that in p
Ok, I think I'm almost there and I should be able to send a v2 on the
weekend. But again, a few questions arose while I'm coding v2. Please,
see inline.
On Tue, Feb 19, 2019 at 8:45 PM Thomas Gummerer wrote:
>
> On 02/19, Matheus Tavares Bernardino wrote:
> > Ok, I agree. I noticed copy_or_link_d
On Thu, Feb 21, 2019 at 10:47:45AM +0700, Duy Nguyen wrote:
> > > I managed to identify where that garbage injections come from:
> > > from git aliases I've got configured [1]
> > >
> > > Could anyone explain what is happening here?
> > > Is there anything wrong with my ~/.gitconfig [1] ?
> >
> >
On Thu, Feb 21, 2019 at 9:19 AM brian m. carlson
wrote:
>
> On Tue, Feb 19, 2019 at 05:51:05PM +0100, Mateusz Loskot wrote:
> > Hi,
> >
> > $ git version
> > git version 2.20.1.windows.1
> >
> > I'm running `git clone --recurse-submodules https://XXX`
> > The command seems to run well and complete
On Tue, Feb 19, 2019 at 05:51:05PM +0100, Mateusz Loskot wrote:
> Hi,
>
> $ git version
> git version 2.20.1.windows.1
>
> I'm running `git clone --recurse-submodules https://XXX`
> The command seems to run well and completes with success.
>
> However, I noticed strange output from git:
>
> ```
On Tue, Feb 19, 2019 at 02:44:31PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> On Tue, Dec 04 2018, brian m. carlson wrote:
> > First, I'd like to see a section (and a bit in the implementation)
> > requiring HTTPS if the original protocol is secure (SSH or HTTPS).
> > Allowing the server to downgra
When Git fetches a pack using dumb HTTP, it does at least 2 things
differently from when it fetches using fetch-pack or receive-pack: (1)
it reuses the server's name for the packfile (which incorporates a hash)
for the packfile, and (2) it does not create a .keep file to avoid race
conditions with
Signed-off-by: Elijah Newren
---
Documentation/git-fast-import.txt | 7 +-
t/t9300-fast-import.sh| 37 +++
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-fast-import.txt
b/Documentation/git-fast-import.txt
index 43ab3
In commit 777f80d7429b ("fast-import: Allow cat-blob requests at
arbitrary points in stream", 2010-11-28), fast-import started allowing
cat-blob commands to appear on the start of any line except in the
middle of a "data" command. It could be in the middle of various
directives that were part of a
I found a few issues with parsing in fast-import (dating back to
git-2.6.0). I was thrown off track for a while by the fact that the
.git/fast_import_crash_$PID file erroneously claimed that the
penultimate command it read was somehow truncated; e.g. for input of
the form:
commit refs/heads/m
The docs claimed `ls` commands could appear almost anywhere, but the
code told a different story. Modify the docs to match the code.
Signed-off-by: Elijah Newren
---
Documentation/git-fast-import.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-fast-
When get-mark was introduced in commit 28c7b1f7b7b7 ("fast-import: add a
get-mark command", 2015-07-01), it followed the precedent of the
cat-blob command to be allowed on any line other than in the middle of a
data directive; see commit 777f80d7429b ("fast-import: Allow cat-blob
requests at arbitr
This is not a very important change, and one that I expect to have no
performance impact whatsoever, but reading the code bothered me. The
parsing of command types in cmd_main() mostly runs in order of most
common to least common commands; sure, it's hard to say for sure what
the most common are w
SZEDER Gábor writes:
> On Sun, Feb 17, 2019 at 08:49:39AM -0500, Joe Ranieri wrote:
>> "git ls-files -m" can show deleted files, despite -d not having been
>> specified.
>
> To my understanding that's intentional: a deleted file is considered
> modified, because its content clearly doesn't match
Duy Nguyen writes:
> There is a trade off somewhere. "new user first" should not come at
> the cost for more experienced users.
Probably. Nobody will stay being newbie forever.
> Making "git checkout/merge" abort while it's working before breaks
> scripts. And requiring to mark trashable files
Duy Nguyen writes:
> - surprises sometimes, but in known classes. This is the main use
> case of backup log, where I may accidentally do "git commit
> -amsomething" after carefully preparing the index. Saving overwritten
> files by merge/checkout could be done here as an alternative to
> "garbag
On 02/19, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> >> Now, I seriously believe that we missed the best time to move
> >> ps/stash-in-c into `next` for cooking. The best time would have been just
> >> ...
> >> Anyway, that's my plan for now.
> >
> > I must say I am not very happy about
Nguyễn Thái Ngọc Duy writes:
> v2 changes the subject line to help clarify in "git log --oneline"
Some were not straight-forward converison, but nevertheless looked
correct. Thanks.
>
> Nguyễn Thái Ngọc Duy (21):
> diff-parseopt: convert --patch-with-raw
> diff-parseopt: convert --numstat
Hi Junio,
On Tue, 19 Feb 2019, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> >> Now, I seriously believe that we missed the best time to move
> >> ps/stash-in-c into `next` for cooking. The best time would have been just
> >> ...
> >> Anyway, that's my plan for now.
> >
> > I must say I a
Nguyễn Thái Ngọc Duy writes:
> -static int stat_opt(struct diff_options *options, const char **av)
> +static int diff_opt_stat(const struct option *opt, const char *value, int
> unset)
> {
> - const char *arg = av[0];
> - char *end;
> + struct diff_options *options = opt->value;
>
Hi Junio,
On Tue, 19 Feb 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> > diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> >> > index c77f62c895..3dab488bd6 100644
> >> > --- a/builtin/stash--helper.c
> >> > +++ b/builtin/stash--helper.c
> >> > @@ -231,6 +231,7
Hi Junio,
On Wed, 20 Feb 2019, Junio C Hamano wrote:
> Hopefully Dscho's Azure thing would also be happy with one less use
> of Perl script.
My "Azure thing" does not time out anymore, indeed!
Thank you so much, Junio,
Dscho
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> Signed-off-by: Junio C Hamano
> ---
> diff.c | 9 +
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index 4bc9df7362..12e333c67f 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -4901,6
Hi Max,
On Tue, 19 Feb 2019, Max Kirillov wrote:
> On Mon, Feb 18, 2019 at 10:57:13PM +0100, Johannes Schindelin wrote:
> > I have to take that assessment back. So sad.
> >
> > After that build, I cherry-picked the commit on top of shears/pu (which is
> > Git for Windows' ever-green branch that
Ismael Luceno writes:
> - Control+BackSpace: Delete word to the left of the cursor.
> - Control+Delete : Delete word to the right of the cursor.
>
> Originally introduced by BRIEF and Turbo Vision between 1985 and 1992,
> they were adopted by most CUA-Compliant UIs, including those of: OS/2,
>
Hi Michal,
On Tue, 19 Feb 2019, Michal Suchánek wrote:
> It is very poor reply to critique to say that better alternative should
> be provided.
Well, then we are at an impasse here.
Ciao,
Johannes
"Randall S. Becker" writes:
> On February 19, 2019 18:29, Junio C Hamano wrote:
>> A release candidate Git v2.21.0-rc2 is now available for testing at the usual
>> places. It is comprised of 474 non-merge commits since v2.20.0, contributed
>> by 61 people, 16 of which are new faces.
>
> Thanks.
On Wed, Feb 20, 2019 at 12:16 PM Michal Suchánek wrote:
> On Wed, 20 Feb 2019 11:55:46 -0500
> Eric Sunshine wrote:
> > On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek wrote:
> > > Apparently it can happen that stat() claims there is a commondir file but
> > > when
> > > trying to open the fil
That is correct. What you suggest is actually what I tried (using
sha-1 syntax). For my purposes, excluding the tag's parent's but
including the tag is sufficient, but if is fairly straightforward to
extend support to the other use cases I'm sure someone would find is
useful.
Joe
On Tue, Feb 1
On Wed, 20 Feb 2019 11:34:54 -0500
Eric Sunshine wrote:
> On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek wrote:
> > Git runs a stat loop to find a worktree name that's available and then does
> > mkdir on the found name. Turn it to mkdir loop to avoid another invocation
> > of
> > worktree ad
On Wed, 20 Feb 2019 11:55:46 -0500
Eric Sunshine wrote:
> On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek wrote:
> > Apparently it can happen that stat() claims there is a commondir file but
> > when
> > trying to open the file it is missing.
>
> Under what circumstances?
I would like to k
On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek wrote:
> Apparently it can happen that stat() claims there is a commondir file but when
> trying to open the file it is missing.
Under what circumstances?
> Another even rarer issue is that the file might be zero size because another
> process ini
On Wed, Feb 20, 2019 at 03:55:58PM +0100, Ævar Arnfjörð Bjarmason wrote:
> > @@ -376,11 +377,15 @@ corrupt_graph_and_verify() {
> > data="${2:-\0}"
> > grepstr=$3
> > cd "$TRASH_DIRECTORY/full" &&
> > + orig_size=$(wc -c < $objdir/info/commit-graph) &&
> > + zero_pos=${4:-${orig_siz
On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek wrote:
> Git runs a stat loop to find a worktree name that's available and then does
> mkdir on the found name. Turn it to mkdir loop to avoid another invocation of
> worktree add finding the same free name and creating the directory first.
>
> Sign
Hmm, sorry for pushing, but no ideas, really?
Doesn't it seem like a bug?
Matz
On Tue, 19 Feb 2019 at 17:51, Mateusz Loskot wrote:
>
> Hi,
>
> $ git version
> git version 2.20.1.windows.1
>
> I'm running `git clone --recurse-submodules https://...`
> The command seems to run well and completes w
Git runs a stat loop to find a worktree name that's available and then does
mkdir on the found name. Turn it to mkdir loop to avoid another invocation of
worktree add finding the same free name and creating the directory first.
Signed-off-by: Michal Suchanek
---
v2:
- simplify loop exit condition
Apparently it can happen that stat() claims there is a commondir file but when
trying to open the file it is missing.
Another even rarer issue is that the file might be zero size because another
process initializing a worktree opened the file but has not written is content
yet.
When any of this h
On Tue, Jan 15 2019, Josh Steadmon wrote:
> fuzz-commit-graph identified a case where Git will read past the end of
> a buffer containing a commit graph if the graph's header has an
> incorrect chunk count. A simple bounds check in parse_commit_graph()
> prevents this.
This has a 2.21 regressio
I see, thanks!
On Пн, Feb 18, 2019 at 6:18 PM, Duy Nguyen wrote:
On Mon, Feb 18, 2019 at 10:09 PM wrote:
On Пн, Feb 18, 2019 at 6:02 PM, Duy Nguyen
wrote:
> On Mon, Feb 18, 2019 at 9:44 PM wrote:
>>
>> # Steps to reproduce (in terms of terminal commands)
>>
>> $ mkdir foo
On February 20, 2019 7:53, SZEDER Gábor wrote:
> On Wed, Feb 20, 2019 at 07:12:49AM -0500, Randall S. Becker wrote:
> > Sadly I have to report that this subtest breaks on NonStop as of
> > v2.21.0-rc2. It succeeds when run with --verbose, but not without,
> > making this difficult to diagnose.
>
>
On Wed, Feb 20 2019, Thomas Braun wrote:
> Hi Jeff,
>
> I wanted to point a colleague of mine to one of the talks. Unfortunately I
> could not find the recordings of the talks anywhere.
>
> Are these available?
I have no insider knowledge, but can tell you that in past years it's
taken GitHub
On Wed, Feb 20, 2019 at 07:12:49AM -0500, Randall S. Becker wrote:
> Sadly I have to report that this subtest breaks on NonStop as of
> v2.21.0-rc2. It succeeds when run with --verbose, but not without,
> making this difficult to diagnose.
That particular test is known to be flaky, see:
https:
Hi Jeff,
I wanted to point a colleague of mine to one of the talks. Unfortunately I
could not find the recordings of the talks anywhere.
Are these available?
Thanks,
Thomas
> Jeff King hat am 9. November 2018 um 11:42 geschrieben:
>
>
> Git Merge 2019 is happening on February 1st. There wil
Sir/madam,I humbly seek your consent for an investment in your
Country.I need your good advice and suggest areas of sustainable and
viable economy that will be of great value to us.More details of this
will be sent following your INVESTMENT suggestions.Regards,
Sadly I have to report that this subtest breaks on NonStop as of v2.21.0-rc2.
It succeeds when run with --verbose, but not without, making this difficult to
diagnose.
Sincerely,
Randall
From: Slavica Djukic
This is one of the two functions translated from Perl script, besides
list_modified that will be used by *_cmd functions (including status)
to collect index/worktree changes, list those changes and let user
make a choice.
At this point, it only prints worktree and index chan
From: Slavica Djukic
If list_only option is not set, (i.e. we want to pick elements
from the list, not just display them), highlight unique prefixes
of list elements and let user make a choice as shown in
prompt_help_cmd and singleton_prompt_help_cmd.
Input that is expected from user is full lin
From: Slavica Djukic
Implement show-help command in add-interactive.c and use it in
builtin add--helper.c.
Use command name "show-help" instead of "help": add--helper is
builtin, hence add--helper --help would be intercepted by
handle_builtin and re-routed to the help command, without ever
calli
From: Slavica Djukic
Add test to t3701-add-interactive to verify that add_i_show_help()
outputs expected content.
Also, add it before changing git-add--interactive.perl's help_cmd
to demonstrate that there are no changes introduced by the
conversion to C.
Prefix git add -i call with GIT_PAGER_IN
From: Slavica Djukic
Change help_cmd sub in git-add--interactive.perl to use
show-help command from builtin add--helper.
If an error occurs, it will be reported, but the Perl script will
not exit, since the add--helper is called within an eval block.
Just like the change where the Perl script c
From: Slavica Djukic
Implement list_modified from Perl, which will be used
by most of the *_cmd functions, including status in the
following commit.
It lists a numstat comparing changed files between a) the worktree and
the index; b) the index and the HEAD.
To do so, we use run_diff_index() and
From: Daniel Ferreira
Create a builtin helper for git-add--interactive, which at this point
is not doing anything.
This is the first step in an effort to convert git-add--interactive.perl
to a C builtin, in search for better portability, expressibility and
performance (specially on non-POSIX sys
From: Slavica Djukic
Implement add --interactive's status command in add-interactive.c and
use it in builtin add--helper.c.
This is the first interactive add command implemented in C of those
anticipated by the previous commit, which introduced
the add--helper built-in.
Implement additional help
From: Daniel Ferreira
Call the newly introduced add--helper builtin in
status_cmd() instead of relying on add--interactive's Perl
functions to print the numstat.
If an error occurs, it will be reported, but the Perl script will
not exit, since the add--helper is called within an eval block.
As
From: Daniel Ferreira
Make the diffstat interface (namely, the diffstat_t struct and
compute_diffstat) no longer be internal to diff.c and allow it to be used
by other parts of git.
This is helpful for code that may want to easily extract information
from files using the diff machinery, while fl
This is the first version of a patch series to start porting
git-add--interactive from Perl to C. Daniel Ferreira's patch series used as
a head start:
https://public-inbox.org/git/1494907234-28903-1-git-send-email-bnm...@gmail.com/t/#u
Changes since v4:
* rename print_modified to list_modifed
*
On Tue, Feb 19, 2019 at 03:58:00PM +0100, Johannes Schindelin wrote:
> On Tue, 19 Feb 2019, SZEDER Gábor wrote:
>
> > On Tue, Feb 19, 2019 at 09:02:43AM +0100, Senol Yazici wrote:
> > > 1. Dictator
> > > Concern: "Bad" connotation.
> >
> > "Benevolent dictator" is a well-established term in open
On February 20, 2019 10:41:51 AM GMT+01:00, Duy Nguyen
wrote:
>Making "git checkout/merge" abort while it's working before breaks
>scripts.
Change is always a trade-off. We should not reject change without considering
the merits. Once we agree on the desired state, we can think about the
mi
On 22/01/2019 20:39, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> Also, I have a fuzzy memory of discussing a very similar case with
>> some rebase-oriented option and its on-disk representation, where the
>> concern was more about users upgrading git versions during an
>> incomplete rebase
On Wed, Feb 20 2019, Duy Nguyen wrote:
> On Wed, Feb 20, 2019 at 4:19 PM Ævar Arnfjörð Bjarmason
> wrote:
>> > I personally do not believe in "backup log"; if we can screw up and
>> > can fail to stop an operation that must avoid losing info, then we
>> > can screw up the same way and fail to d
On 20.02.19 10:19, Ævar Arnfjörð Bjarmason wrote:
Most git users are at the level of only knowing very basic
add/commit/pull/push command interaction. I feel strongly that we need
to make our tools safe to use by default, and not require some
relatively advanced "precious"/attribute facility to b
On Wed, Feb 20, 2019 at 4:19 PM Ævar Arnfjörð Bjarmason
wrote:
> > I personally do not believe in "backup log"; if we can screw up and
> > can fail to stop an operation that must avoid losing info, then we
> > can screw up the same way and fail to design and implement "backup"
> > to save info bef
On Tue, Feb 19 2019, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Sun, Feb 17, 2019 at 2:36 AM Ævar Arnfjörð Bjarmason
>> wrote:
>>>
>>>
>>> On Sat, Feb 16 2019, Nguyễn Thái Ngọc Duy wrote:
>>>
>>> [Re-CC some people involved the last time around]
>>>
>>> > A new attribute "precious" is
On February 20, 2019 2:35:41 AM GMT+01:00, Duy Nguyen wrote:
>On Wed, Feb 20, 2019 at 1:08 AM Junio C Hamano
>wrote:
>>
>> Duy Nguyen writes:
>>
>> > On Sun, Feb 17, 2019 at 2:36 AM Ævar Arnfjörð Bjarmason
>> > wrote:
>> >>
>> >>
>> >> On Sat, Feb 16 2019, Nguyễn Thái Ngọc Duy wrote:
>> >>
>
64 matches
Mail list logo
