The Git Merge Contributor Summit is a little over a week away. If you're
interested in coming but haven't signed up, please do! We have a few
spaces available still. Details are in the previous announcement:
http://public-inbox.org/git/20181206094805.ga1...@sigill.intra.peff.net/
There's no set
On Mon, Jan 21, 2019 at 10:10:16PM +, Alex Netkachov wrote:
> On the location builtin/pack-objects.c:1996 the code tries to set
> read_lock (pthread_mutex_lock(&read_mutex)) and fails. I suspect that
> read_mutex is not initialised yet. It is initialised in
> init_threaded_search, which is cal
On Mon, Jan 21, 2019 at 05:02:33PM +0700, Duy Nguyen wrote:
> > As I mentioned in the prior thread I think that it will be simpler
> > to simply use the existing lock in packing_data instead of moving
> > read_mutex. I can go back to simply moving read_mutex to the
> > packing_data struct if that
On Fri, Jan 18, 2019 at 01:41:08AM +, Ramsay Jones wrote:
> I don't do this "from time to time", but *every* build on all
> platforms! :-D
>
> As I have mentioned before, I run the script on 'master', 'next'
> and 'pu', but I don't look at the results for 'master', I simply
> look at the diff
On Mon, Jan 21, 2019 at 05:05:56PM +0700, Duy Nguyen wrote:
> > It should be possible to salvage this optimization, but let's start with
> > just removing the remnants. It hasn't been doing anything (except
> > creating bugs) since 60a12722ac, and nobody seems to have noticed the
> > performance r
On Fri, Jan 18, 2019 at 02:19:55PM -0800, Stefan Beller wrote:
> > I dunno. This is why I submitted the initial patch as the simplest fix. ;)
> >
>
> The first patch is
> Reviewed-by: Stefan Beller
Thanks!
> Diffing across both patches, this seems to be the relevant part:
> [...]
>
> ---8<---
On Fri, Jan 18, 2019 at 11:26:29PM +0100, Ævar Arnfjörð Bjarmason wrote:
> I stand corrected, I thought these still needed to be updated to parse
> anything that wasn't 40 chars, since I hadn't seen anything about these
> formats in the hash transition document.
>
> So fair enough, let's change t
On Thu, Jan 17, 2019 at 07:31:14AM +0100, Martin Ågren wrote:
> > I also get why read_repository_format() doing this in patch 3 would be a
> > problem:
> >
> > + if (format->version == -1) {
> > + clear_repository_format(format);
> > + format->version = -1;
On Monday, January 21, 2019 8:04:29 AM MST SZEDER Gábor wrote:
> Note that the relative time output is translated, see all the Q_()
> calls in show_date_relative(). Consequently, these tests fail in
> GETTEXT_POISON builds. Please use 'test_i18ncmp' instead.
>
> Furthermore, I think it would hel
Resend with s-o-b. Oops.
Nguyễn Thái Ngọc Duy (3):
Revert "parse-options: allow keep-unknown + stop-at-non-opt
combination"
diff.c: delete unused functions
diff.c: simplify diff_opt_break_rewrites()
diff.c | 74 ++---
parse-options.c
After the parseopt conversion, a few functions are no longer
needed. Delete them.
Noticed-by: SZEDER Gábor
Noticed-by: Johannes Schindelin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 65 --
1 file changed, 65 deletions(-)
diff --git
Helped-by: Johannes Schindelin
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/diff.c b/diff.c
index da5ba835ce..2351571251 100644
--- a/diff.c
+++ b/diff.c
@@ -4814,20 +4814,15 @@ static int diff_opt_break_rewrites(cons
This reverts commit a85e5a01080e35da0f94bf98f5f334c64e214ce3, which is a
revert of 0d260f9a09 (parseopt: prevent KEEP_UNKNOWN and
STOP_AT_NON_OPTION from being used together - 2009-03-09).
As described in 0d260f9a09, this option combination is tricky to get
right and should be prevented unless you
Helped-by: Johannes Schindelin
---
diff.c | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/diff.c b/diff.c
index da5ba835ce..2351571251 100644
--- a/diff.c
+++ b/diff.c
@@ -4814,20 +4814,15 @@ static int diff_opt_break_rewrites(const struct option
*opt,
This reverts commit a85e5a01080e35da0f94bf98f5f334c64e214ce3, which is a
revert of 0d260f9a09 (parseopt: prevent KEEP_UNKNOWN and
STOP_AT_NON_OPTION from being used together - 2009-03-09).
As described in 0d260f9a09, this option combination is tricky to get
right and should be prevented unless you
After the parseopt conversion, a few functions are no longer
needed. Delete them.
Noticed-by: SZEDER Gábor
Noticed-by: Johannes Schindelin
---
diff.c | 65 --
1 file changed, 65 deletions(-)
diff --git a/diff.c b/diff.c
index 747e691190..
Let me see if I could just fix up this series on top like this.
Failing this, I'll break it down and resend in small chunks.
This redoes a85e5a0108 (parse-options: allow keep-unknown +
stop-at-non-opt combination - 2019-01-17), deletes dead functions and
rewrites b9b760ed1c (diff.c: convert -B|--b
I've just sent my current set of stable patches for the evolve command
to the list.
The code should be stable, but there's follow-up stuff I still want to do:
- Add more tests for the new code.
- Make better use of the memory pool in change-table.c (ideally, all
the memory it uses should come from
From: Stefan Xenos
This command lists the ongoing changes from the refs/metas
namespace.
---
builtin/change.c | 53
1 file changed, 53 insertions(+)
diff --git a/builtin/change.c b/builtin/change.c
index ff7eb3b113..b63fe98665 100644
--- a/builti
From: Stefan Xenos
Implement a "contains_nondestructive" function for oid_array that won't
sort the array if it is unsorted. This can be used to test containment in
the rare situations where the array order matters.
The function has intentionally been given a name that is more cumbersome
than th
From: Stefan Xenos
Implement the git change update command, which
are sufficient for constructing change graphs.
For example, to create a new change (a stable name) that refers to HEAD:
git change update -c HEAD
To record a rebase or amend in the change graph:
git change update -c -r
To re
From: Stefan Xenos
The metas namespace will contain refs for changes in progress. Add
support for searching this namespace.
---
ref-filter.c | 8 ++--
ref-filter.h | 5 +++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 422a9c9ae3..4d7bd068
From: Stefan Xenos
metacommit.c supports the creation of metacommits and
adds the API needed to create and update changes.
Create the "modify_change" function that can be called from modification
commands like "rebase" and "git amend" to record obsolescences in the
change graph.
Create the "rec
From: Stefan Xenos
A change table stores a list of changes, and supports efficient lookup
from a commit hash to the list of changes that reference that commit
directly.
It can be used to look up content commits or metacommits at the head
of a change, but does not support lookup of commits refere
From: Stefan Xenos
This patch adds the get_metacommit_content method, which can classify
commits as either metacommits or normal commits, determine whether they
are abandoned, and extract the content commit's object id from the
metacommit.
---
Makefile| 1 +
metacommit-parser.c | 87
From: Stefan Xenos
This document describes what a change graph for
git would look like, the behavior of the evolve command,
and the changes planned for other commands.
Signed-off-by: Stefan Xenos
---
Documentation/technical/evolve.txt | 1034
1 file changed, 1034 i
Hi,
The most recent version of git crashes on gc command on my repository.
I've tracked it down to the segmentation fault in pack-objects.c while
running this command in the debugger:
gdb --args /usr/src/git/git-pack-objects.exe --local
--delta-base-offset .git/objects/pack/.tmp-14368-pack
--keep-
I'm guessing the patch was just too big. I'll break it up and submit it in bits.
- Stefan
On Mon, Jan 21, 2019 at 12:21 PM Eric Wong wrote:
>
> Stefan Xenos wrote:
> > I've tried to upload a patch twice but it doesn't seem to be showing
> > up in my mailbox or in the mailing list archives. Th
Hi Dscho,
On Mon, Jan 21, 2019 at 1:01 PM Johannes Schindelin
wrote:
>
> Hi Elijah,
>
> On Mon, 21 Jan 2019, Johannes Schindelin wrote:
>
> > On Tue, 11 Dec 2018, Elijah Newren wrote:
> >
> > > Differences since v3 (full range-diff below):
> > > - Fixed the redundant "fatal: error:" error messa
Hi Junio,
On Fri, 18 Jan 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Fri, 18 Jan 2019, Junio C Hamano wrote:
> >
> >> Johannes Schindelin writes:
> >>
> >> > I am about to submit a new iteration of my patch series, would it
> >> > be too much trouble for you to rebase o
Hi Elijah,
On Mon, 21 Jan 2019, Johannes Schindelin wrote:
> On Tue, 11 Dec 2018, Elijah Newren wrote:
>
> > Differences since v3 (full range-diff below):
> > - Fixed the redundant "fatal: error:" error message prefixes, as pointed
> > out by Duy
> > - Rebased on 2.20.0
>
> - Fixed
WITHOUT reading m...@public-inbox.org, maybe some of you
can spot some differences :) You'll need to use Tor
to access .onions, of course:
http://hjrcffqmbrq6wope.onion/git/
Tested with Netsurf and dillo.
People with machines powerful enough to run Firefox
(or Tor Browser Bundle) can us
Hi Phillip,
On Tue, 11 Dec 2018, Phillip Wood wrote:
> On 11/12/2018 09:56, Johannes Schindelin wrote:
>
> > On Mon, 10 Dec 2018, Phillip Wood wrote:
> >
> > > On 09/12/2018 20:31, Johannes Schindelin wrote:
> > >
> > > > I could imagine, however, that it would make sense for `git add
> > > >
Stefan Xenos wrote:
> I've tried to upload a patch twice but it doesn't seem to be showing
> up in my mailbox or in the mailing list archives. The patch title was
> "[RFC PATCH] evolve: Implement the git change command".
>
> Has anyone seen it? Is there a reason the mailing list would reject a pa
I've tried to upload a patch twice but it doesn't seem to be showing
up in my mailbox or in the mailing list archives. The patch title was
"[RFC PATCH] evolve: Implement the git change command".
Has anyone seen it? Is there a reason the mailing list would reject a patch?
- Stefan
From: Ben Peart
When doing a 'checkout -b' do a full checkout including updating the working
tree when doing the initial checkout. This fixes the regression in behavior
caused by fa655d8411 (checkout: optimize "git checkout -b ",
2018-08-16)
Signed-off-by: Ben Peart
---
builtin/checkout.c
From: Ben Peart
The optimized `checkout -b` doesn�t typically create/update the index and
working directory. Add a new test to detect the case when the call to
`checkout -b` is the first call after doing a `clone --no-checkout` and no
index exists. In this specific case, well now make the call
From: Ben Peart
Commit fa655d8411 (checkout: optimize "git checkout -b ",
2018-08-16)
introduced an unintentional change in behavior for 'checkout -b' after doing
'clone --no-checkout'. Add a test to demonstrate the changed behavior to be
used in a later patch to verify the fix.
Signed-off-by:
Hi Dscho,
On Mon, Jan 21, 2019 at 7:56 AM Johannes Schindelin
wrote:
>
> Hi Elijah,
>
> while looking for the patches I promised to review much earlier, I
> realized that I never answered to this, even older mail. Sorry about that.
>
> [On a positive note: it only has been, what, exactly 7 months
Hi Elijah,
On Mon, 21 Jan 2019, Johannes Schindelin wrote:
> Maybe, just maybe, if you submit another iteration (and only if), could
> you add a little paragraph for future Dscho to understand that this
> clean-up was slipped in?
Oh wow. I guess I should learn how to read. The last paragraph say
Hi Elijah,
On Mon, 21 Jan 2019, Elijah Newren wrote:
> On Mon, Jan 21, 2019 at 8:10 AM Johannes Schindelin
> wrote:
> >
> > On Tue, 11 Dec 2018, Elijah Newren wrote:
> >
> > > While 'quiet' and 'interactive' may sound like antonyms, the interactive
> > > machinery actually has logic that impleme
Hi Elijah,
On Mon, 21 Jan 2019, Elijah Newren wrote:
> On Mon, Jan 21, 2019 at 8:07 AM Johannes Schindelin
> wrote:
> >
> > On Tue, 11 Dec 2018, Elijah Newren wrote:
> >
> > > The post-rewrite hook is supposed to be invoked for each rewritten
> > > commit. The fact that a commit was selected an
Hi Dscho,
On Mon, Jan 21, 2019 at 8:07 AM Johannes Schindelin
wrote:
>
> Hi,
>
> On Tue, 11 Dec 2018, Elijah Newren wrote:
>
> > The post-rewrite hook is supposed to be invoked for each rewritten
> > commit. The fact that a commit was selected and processed by the rebase
> > operation (even thou
Hi Dscho,
On Mon, Jan 21, 2019 at 8:10 AM Johannes Schindelin
wrote:
>
> Hi Elijah,
>
> On Tue, 11 Dec 2018, Elijah Newren wrote:
>
> > While 'quiet' and 'interactive' may sound like antonyms, the interactive
> > machinery actually has logic that implements several
> > interactive_rebase=implied
Hi Elijah,
On Tue, 11 Dec 2018, Elijah Newren wrote:
> While 'quiet' and 'interactive' may sound like antonyms, the interactive
> machinery actually has logic that implements several
> interactive_rebase=implied cases (--exec, --keep-empty, --rebase-merges)
> which won't pop up an editor. The re
Hi,
On Tue, 11 Dec 2018, Elijah Newren wrote:
> The post-rewrite hook is supposed to be invoked for each rewritten
> commit. The fact that a commit was selected and processed by the rebase
> operation (even though when we hit an error a user said it had no more
> useful changes), suggests we sho
Hi Elijah,
On Tue, 11 Dec 2018, Elijah Newren wrote:
> Differences since v3 (full range-diff below):
> - Fixed the redundant "fatal: error:" error message prefixes, as pointed
> out by Duy
> - Rebased on 2.20.0
- Fixed the "comptable" tyop
This, and the range-diff, look reasonable t
Hi Elijah,
while looking for the patches I promised to review much earlier, I
realized that I never answered to this, even older mail. Sorry about that.
[On a positive note: it only has been, what, exactly 7 months since you
sent it. My record is, I believe, somewhat around 5 years before I
respo
Hi Elijah,
On Fri, 18 Jan 2019, Elijah Newren wrote:
> On Fri, Jan 18, 2019 at 3:22 PM Junio C Hamano wrote:
> > * en/rebase-merge-on-sequencer (2019-01-07) 8 commits
> > - rebase: implement --merge via the interactive machinery
> > - rebase: define linearization ordering and enforce it
> > -
Hi Junio,
On Fri, 18 Jan 2019, Junio C Hamano wrote:
> "Matthew Kraai via GitGitGadget" writes:
>
> > From: Matthew Kraai
> >
> > After `git add -N `, the index is in a special state. A state for
> > which the built-in stash was not prepared, as it failed to initialize
> > the `rev` structure
This fix should have gone into https://github.com/gitgitgadget/git/pull/73
(which was submitted as
https://public-inbox.org/git/pull.73.v2.git.gitgitgad...@gmail.com and was
integrated into master via 2488849c7e76 (Merge branch
'js/test-git-installed', 2018-11-19)). Ben Peart pointed out that I h
From: Johannes Schindelin
In 8abfdf44c882 (tests: explicitly use `git.exe` on Windows,
2018-11-14), we made sure to use the `.exe` file extension when
using an absolute path to `git.exe`, to avoid getting confused with a
file or directory in the same place that lacks said file extension.
For the
On Sun, Jan 20, 2019 at 10:16:46PM -0700, Stephen P. Smith wrote:
> When using `human` several fields are suppressed depending on the time
> difference between the reference date and the local computer date. In
> cases where the difference is less than a year, the year field is
> supppressed. If th
Hi Alban
I think this is a good change, I just wonder if it would be better to
have an accessor function to get the arg pointer from a todo list item
see below
On 29/12/2018 16:04, Alban Gruin wrote:
The 'arg' field of todo_item used to store the address of the first byte
of the parameter of
Hi Beenish,
On Fri, 18 Jan 2019, Khurshid, Beenish wrote:
> Thanks so much for your response!
>
> As I went down the path of trying to prove the problem via an MCVE, and found
> that the problem was not reproducing as I was expecting, I found out that one
> of the pre-commit hooks had a bug fo
Hi everyone!
A draft of a new Git Rev News edition is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-47.md
Everyone is welcome to contribute in any section either by editing the
above page on GitHub and sending a pull request, or by commenting on
this
Hi all,
When the mtimes of my tracked files are updated during usual git
commands some other tools that depend on them have trouble. So I
restore their mtimes for these other tools and then git ends rereading
contents of files that have not changed. I would like to improve this.
Is there a way to
Hi Duy,
On Thu, 17 Jan 2019, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/diff.c b/diff.c
> index ae993f5551..4e004a2195 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -5401,6 +5401,8 @@ static void prep_parse_options(struct diff_options
> *options)
> OPT_BIT_F(0, "pickaxe-regex", &option
Hi Duy,
On Thu, 17 Jan 2019, Nguyễn Thái Ngọc Duy wrote:
> +static int diff_opt_break_rewrites(const struct option *opt,
> +const char *arg, int unset)
> +{
> + int *break_opt = opt->value;
> + int opt1, opt2;
> +
> + BUG_ON_OPT_NEG(unset);
> + if (
Hello Ævar,
thanks for taking time and making review.
On 21-Jan-19 10:59 AM, Ævar Arnfjörð Bjarmason wrote:
On Mon, Jan 21 2019, Slavica Djukic via GitGitGadget wrote:
From: Slavica Djukic
Change help_cmd sub in git-add--interactive.perl to use
show-help command from builtin add--helper.
S
On Sat, Jan 19, 2019 at 4:35 AM Jeff King wrote:
>
> On Fri, Jan 18, 2019 at 11:58:01AM -0500, Jeff King wrote:
>
> > Now, on to the actual bug. The simplest reproduction is:
> >
> > (echo "[attr]foo bar"; echo "* foo") >.gitattributes
> > git check-attr foo file
>
> Actually, even simpler is
On Sat, Jan 19, 2019 at 10:45 PM Patrick Hogg wrote:
>
> ac77d0c37 ("pack-objects: shrink size field in struct object_entry",
> 2018-04-14) added an extra usage of read_lock/read_unlock in the newly
> introduced oe_get_size_slow for thread safety in parallel calls to
> try_delta(). Unfortunately o
On Mon, Jan 21 2019, Slavica Djukic via GitGitGadget wrote:
> From: Slavica Djukic
>
> Change help_cmd sub in git-add--interactive.perl to use
> show-help command from builtin add--helper.
>
> Signed-off-by: Slavica Djukic
> ---
> git-add--interactive.perl | 11 +--
> 1 file changed,
From: Daniel Ferreira
Create a builtin helper for git-add--interactive, which right now is not
able to do 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 sy
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: Daniel Ferreira
Add new files: add-interactive.c and add-interactive.h, which
will be used for implementing "application logic" of git add -i,
whereas add--helper.c will be used mostly for parsing the command line.
We're a bit lax with the command-line parsing, as the command is
intended to
From: Slavica Djukic
Change help_cmd sub in git-add--interactive.perl to use
show-help command from builtin add--helper.
Signed-off-by: Slavica Djukic
---
git-add--interactive.perl | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/git-add--interactive.perl b/git-a
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: Daniel Ferreira
Call the newly introduced add--helper builtin on
status_cmd() instead of relying on add--interactive's Perl
functions to build print the numstat.
Signed-off-by: Daniel Ferreira
Signed-off-by: Slavica Djukic
---
git-add--interactive.perl | 4 +---
1 file changed, 1 insert
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 v2:
* fixed translation misuse and avoided com
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
Oops. Small correction in the message.
On Mon, 2019-01-21 at 03:00 +0530, Kaartic Sivaraam wrote:
> .. The commands given there worked as mentioned in the blog
> until Git v2.18.1. But when I run the same commands using Git v2.19.2
That's Git v2.20.0 not Git v2.19.2.
> or the one I built from
Hi all,
I recently came across a blog[1] about how protocol v2 speeds up the
transfer between the client and the server. It states that the amount
of data transmitted between the client and the server is less when
using the protocol v2.
To demonstrate the difference between v0 and v2 two commands
Until now, `git submodule summary` was always emitting 7-character
SHA-1s that have a higher chance of being ambiguous for larger
repositories. Use `git rev-parse --short` instead, which will
determine suitable short SHA-1 lengths.
Signed-off-by: Sven van Haastregt
---
git-submodule.sh | 4 ++--
74 matches
Mail list logo
