On Thu, Aug 23, 2018 at 11:30:54AM -0700, Junio C Hamano wrote:
> > Now here's the tricky part. I think patches 1-8 are mostly sensible.
>
> Yeah, nothing that made me go "Huh?" in these 8 patches. Thanks.
>
> > So I think there may be further opportunities for cleanup here. I'm not
> > sure if
On Fri, Aug 24 2018, Jeff King wrote:
> On Thu, Aug 23, 2018 at 04:59:27PM -0400, Derrick Stolee wrote:
>
>> Using git/git:
>>
>> Test v2.18.0 v2.19.0-rc0 HEAD
>> -
>> 0001.2: 3.10(3.02+0.08) 3.27(3.17+0.09) +5.5% 3.14(3.02+
On 8/24/2018 2:45 AM, Jeff King wrote:
On Thu, Aug 23, 2018 at 10:59:55PM -0400, Jeff King wrote:
So I think we have a winner. I'll polish that up into patches and send
it out later tonight.
Oof. This rabbit hole keeps going deeper and deeper. I wrote up my
coccinelle findings separately in:
On Fri, 24 Aug 2018, Jeff King wrote:
> In Git's Coccinelle patches, we sometimes want to suppress a
> transformation inside a particular function. For example, in finding
> conversions of hashcmp() to oidcmp(), we should not convert the call in
> oidcmp() itself, since that would cause infinit
Team,
while this mail talks about Git for Windows, please keep in mind that we
try *very* hard to keep Git for Windows' master working correctly not only
on Windows but also on macOS and Linux.
I, for one, run Git built from Git for Windows' `master` branch in my
Linux VMs all the time.
As all o
Hi everybody,
I'm currently looking into more aggressively sharing space between multiple
repositories,
and into getting them to share again after one did a repack (which costs us 15G
space).
One thing I stumbled on is the /proc/sys/fs/protected_hardlinks stuff which
disallows
hardlinking pack
Tests 5 and 7 in t/t7411-submodule-config.sh add two commits with
invalid lines in .gitmodules but then only the second commit is removed.
This may affect future subsequent tests if they assume that the
.gitmodules file has no errors.
Remove both the commits as soon as they are not needed anymore
When the .gitmodules file is not available in the working tree, try
using the content from the index and from the current branch. This
covers the case when the file is part of the repository but for some
reason it is not checked out, for example because of a sparse checkout.
This makes it possible
Use the 'submodule--helper config' command in git-submodules.sh to avoid
referring explicitly to .gitmodules by the hardcoded file path.
This makes it possible to access the submodules configuration in a more
controlled way.
Signed-off-by: Antonio Ospite
---
git-submodule.sh | 8
1 fil
Introduce a new config_set_in_gitmodules_file_gently() function to write
config values to the .gitmodules file.
This is in preparation for a future change which will use the function
to write to the .gitmodules file in a more controlled way instead of
using "git config -f .gitmodules".
The purpos
Introduce a helper function named is_writing_gitmodules_ok() to verify
that the .gitmodules file is safe to write.
The function name follows the scheme of is_staging_gitmodules_ok().
The two symbolic constants GITMODULES_INDEX and GITMODULES_HEAD are used
to get help from the C preprocessor in pr
Tests 5 and 6 check for the effects of the same commit, merge the two
tests to make it more straightforward to clean things up after the test
has finished.
The cleanup will be added in a future commit.
Signed-off-by: Antonio Ospite
---
t/t7411-submodule-config.sh | 18 +-
1 file
Add a new 'config' subcommand to 'submodule--helper', this extra level
of indirection makes it possible to add some flexibility to how the
submodules configuration is handled.
Signed-off-by: Antonio Ospite
---
builtin/submodule--helper.c | 14 ++
t/t7411-submodule-config.sh | 27
Hi,
this series teaches git to try and read the .gitmodules file from the
index (:.gitmodules) and the current branch (HEAD:.gitmodules) when it
is not readily available in the working tree.
This can be used, together with sparse checkouts, to enable submodule
usage with programs like vcsh[1] whi
Add a new print_config_from_gitmodules() helper function to print values
from .gitmodules just like "git config -f .gitmodules" would.
This will be used by a new submodule--helper subcommand to be able to
access the .gitmodules file in a more controlled way.
Signed-off-by: Antonio Ospite
---
su
In t/t7506-status-submodule.sh at some point a new scenario is set up to
test different things, in particular new submodules are added which are
meant to completely replace the previous ones.
However before calling the "git submodule add" commands for the new
layout, the .gitmodules file is remove
On 8/23/2018 4:44 PM, Junio C Hamano wrote:
Ævar Arnfjörð Bjarmason writes:
The --file option to grep isn't in POSIX[1], but -f is[1]. Let's check
for that in the future, and fix the portability regression in
f237c8b6fe ("commit-graph: implement git-commit-graph write",
2018-04-02) that broke
Vďaka
Ahoj! Tento list som vám poslal pred 2 dňami, ale nie som si istý
dostane sa to, a preto ju opakujem znova. prosím,
Vráťte sa na mňa, kde nájdete viac informácií.
S pozdravom,
michelle
On Fri, Aug 24 2018, Antonio Ospite wrote:
> Add a new print_config_from_gitmodules() helper function to print values
> from .gitmodules just like "git config -f .gitmodules" would.
>
> This will be used by a new submodule--helper subcommand to be able to
> access the .gitmodules file in a more
On Fri, Aug 24 2018, Antonio Ospite wrote:
> this series teaches git to try and read the .gitmodules file from the
> index (:.gitmodules) and the current branch (HEAD:.gitmodules) when it
> is not readily available in the working tree.
FWIW I didn't read any of the earlier series's, and I'm not
On Fri, Aug 24, 2018 at 5:02 AM Jacob Keller wrote:
>
> On Thu, Aug 23, 2018 at 9:28 AM Junio C Hamano wrote:
> > I think the above example forgets "-a" on the final "git commit"
> > step. With it added, I can understand the concern (and I am sure
> > you would, too).
> >
> > The user is trying
Jeff, you're doing crazy things beyond my (admittedly very limited)
imagination :P I did not see this at all when I implemented the
worktree stuff.
On Thu, Aug 23, 2018 at 8:21 PM Eric Sunshine wrote:
> > > In this case, it might make sense for "git worktree add" to refuse to
> > > operate if an
On Fri, Aug 24 2018, Andreas Krey wrote:
> I'm currently looking into more aggressively sharing space between multiple
> repositories,
> and into getting them to share again after one did a repack (which costs us
> 15G space).
>
> One thing I stumbled on is the /proc/sys/fs/protected_hardlinks
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
This, in combination with the previous fix to this file makes
GIT_TEST_CHAIN_LINT=1 (which is the default) working again on
The --file option to grep isn't in POSIX[1], but -f is[1]. Let's check
for that in the future, and fix the portability regression in
f237c8b6fe ("commit-graph: implement git-commit-graph write",
2018-04-02) that broke e.g. AIX.
1. http://pubs.opengroup.org/onlinepubs/009695399/utilities/grep.html
Change a comment in chainlint.sed to appease AIX sed, which would
previously print this error:
sed:# stash for later printing is not a recognized function
1.
https://public-inbox.org/git/CAPig+cTTbU5HFMKgNyrxTp3+kcK46-Fn=4zh6zdt1oqchac...@mail.gmail.com/
Signed-off-by: Ævar Arnfjörð Bja
On Thu, Aug 23 2018, Eric Sunshine wrote:
> On Thu, Aug 23, 2018 at 4:36 PM Ævar Arnfjörð Bjarmason
> wrote:
>> As noted in [1] there's still a remaining recently introduced
>> portability issue also introduced in 878f988350 ("t/test-lib: teach
>> --chain-lint to detect broken &&-chains in subshe
The "head -c BYTES" option is non-portable (not in POSIX[1]). Change
such invocations to use the test_copy_bytes wrapper added in
48860819e8 ("t9300: factor out portable "head -c" replacement",
2016-06-30).
This fixes a test added in 9d2e330b17 ("ewah_read_mmap: bounds-check
mmap reads", 2018-06-1
The seq command is not in POSIX, and doesn't exist on
e.g. OpenBSD. We've had the test_seq wrapper since d17cf5f3a3 ("tests:
Introduce test_seq", 2012-08-04), but use of it keeps coming back,
e.g. in the recently added "fetch negotiator" tests being added here.
So let's also add a check to "make t
The test guarded by PERLJSON added in 75459410ed ("json_writer: new
routines to create JSON data", 2018-07-13) assumed that a JSON boolean
value like "true" or "false" would be represented as "1" or "0" in
Perl.
This behavior can't be relied upon, e.g. with JSON.pm 2.50 and
JSON::PP A JSON::PP::Bo
Hi Junio,
Le 21/08/2018 à 00:15, Junio C Hamano a écrit :
> * ag/rebase-i-in-c (2018-08-10) 20 commits
> - rebase -i: move rebase--helper modes to rebase--interactive
> - rebase -i: remove git-rebase--interactive.sh
> - rebase--interactive2: rewrite the submodes of interactive rebase in C
> -
Since we're cutting corners to speed things up, could you try
something like this?
I notice that reading v4 is significantly slower than v2 and
apparently strlen() (at least from glibc) is much cleverer and at
least gives me a few percentage time saving.
diff --git a/read-cache.c b/read-cache.c
i
On Fri, Aug 24, 2018 at 05:37:20PM +0200, Duy Nguyen wrote:
> Since we're cutting corners to speed things up, could you try
> something like this?
>
> I notice that reading v4 is significantly slower than v2 and
> apparently strlen() (at least from glibc) is much cleverer and at
> least gives me a
Hi,
On Wed, 8 Aug 2018, Pratik Karki wrote:
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 42ee040da3..fd9ad8efae 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -588,6 +607,8 @@ int cmd_rebase(int argc, const char **argv, const char
> *prefix)
>
Hi Duy,
On Sat, 18 Aug 2018, Duy Nguyen wrote:
> On Wed, Aug 8, 2018 at 5:26 PM Pratik Karki wrote:
> > @@ -224,13 +219,56 @@ static int read_basic_state(struct rebase_options
> > *opts)
> > return 0;
> > }
> >
> > +static int apply_autostash(struct rebase_options *opts)
> > +{
> > +
Hi Stefan,
On Wed, 8 Aug 2018, Stefan Beller wrote:
> On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote:
>
> > @@ -551,10 +560,21 @@ int cmd_rebase(int argc, const char **argv, const
> > char *prefix)
> [...]
> > ; /* be quiet */
> > else if (!strcmp(bra
Hi Stefan,
On Wed, 8 Aug 2018, Stefan Beller wrote:
> On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote:
> >
> > diff --git a/builtin/rebase.c b/builtin/rebase.c
> > index 8a7bf3d468..a261f552f1 100644
> > --- a/builtin/rebase.c
> > +++ b/builtin/rebase.c
> > @@ -455,6 +481,26 @@ int cmd_rebase(
--
Dear Assalamu Alaikum,
I came across your contact during my private search
Mrs Aisha Al-Qaddafi is my name, the only daughter of late Libyan
president, I have funds the sum
of $27.5 million USD for investment, I am interested in you for
investment project assistance in your country,
i shall c
Hi Junio,
On Wed, 8 Aug 2018, Junio C Hamano wrote:
> Pratik Karki writes:
>
> > The `--onto` option is important, as it allows to rebase a range of
> > commits onto a different base commit (which gave the command its odd
> > name: "rebase").
>
> Is there anything unimportant? A rhetorical qu
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
As discussed here:
https://stackoverflow.com/questions/30542491/push-force-with-lease-by-default
Now, I underst
Team,
On Fri, 24 Aug 2018, Johannes Schindelin wrote:
> while this mail talks about Git for Windows, please keep in mind that we
> try *very* hard to keep Git for Windows' master working correctly not only
> on Windows but also on macOS and Linux.
>
> I, for one, run Git built from Git for Windo
On 8/23/2018 4:59 PM, Derrick Stolee wrote:
When I choose my own metrics for performance tests, I like to run at
least 10 runs, remove the largest AND smallest runs from the samples,
and then take the average. I did this manually for 'git rev-list --all
--objects' on git/git and got the follo
On Fri, 24 Aug 2018 16:32:38 +0200
Ævar Arnfjörð Bjarmason wrote:
>
> On Fri, Aug 24 2018, Antonio Ospite wrote:
[...]
> > +static int config_print_callback(const char *key_, const char *value_,
> > void *cb_data)
> > +{
> > + char *key = cb_data;
> > +
> > + if (!strcmp(key, key_))
> > +
On 8/24/2018 11:57 AM, Duy Nguyen wrote:
On Fri, Aug 24, 2018 at 05:37:20PM +0200, Duy Nguyen wrote:
Since we're cutting corners to speed things up, could you try
something like this?
I notice that reading v4 is significantly slower than v2 and
apparently strlen() (at least from glibc) is mu
On Fri, Aug 24, 2018 at 5:37 PM Duy Nguyen wrote:
> On Thu, Aug 23, 2018 at 10:36 PM Ben Peart wrote:
> > > Nice to see this done without a new index extension that records
> > > offsets, so that we can load existing index files in parallel.
> > >
> >
> > Yes, I prefer this simpler model as well.
On Thu, Aug 23, 2018 at 7:33 PM Stefan Beller wrote:
> > +core.fastIndex::
> > + Enable parallel index loading
> > ++
> > +This can speed up operations like 'git diff' and 'git status' especially
> > +when the index is very large. When enabled, Git will do the index
> > +loading from the on
On 8/24/2018 2:20 PM, Duy Nguyen wrote:
On Fri, Aug 24, 2018 at 5:37 PM Duy Nguyen wrote:
On Thu, Aug 23, 2018 at 10:36 PM Ben Peart wrote:
Nice to see this done without a new index extension that records
offsets, so that we can load existing index files in parallel.
Yes, I prefer this
On Fri, Aug 24, 2018 at 8:40 PM Ben Peart wrote:
>
>
>
> On 8/24/2018 2:20 PM, Duy Nguyen wrote:
> > On Fri, Aug 24, 2018 at 5:37 PM Duy Nguyen wrote:
> >> On Thu, Aug 23, 2018 at 10:36 PM Ben Peart wrote:
> Nice to see this done without a new index extension that records
> offsets, so
On 8/24/2018 3:00 PM, Duy Nguyen wrote:
On Fri, Aug 24, 2018 at 8:40 PM Ben Peart wrote:
On 8/24/2018 2:20 PM, Duy Nguyen wrote:
On Fri, Aug 24, 2018 at 5:37 PM Duy Nguyen wrote:
On Thu, Aug 23, 2018 at 10:36 PM Ben Peart wrote:
Nice to see this done without a new index extension tha
On Fri, 24 Aug 2018 16:48:37 +, Ævar Arnfjörð Bjarmason wrote:
...
> I don't understand how this hardlink approach would work (doesn't mean
> it won't, just that I don't get it).
I just detect whether there is insufficient sharing (df is quite handy
here; 'df this/.git that/.git' tells the uns
On Fri, Aug 24, 2018 at 11:20 AM Ævar Arnfjörð Bjarmason
wrote:
> The test guarded by PERLJSON added in 75459410ed ("json_writer: new
> routines to create JSON data", 2018-07-13) assumed that a JSON boolean
> value like "true" or "false" would be represented as "1" or "0" in
> Perl.
>
> This behav
On Fri, Aug 24, 2018 at 11:20 AM Ævar Arnfjörð Bjarmason
wrote:
> Change a comment in chainlint.sed to appease AIX sed, which would
> previously print this error:
>
> sed:# stash for later printing is not a recognized function
>
> 1.
> https://public-inbox.org/git/CAPig+cTTbU5HFMKgNyrxTp3
On Fri, Aug 24, 2018 at 11:20 AM Ævar Arnfjörð Bjarmason
wrote:
> 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
Shortening the names makes them ugly and often unr
On 08/22, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > Hmm, it does describe what happens in the code, which is what this
> > patch implements. Maybe we should rephrase the title here?
> >
> > Or are you suggesting dropping this patch (and the next one)
> > completely, as we don't want
4af32207bc ("rerere: teach rerere to handle nested conflicts",
2018-08-05) introduced slightly better behaviour if the user commits
conflict markers and then gets another conflict in 'git rerere'.
However this is just a heuristic to punt on such conflicts better, and
the documentation might be misl
When a file contains lines that look like conflict markers, 'git
rerere' may fail not be able to record a conflict resolution.
Emphasize that in the man page.
Helped-by: Junio C Hamano
Signed-off-by: Thomas Gummerer
---
Not sure if there may be a better place in the man page for this, but
this
On Fri, Aug 24, 2018 at 5:14 AM Johannes Schindelin
wrote:
>
> For that reason, I was delighted to see that our Google Summer of Code
> pushed pretty hard in that direction. And I could not help myself so I had
> to test how much faster things got. Here is the result of my first, really
> quick an
On Fri, Aug 24, 2018 at 10:47 AM Duy Nguyen wrote:
> On Thu, Aug 23, 2018 at 8:21 PM Eric Sunshine wrote:
> > Peff wrote:
> > > Yes, but then what's the next step for my script? I can't "remove" since
> > > the worktree isn't there. I can't blow away any directory that I know
> > > about, since t
On Fri, Aug 24, 2018 at 7:42 AM Duy Nguyen wrote:
>
> On Fri, Aug 24, 2018 at 5:02 AM Jacob Keller wrote:
> >
> > On Thu, Aug 23, 2018 at 9:28 AM Junio C Hamano wrote:
> > > I think the above example forgets "-a" on the final "git commit"
> > > step. With it added, I can understand the concern
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:
> > On Thu, Aug 23, 2018 at 8:21 PM Eric Sunshine
> > wrote:
> > > Peff wrote:
> > > > Yes, but then what's the next step for my script? I can't "remove" since
> > > > the worktre
Dear Sir/Madam,
We "VASUGANNEFT LLC" is an official registered
Representatives/Mandate Company, on behalf of our End
Seller/Refinery Company; offer oil products from the leading
companies in the Russian Federation producing the highest quality
of Petroleum products e.g.
*MAZUT M100 GOST -105
Index format v4 requires some more computation to assemble a path
based on a previous one. The current code is not very efficient
because
- it doubles memory copy, we assemble the final path in a temporary
first before putting it back to a cache_entry
- strbuf_remove() in expand_name_field()
62 matches
Mail list logo
