Junio C Hamano writes:
>> +/*
>> + * When sorting by name, we should put "detached" head lines,
>> + * which are all the lines in parenthesis, before all others.
>> + * This usually is automatic, since "(" is before "refs/" and
>> + * "r
During the usage of git in Buildkite we noted that git fails upon calling
git submodule foreach --recursive git reset --hardafter updating git version
to 2.22.0.
This is due to a problem with the recursive calling of git submodule--helper
itself, which is fixed in the patch below.
Morian Sonnet
From: Morian Sonnet
Calling
git submodule foreach --recursive git reset --hard
leads to an error stating that the option --hard is unknown to
submodule--helper.
Reasons:
. Above call is internally translated into
git submodule--helper foreach --recursive -- git reset --hard
. After
On Wed, Jun 12, 2019 at 12:48:00PM +0200, Alexander wrote:
> Hello,
>
> I am trying to checkout out various 3rd party Git projects on Linux
> and build them.
> Some of them have text files created under Windows with CRLF endings
> and it is not under my responsibility to change it.
>
> Thus I have
Hi,
On Tue, 11 Jun 2019, SZEDER Gábor wrote:
> diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
> index 8ef8763e06..2e4802e206 100755
> --- a/t/t5541-http-push-smart.sh
> +++ b/t/t5541-http-push-smart.sh
> @@ -213,7 +213,7 @@ test_expect_success TTY 'push shows progress when s
Hi Matthew,
On Tue, 11 Jun 2019, Matthew DeVore wrote:
> diff --git a/ref-filter.c b/ref-filter.c
> index 8500671bc6..056d21d666 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -2157,25 +2157,37 @@ static int cmp_ref_sorting(struct ref_sorting *s,
> struct ref_array_item *a, stru
> c
On Wed, Jun 12, 2019 at 09:14:40PM +0200, Johannes Schindelin wrote:
> Hi,
>
> On Tue, 11 Jun 2019, SZEDER Gábor wrote:
>
> > On Tue, Jun 11, 2019 at 01:36:16PM -0700, Junio C Hamano wrote:
> > > SZEDER Gábor writes:
> > >
> > > > -Rebasing (1/4)QRebasing (2/4)QRebasing (3/4)QRebasing
> > > > (
On Mon, Jun 10, 2019 at 09:29:14AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Your patch only helps with this at all because you're using the "tree:1"
> > ...
> > because there you'll have actual names which cat-file will choke on. So
> > it seems like this is helping only a very limi
On Wed, Jun 12, 2019 at 2:10 PM Morian Sonnet via GitGitGadget
wrote:
> [...]
> . Add -- before the command to execute, such that now correctly
>
> git --super-prefix submodule--helper \
> foreach --recursive -- git reset --hard
>
> is called.
>
> Signed-off-by: Morian Sonnet
> ---
>
On Fri, Jun 07, 2019 at 08:42:45PM -0400, Eric Sunshine wrote:
> On Fri, Jun 7, 2019 at 6:59 PM Emily Shaffer wrote:
> > Teach show_object_with_name() to avoid writing a space before a name
> > which is empty. Also teach tests for rev-list --objects --filter to not
> > require a space between the
On Wed, Jun 12, 2019 at 09:23:41AM -0700, Josh Steadmon wrote:
> The problem with the existing validators is that they expect each file to be a
> complete JSON entity, whereas the trace output is one object per line. You can
> of course loop over the lines in a shell script, but in my testing this
Hi,
On Tue, 11 Jun 2019, SZEDER Gábor wrote:
> On Tue, Jun 11, 2019 at 01:36:16PM -0700, Junio C Hamano wrote:
> > SZEDER Gábor writes:
> >
> > > -Rebasing (1/4)QRebasing (2/4)QRebasing (3/4)QRebasing (4/4)QSuccessfully
> > > rebased and updated refs/heads/missing-commit.
> > > +Rebasing (1/4)Q
On Tue, Jun 11, 2019 at 04:22:32PM -0400, Jeff Hostetler wrote:
> As for going forward, I see 3 options:
>
> [1] update your tests to allow this. (I didn't dig thru your
> tests to see how extensive this might be.)
>
> [2] define your own version of common-main.c and link with it
> inst
On 12/06/2019 19:11, Junio C Hamano wrote:
Phillip Wood writes:
Thanks for the new version, this is looking pretty good now, just a
few comments below
I agree that this step is looking pretty good now.
I didn't check closely, but when 1/3 undergoes necessary polishing,
it may have repercuss
Hi Espen,
On Wed, 12 Jun 2019, Espen Antonsen wrote:
> I don't have any hooks, just the default sample scripts. GIT_TRACE
> doesn't show anything else.
Okay, it was just a guess.
And here is another guess: unless you impart with more details about your
test case, I guess there is little anybody
Allen:
On Wed, Jun 12, 2019 at 08:35:44AM -0500, Allen Kinzalow wrote:
> Hello,
Hi,
> I have attached the output of a "git pull" command. Suddenly we
> are unable to pull or fetch anything from our repository. It is
> temporarily fixed by deleting .git/packed-refs but quickly
> starts happening
On 2019.06.12 11:00, Junio C Hamano wrote:
> Josh Steadmon writes:
>
> > Correct the api-trace2 documentation, which lists "signal" as an
> > expected field for the signal event type, but which actually outputs
> > "signo" as the field name.
>
>
> Nice. Is this one of the findings made by your
Phillip Wood writes:
> Thanks for the new version, this is looking pretty good now, just a
> few comments below
I agree that this step is looking pretty good now.
I didn't check closely, but when 1/3 undergoes necessary polishing,
it may have repercussions on this step, though (I did see that t
During the usage of git in Buildkite we noted that git fails upon calling
git submodule foreach --recursive git reset --hardafter updating git version
to 2.22.0.
This is due to a problem with the recursive calling of git submodule--helper
itself, which is fixed in the patch below.
Morian Sonnet
From: Morian Sonnet
Calling
git submodule foreach --recursive git reset --hard
leads to an error stating that the option --hard is unknown to
submodule--helper.
Reasons:
. Above call is internally translated into
git submodule--helper foreach --recursive -- git reset --hard
. After
Josh Steadmon writes:
> Correct the api-trace2 documentation, which lists "signal" as an
> expected field for the signal event type, but which actually outputs
> "signo" as the field name.
Nice. Is this one of the findings made by your validation, by the way?
>
> Signed-off-by: Josh Steadmon
Ævar Arnfjörð Bjarmason writes:
> This reverts my commit c1ee5796dc ("test-lib: whitelist GIT_TR2_* in
> the environment", 2019-03-30), which is now redundant.
>
> Since e4b75d6a1d ("trace2: rename environment variables to
> GIT_TRACE2*", 2019-05-19) the GIT_TRACE2* variables match the existing
Derrick Stolee writes:
>> (this branch uses ds/commit-graph-write-refactor; is tangled with
>> ds/close-object-store.)
>
> Sorry for the tangle here. I'll place the proper use of
> close_commit_graph(struct raw_object_store *) into my changes
> in the next version.
FWIW, "tangled" is no bad th
Nguyễn Thái Ngọc Duy writes:
> "git --git-completion-helper" could fail if the command checks for
> a repo before parse_options(). If the result is cached, later on when
> the user moves to a worktree with repo, tab completion will still fail.
>
> Avoid this by detecting errors and not cache th
Scott Johnson writes:
> I occasionally rebase my submodules. I realize the danger (historical
> submodule pointers could point to commits that get garbage-collected away) so
> I always create and push a tag before the rebase, to make sure the old
> commits will never get purged. I believe this
On Tue, Jun 11, 2019 at 12:12 PM SZEDER Gábor wrote:
>
> On Tue, Jun 11, 2019 at 10:23:24AM +0200, Christian Couder wrote:
> > diff --git a/t/t0016-oidmap.sh b/t/t0016-oidmap.sh
> > new file mode 100755
> > index 00..cbd2cb71d6
> > --- /dev/null
> > +++ b/t/t0016-oidmap.sh
> > @@ -0,0 +1,1
Am 12.06.19 um 17:03 schrieb Shawn Landden:
> If a patch has been applied upstream AND THEN reverted, rebase still
> drops the patch, requiring the use of relative rebase git rebase -i
> HEAD~5 et cetera.
>
> git rebase should detect reverts as well.
You have the same patch that upstream has. Per
Fix that anti-pattern by a sequence of echo and test_cmp.
The patch was generated with this command:
sed -i -e '/test.*(cat/s/^\(\t*\)test "..cat \(.*\))" =
\(".*"\)\(.*\)/\1echo \3 >expect \&\&\n\1test_cmp expect \2\4/'
t7610-mergetool.sh
This helps on Windows, where test_cmp avoids spawni
git-mergetool spawns an enormous amount of processes. For this reason,
the test script, t7610, is exceptionally slow, in particular, on
Windows. Most of the processes are invocations of git. There are
also some that can be replaced with shell builtins. Avoid repeated
calls of `git ls-files` and `aw
git-mergetool spawns an enormous amount of processes. For this reason,
the test script, t7610, is exceptionally slow, in particular, on
Windows. Most of the processes are invocations of git. There are
also some that can be replaced with shell builtins. Do so with `expr`.
Signed-off-by: Johannes Si
Subshells for pipelines are not required. This can save a number of
processes (if the shell does not optimize it away anyway).
The patch was generated with the command
sed -i 's/( *\(yes.*[^ ]\) *) *\&\&/\1 \&\&/' t7610-mergetool.sh
with a manual fixup of the case having no && at the end.
Si
git-mergetool spawns an enormous amount of processes. For this reason,
the test script, t7610, is exceptionally slow, in particular, on
Windows. Most of the processes are invocations of git. There are
also some that can be replaced with shell builtins.
I've measured the number of processes and the
On 2019.06.12 15:28, Ævar Arnfjörð Bjarmason wrote:
>
> On Wed, Jun 12 2019, Josh Steadmon wrote:
>
> > trace_schema_validator can be used to verify that trace2 event output
> > conforms to the expectations set by the API documentation and codified
> > in event_schema.json (or strict_schema.json)
Junio C Hamano writes:
> SZEDER Gábor writes:
>
>> Make sure that the previously displayed "Rebasing (N/M)" line is
>> cleared by using the term_clear_line() helper function added in the
>> previous patch.
>>
>> A couple of other rebase commands print similar messages, e.g.
>> "Stopped at ... "
Hi Rohit
On 11/06/2019 08:31, Rohit Ashiwal wrote:
The previous commit introduced a --skip flag for cherry-pick and
revert. Update the advice messages, to tell users about this less
cumbersome way of skipping commits. Also add tests to ensure
everything is working fine.
Signed-off-by: Rohit Ash
If a patch has been applied upstream AND THEN reverted, rebase still
drops the patch, requiring the use of relative rebase git rebase -i
HEAD~5 et cetera.
git rebase should detect reverts as well.
-Shawn Landden
On Tue, Jun 11, 2019 at 05:37:16PM -0700, Matthew DeVore wrote:
> On Tue, Jun 11, 2019 at 02:48:51PM -0700, Junio C Hamano wrote:
> > Matthew DeVore writes:
> >
> > >> It is brittle because callers are bound to forget doing "if
> > >> (!x->buf.buf) lazy_init(&x->buf)" at some point, and blindly u
This reverts my commit c1ee5796dc ("test-lib: whitelist GIT_TR2_* in
the environment", 2019-03-30), which is now redundant.
Since e4b75d6a1d ("trace2: rename environment variables to
GIT_TRACE2*", 2019-05-19) the GIT_TRACE2* variables match the existing
GIT_TRACE* pattern added in 95a1d12e9b ("tes
On Tue, 2019-06-11 at 23:48 +, brian m. carlson wrote:
> Also, some people install Git into their home directories, and a
> shared library means that they'll have to use LD_LIBRARY_PATH (or
> equivalent) to run Git.
I don't have strong feeling about .so's although obviously less disk
space use
Hello,
I have attached the output of a "git pull" command. Suddenly we are
unable to pull or fetch anything from our repository. It is temporarily
fixed by deleting .git/packed-refs but quickly starts happening again.
I have attached the output of where it stops execution. We are unsure as
t
Hi Rohit
Thanks for the new version, this is looking pretty good now, just a few
comments below
On 11/06/2019 08:31, Rohit Ashiwal wrote:
git am or rebase have a --skip flag to skip the current commit if the
user wishes to do so. During a cherry-pick or revert a user could
likewise skip a com
From: Derrick Stolee
The write_commit_graph() method is too complex, so we are
extracting helper functions one by one.
Extract count_distinct_commits(), which sorts the oids list, then
iterates through to find duplicates.
Signed-off-by: Derrick Stolee
---
commit-graph.c | 35 +
From: Derrick Stolee
The write_commit_graph() method is too complex, so we are
extracting helper functions one by one.
Extract write_commit_graph_file() that takes all of the information
in the context struct and writes the data to a commit-graph file.
Signed-off-by: Derrick Stolee
---
commit
From: Derrick Stolee
The write_commit_graph() method is too complex, so we are
extracting helper functions one by one.
Extract fill_oids_from_commit_hex() that reads the given commit
id list and fille the oid list in the context.
Signed-off-by: Derrick Stolee
---
commit-graph.c | 72 +
From: Derrick Stolee
The write_commit_graph() method is too complex, so we are
extracting helper functions one by one.
This extracts fill_oids_from_packs() that reads the given
pack-file list and fills the oid list in the context.
Signed-off-by: Derrick Stolee
---
commit-graph.c | 83
From: Derrick Stolee
The write_commit_graph() method is too complex, so we are
extracting helper functions one by one.
Extract fill_oids_from_all_packs() that reads all pack-files
for commits and fills the oid list in the context.
Signed-off-by: Derrick Stolee
---
commit-graph.c | 26
From: Derrick Stolee
The write_commit_graph() and write_commit_graph_reachable() methods
currently take two boolean parameters: 'append' and 'report_progress'.
As we update these methods, adding more parameters this way becomes
cluttered and hard to maintain.
Collapse these parameters into a 'fl
From: Derrick Stolee
The write_commit_graph() method is too complex, so we are
extracting helper functions one by one.
Extract copy_oids_to_commits(), which fills the commits list
with the distinct commits from the oids list. During this loop,
it also counts the number of "extra" edges from octo
This series replaces ds/commit-graph-file-v2, and I'm using the same
gitgitgadget PR to continue the version numbers and hopefully make that
clear. This is a slight modification on patches 1-11 from the incremental
file format RFC [0].
The commit-graph feature is growing, thanks to all of the cont
From: Derrick Stolee
The write_commit_graph() method is too large and complex. To simplify
it, we should extract several helper functions. However, we will risk
repeating a lot of declarations related to progress incidators and
object id or commit lists.
Create a new write_commit_graph_context s
From: Derrick Stolee
The parse_commit_buffer() method takes a repository pointer, so it
should not refer to the_repository anymore.
Signed-off-by: Derrick Stolee
---
commit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/commit.c b/commit.c
index a5333c7ac6..e4d1233226 10
From: Derrick Stolee
The commit-graph feature began with a long list of planned
benefits, most of which are now complete. The future work
section has only a few items left.
As for making more algorithms aware of generation numbers,
some are only waiting for generation number v2 to ensure the
per
From: Derrick Stolee
The write_commit_graph() method uses die() to report failure and
exit when confronted with an unexpected condition. This use of
die() in a library function is incorrect and is now replaced by
error() statements and an int return type. Return zero on success
and a negative val
On Wed, Jun 12 2019, Josh Steadmon wrote:
> trace_schema_validator can be used to verify that trace2 event output
> conforms to the expectations set by the API documentation and codified
> in event_schema.json (or strict_schema.json). This allows us to build a
> regression test to verify that tr
On 6/6/2019 3:57 PM, Junio C Hamano wrote:
> * ds/commit-graph-incremental (2019-06-06) 15 commits
> - SQUASH??? 5323 is already taken
> - commit-graph: clean up chains after flattened write
> - commit-graph: verify chains with --shallow mode
> - commit-graph: create options for split files
>
I don't have any hooks, just the default sample scripts. GIT_TRACE doesn't show
anything else.
On Tue, 11 Jun 2019, at 21:28, Johannes Schindelin wrote:
> Hi Espen,
>
> On Tue, 11 Jun 2019, Espen Antonsen wrote:
>
> > Seeing an error after upgrading to git v2.22.0.
> >
> > git status shows “err
Hello,
I am trying to checkout out various 3rd party Git projects on Linux
and build them.
Some of them have text files created under Windows with CRLF endings
and it is not under my responsibility to change it.
Thus I have to force LF line ending for Git checkout (regardless of
which line ending
On Wed, Jun 12, 2019 at 11:41:10AM +0200, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Jun 11 2019, Elmar Pruesse wrote:
> > The total compiled size of libexec/git-core is currently somewhere
> > around 30 MB. This is largely due to a number of binaries linking
> > statically against libgit.a. For some
On Wed, Jun 12, 2019 at 4:42 PM Ævar Arnfjörð Bjarmason
wrote:
> I.e. we'd just have one git binary, everything else symlinking to that,
> and we'd route to the right program by inspecting argv, which we mostly
> do already.
If I remember correctly libcurl.so startup time was the reason it's
spli
Mijn naam is Eddy William. Ik ben van beroep advocaat. Ik wil je aanbieden
nabestaanden van mijn cliënt. Je ervaart de som van ($ 14,2 miljoen)
dollars die mijn cliënt voor zijn overlijden op de bank heeft achtergelaten.
Mijn klant is een burger van jouw land die stierf in auto-ongeluk met zijn vr
On Tue, Jun 11 2019, Elmar Pruesse wrote:
> Hi!
>
> The total compiled size of libexec/git-core is currently somewhere
> around 30 MB. This is largely due to a number of binaries linking
> statically against libgit.a. For some folks, every byte counts. I
> meddled with the Makefile briefly to ma
On Wed, Jun 12, 2019 at 2:11 PM brian m. carlson
wrote:
>
> On 2019-06-11 at 19:52:18, Elmar Pruesse wrote:
> > Hi!
> >
> > The total compiled size of libexec/git-core is currently somewhere
> > around 30 MB. This is largely due to a number of binaries linking
> > statically against libgit.a. For
From: Phillip Wood
Commit fecc6f3a68 ("add -p: adjust offsets of subsequent hunks when one is
skipped", 2018-03-01) fixed adding hunks in the correct place when a
previous hunk has been skipped. However it did not address patches that
are applied in reverse. In that case we need to adjust the pre
When I fixed the hunk offsets in add -p when hunks are skipped I forgot that
the reverse patch case needs to be handled differently.
Phillip Wood (1):
add -p: fix checkout -p with pathological context
git-add--interactive.perl | 6 +-
t/t3701-add-interactive.sh | 8
2 files chang
On Fri, Jun 7, 2019 at 3:19 AM Junio C Hamano wrote:
> * nd/switch-and-restore (2019-05-07) 43 commits
> - Declare both git-switch and git-restore experimental
> - help: move git-diff and git-reset to different groups
> - doc: promote "git restore"
> - user-manual.txt: prefer 'merge --abort' o
"git --git-completion-helper" could fail if the command checks for
a repo before parse_options(). If the result is cached, later on when
the user moves to a worktree with repo, tab completion will still fail.
Avoid this by detecting errors and not cache the completion output. We
can try again and
On Sat, Jun 8, 2019 at 12:33 AM Felipe Contreras
wrote:
>
> On Fri, Jun 7, 2019 at 5:02 AM SZEDER Gábor wrote:
> >
> > On Fri, Jun 07, 2019 at 04:30:34PM +0700, Nguyễn Thái Ngọc Duy wrote:
> > > "git --git-completion-helper" could fail if the command checks for
> > > a repo before parse_options(
67 matches
Mail list logo
