On Tue, Apr 11, 2017 at 12:13 AM, Jeff King wrote:
> On Mon, Apr 10, 2017 at 07:01:00PM +0700, Duy Nguyen wrote:
>> An alternative is, when you have found out you need to read .mailmap,
>> you call setup_work_tree() then, which prepares the worktree for you
>> (including moving back to cwd) or die
On Wed, Apr 12, 2017 at 8:43 AM, Michael J Gruber wrote:
> Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason"
> :
>>On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu
>> wrote:
Well, what do you suggest as an alternative?
Git tells you that you are in detached state an
Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason"
:
>On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu
> wrote:
>>> Well, what do you suggest as an alternative?
>>>
>>> Git tells you that you are in detached state and where you came from
>>> (detached from).
>>
>> I think it'd be be
On 2017-04-11 21:50, Lars Schneider wrote:
[]
>> packet: git> command=smudge
>> packet: git> pathname=path/testfile.dat
>> packet: git> delay-id=1
>> packet: git>
>> packet: git> CONTENT
>> packet: git>
>> packet: git< status
g...@jeffhostetler.com writes:
> From: Jeff Hostetler
>
> Teach add_index_entry_with_check() and has_dir_name()
> to see if the path of the new item is greater than the
> last path in the index array before attempting to search
> for it.
>
> During checkout, merge_working_tree() populates the new
Jeff King writes:
>> The only unresolved issue was whether we can count on curl being new
>> enough for CURLOPT_POSTFIELDSIZE_LARGE to be present. I say
>> "unresolved" but it is resolved in my mind since git doesn't build and
>> pass tests with such old versions of curl --- what's unresolved is
On Wed, Apr 12, 2017 at 02:27:05AM +0200, SZEDER Gábor wrote:
> >> I wonder if you could make it a general test-lib function, like:
> >>
> >> run_and_wait () {
> >> # we read stdout from the child only for the side effect
> >> # of waiting until all child sub-processes exit, clos
On Tue, Apr 11, 2017 at 10:35:17PM +0100, Julian Goacher wrote:
> Thanks for the replies; is there anything that needs to be known about
> concurrent updates on a repo when using plumbing commands?
Concurrent writes to the object database are always safe (so
hash-object, write-tree, commit-tree a
On Tue, Apr 11, 2017 at 03:47:13PM -0700, Jonathan Nieder wrote:
> Junio C Hamano wrote:
>
> > * jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
> > (merged to 'next' on 2017-02-27 at 7373a1b73d)
> > + setup_git_env: avoid blind fall-back to ".git"
> >
> > This is the endgame
From: Jacob Keller
Since commit e77aa336f116 ("ls-files: optionally recurse into
submodules", 2016-10-07) ls-files has known how to recurse into
submodules when displaying files.
Unfortunately this code does not work as expected. Initially, it
produced results indicating that a --super-prefix ca
On Tue, Apr 11, 2017 at 11:32 PM, Johannes Sixt wrote:
> Am 10.04.2017 um 19:01 schrieb Jeff King:
>>
>> I wonder if you could make it a general test-lib function, like:
>>
>> run_and_wait () {
>> # we read stdout from the child only for the side effect
>> # of waiting until all
Now that the BIG one has landed, e394fa01d6 (Merge branch
'sb/checkout-recurse-submodules', 2017-03-28), you would expect that
teaching to recurse into submodules is easy for all the remaining
working tree manipulations?
It turns out it is. See the last patch how we teach git-reset to recurse
int
In case of a non-forced worktree update, the submodule movement is tested
in a dry run first, such that it doesn't matter if the actual update is
done via the force flag. However for correctness, we want to give the
flag is specified by the user. All callers have been inspected and updated
if neede
Early on in submodule_move_head just after the check if the submodule is
initialized, we need to check if the submodule is populated correctly.
If the submodule is initialized but doesn't look like populated, this
is a red flag and can indicate multiple sorts of failures:
(1) The submodule may be
git-reset is yet another working tree manipulator, which should
be taught about submodules.
One use case of "git-reset" is to reset to a known good state,
and dropping commits that did not work as expected.
In that case one of the expected outcomes from a hard reset
would be to have broken submodu
This was an oversight when working on the working tree modifying commands
recursing into submodules.
To test for uninitialized submodules, introduce another submodule, that is
uninitialized in the actual tests. By adding it to the branch "add_sub1",
which is the starting point of all other branche
Sehr geehrter Begünstigter,
Ich bin Faith Smith (Frau), der Chief Finance Officer zu unterstützen
Sie in Ihrem Anspruchsvorgang. Ich möchte Ihnen gratulieren, dass Sie ein
Begünstigter in diesem 2017 Katar Stiftung / Europäische Union (EU)
Entschädigungseinheit. Um mit der Verarbeitung zu beginne
Junio C Hamano wrote:
> * jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
> (merged to 'next' on 2017-02-27 at 7373a1b73d)
> + setup_git_env: avoid blind fall-back to ".git"
>
> This is the endgame of the topic to avoid blindly falling back to
> ".git" when the setup sequence
Sehr geehrter Begünstigter,
Ich bin Faith Smith (Frau), der Chief Finance Officer zu unterstützen
Sie in Ihrem Anspruchsvorgang. Ich möchte Ihnen gratulieren, dass Sie ein
Begünstigter in diesem 2017 Katar Stiftung / Europäische Union (EU)
Entschädigungseinheit. Um mit der Verarbeitung zu beginne
> -Original Message-
> From: Duy Nguyen [mailto:pclo...@gmail.com]
> Sent: Monday, April 10, 2017 4:24 AM
> To: Kevin Willford
> Cc: git@vger.kernel.org; gits...@pobox.com; p...@peff.net; Kevin Willford
>
> Subject: Re: [PATCH 3/3] reset.c: update files when using sparse to avoid
> data l
Lieber Webmail User,
Wegen des überschüssigen aufgegebenen Webmail-Kontos hat sich unser Webmaster
entschieden
Aktualisieren Sie die Datenbank und löschen Sie inaktive Konten, um Platz zu
schaffen
Für frische Benutzer. Um Ihr Webmail-Konto zu überprüfen, müssen Sie darauf
antworten
Diese E-Mail
Hi,
Jonathan Tan wrote:
> Currently, fetch-pack prints a confusing error message ("expected
> ACK/NAK") when the server it's communicating with sends a pkt-line
> starting with "ERR". Replace it with a less confusing error message.
Yay!
> (Git will send "ERR" lines when a "want" line reference
Thanks for the replies; is there anything that needs to be known about
concurrent updates on a repo when using plumbing commands?
On 10 April 2017 at 19:22, Eric Wong wrote:
> Julian Goacher wrote:
>> Is it possible to modify a bare repo directly? e.g. is it possible to
>> insert a file into a b
Hi,
Jeff Hostetler wrote:
> Signed-off-by: Jeff Hostetler
Usually the commit message is a place to put some of the motivation
behind the patch or why I should want to apply it. In this example,
everything is answered by the previous patch, which suggests that it
would be easier to understand
Am 10.04.2017 um 19:01 schrieb Jeff King:
I wonder if you could make it a general test-lib function, like:
run_and_wait () {
# we read stdout from the child only for the side effect
# of waiting until all child sub-processes exit, closing their
# fd 9.
does_not_
g...@jeffhostetler.com wrote:
> During status on a very large repo and there are many changes,
> a significant percentage of the total run time is spent
> reallocing the wt_status.changes array.
>
> This change decreases the time in wt_status_collect_changes_worktree()
> from 125 seconds to 45 sec
When fd47ae6a5b (diff: teach diff to display submodule difference with an
inline diff, 2016-08-31) was introduced, we did not think of recursing
into nested submodules.
When showing the inline diff for submodules, automatically recurse
into nested submodules as well with inline submodule diffs.
S
On Tue, Apr 11, 2017 at 10:34 PM, Jeff King wrote:
> On Tue, Apr 11, 2017 at 10:20:59PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> I'm struggling to find a use-case where threading makes sense at all.
>> The example in the initial introduction in 5b594f457a is always slower
>> with >0 for me, and
On Tue, Apr 11, 2017 at 8:37 PM, Jeff King wrote:
> On Tue, Apr 11, 2017 at 08:17:50PM +0300, Sergey Ryazanov wrote:
>> Earlier, the whole http.proxy option string was passed to curl without
>> any preprocessing so curl could complain about the invalid proxy
>> configuration.
>>
>> After the commi
On 4/10/2017 7:09 PM, René Scharfe wrote:
Am 10.04.2017 um 23:26 schrieb Jeff Hostetler:
On 4/8/2017 10:06 AM, René Scharfe wrote:
Am 07.04.2017 um 17:53 schrieb g...@jeffhostetler.com:
+/* implicitly borrow buf[i-1] inside tree_desc[i] */
+memcpy(&t[i], &t[i-1], size
On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu wrote:
>> Well, what do you suggest as an alternative?
>>
>> Git tells you that you are in detached state and where you came from
>> (detached from).
>
> I think it'd be best if git status somehow indicated that you're no
> longer at the same commit
On Tue, Apr 11, 2017 at 10:20:59PM +0200, Ævar Arnfjörð Bjarmason wrote:
> I'm struggling to find a use-case where threading makes sense at all.
> The example in the initial introduction in 5b594f457a is always slower
> with >0 for me, and since then in 0579f91dd7 it got disabled entirely
> for no
Curl distinguishes between an empty proxy address and a NULL proxy
address. In the first case it completely disables proxy usage, but if
the proxy address option is NULL then curl attempts to determine the
proxy address from the http_proxy environment variable.
According to the documentation, if t
Hello,
this is few patches, which fixes regressions in the proxy handling.
Both patches are based on the maint branch.
Changes since v3:
- fix grammar (thanks to Jeff)
Changes since v2:
- fix grammar (thanks to Ævar)
- add new patch which fixes the silent ignoring of proxy missconfiguration
Earlier, the whole http.proxy option string was passed to curl without
any preprocessing so curl could complain about the invalid proxy
configuration.
After the commit 372370f167 ("http: use credential API to handle proxy
authentication", 2016-01-26), if the user specified an invalid HTTP
proxy op
On Tue, Apr 11, 2017 at 12:06 PM, Jeff King wrote:
> On Sat, Apr 08, 2017 at 01:24:55PM +, Ævar Arnfjörð Bjarmason wrote:
>
>> Add the ability to entirely disable threading by having grep.threads=0
>> in the config or --threads=0 on the command-line.
>
> In pack-objects and index-pack, --threa
On Tue, Apr 11, 2017 at 08:08:00PM +, g...@jeffhostetler.com wrote:
> From: Jeff Hostetler
>
> Version 4 greatly simplifies the p0005 perf test. It now uses an existing
> repo -- either real-world or artificial from t/perf/repos/many-files.sh.
>
> Jeff Hostetler (2):
> string-list: use AL
From: Jeff Hostetler
Version 4 greatly simplifies the p0005 perf test. It now uses an existing
repo -- either real-world or artificial from t/perf/repos/many-files.sh.
Jeff Hostetler (2):
string-list: use ALLOC_GROW macro when reallocing string_list
p0005-status: time status on very large re
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
t/perf/p0005-status.sh | 51 ++
1 file changed, 51 insertions(+)
create mode 100755 t/perf/p0005-status.sh
diff --git a/t/perf/p0005-status.sh b/t/perf/p0005-status.sh
new file mode 100755
i
From: Jeff Hostetler
Use ALLOC_GROW() macro when reallocing a string_list array
rather than simply increasing it by 32. This is a performance
optimization.
During status on a very large repo and there are many changes,
a significant percentage of the total run time is spent
reallocing the wt_st
On Tue, Apr 11, 2017 at 10:01:02PM +0200, Lars Schneider wrote:
> > If you initialize errno to 0 right before a syscall, then yes, you can
> > trust it without checking the return value of the syscall. I wouldn't
> > trust it before calling more complicated functions, though. Not even
> > xwrite()
> On 11 Apr 2017, at 21:37, Jeff King wrote:
>
> On Tue, Apr 11, 2017 at 09:29:36PM +0200, Lars Schneider wrote:
>
>>> 1. Do we need to save errno before calling sigchain_pop()? It's making
>>>syscalls (though admittedly they are unlikely to fail).
>>
>> What if we add the following right
> On 10 Apr 2017, at 22:54, Torsten Bögershausen wrote:
>
> On 2017-04-09 21:11, Lars Schneider wrote:
> []
>> +
>> +packet: git> command=smudge
>> +packet: git> pathname=path/testfile.dat
>> +packet: git> delay-able=1
>> +packet: git>
When submodules are involved, it often slows down the process, as most
submodule related handling is either done via a child process or by
iterating over the index finding all gitlinks.
For most commands that may interact with submodules, we need have a
quick check if we do have any submodules at
The meat is in the second patch:
The commit 31224cbdc7 (clone: recursive and reference option triggers
submodule alternates, 2016-08-17) argued for any further `submodule update`
to respect the initial setup. This is not the case if you only pass
'--reference[-if-able]' to the initi
The commit 31224cbdc7 (clone: recursive and reference option triggers
submodule alternates, 2016-08-17) argued for any further `submodule update`
to respect the initial setup. This is not the case if you only pass
'--reference[-if-able]' to the initial clone without instructing to
recurse into subm
On Tue, Apr 11, 2017 at 11:27:40AM -0700, Jonathan Nieder wrote:
> David Turner wrote:
>
> > Unfortunately, in order to push some large repos where a server does
> > not support chunked encoding, the http postbuffer must sometimes
> > exceed two gigabytes. On a 64-bit system, this is OK: we just
On Tue, Apr 11, 2017 at 09:29:36PM +0200, Lars Schneider wrote:
> > 1. Do we need to save errno before calling sigchain_pop()? It's making
> > syscalls (though admittedly they are unlikely to fail).
>
> What if we add the following right before sigchain_pop() ?
>
> if (errno == EPIPE)
> On 11 Apr 2017, at 18:16, Jeff King wrote:
>
> On Fri, Apr 07, 2017 at 08:03:49AM -0400, Ben Peart wrote:
>
>> @@ -642,7 +621,41 @@ static struct cmd2process
>> *start_multi_file_filter(struct hashmap *hashmap, cons
>> done:
>> sigchain_pop(SIGPIPE);
>>
>> -if (err || errno == EPIP
On Tue, Apr 11, 2017 at 07:16:59PM +, g...@jeffhostetler.com wrote:
> I think this version has addressed everything raise so far,
> so I think I'm ready to let this one rest. Thanks for all
> the help and feedback.
Yeah, this addresses my nitpicks with the perf stuff. Thanks for
sticking wit
From: Jeff Hostetler
Add strcmp_offset() function to also return the offset of the
first change.
Add unit test and helper to verify.
Signed-off-by: Jeff Hostetler
---
Makefile | 1 +
cache.h | 1 +
read-cache.c | 20 +++
From: Jeff Hostetler
Created t/perf/repos/many-files.sh to generate large, but
artificial repositories.
Created t/perf/p0006-read-tree-checkout.sh to measure
performance on various read-tree, checkout, and update-index
operations. This test can run using either artificial repos
described above
From: Jeff Hostetler
Teach add_index_entry_with_check() and has_dir_name()
to see if the path of the new item is greater than the
last path in the index array before attempting to search
for it.
During checkout, merge_working_tree() populates the new
index in sorted order, so this change will sa
From: Jeff Hostetler
Version 9 addresses the following:
() p0006 perf test can now run using either synthetic repos
from t/perf/repos/many-repos.sh -OR- an actual real-world
repo.
() The commit message has been updated to include results of
p0006 on linux.git.
() Line 0006.3
On Tue, Apr 11, 2017 at 6:51 PM, Brandon Williams wrote:
> On 04/11, Jeff King wrote:
>> On Tue, Apr 11, 2017 at 01:02:56PM +0200, Ęvar Arnfjörš Bjarmason wrote:
>>
>> > >> Yes, this is a bug. I'll need to add a git_options along with
>> > >> submodule_options and pass -c grep.patternType=
>>
David Turner wrote:
> Unfortunately, in order to push some large repos where a server does
> not support chunked encoding, the http postbuffer must sometimes
> exceed two gigabytes. On a 64-bit system, this is OK: we just malloc
> a larger buffer.
>
> This means that we need to use CURLOPT_POSTFI
Unfortunately, in order to push some large repos where a server does
not support chunked encoding, the http postbuffer must sometimes
exceed two gigabytes. On a 64-bit system, this is OK: we just malloc
a larger buffer.
This means that we need to use CURLOPT_POSTFIELDSIZE_LARGE to set the
buffer
On 04/11, Jonathan Nieder wrote:
> Brandon Williams wrote:
> Jonathan Tan had an idea about how to side-step the issue: what if
> "grep" forks an appropriate set of child processes before creating any
> threads and then communicates with those children using pipes?
> Because no threads have been sp
Brandon Williams wrote:
> On 04/11, Eric Wong wrote:
> > On the other hand, I believe we should make run-command
> > vfork-compatible (and Brandon's series is a big (but incomplete)
> > step in the (IMHO) right direction); as anything which is
> > vfork-safe would also be safe in the presence of t
On Tue, Apr 11, 2017 at 08:17:50PM +0300, Sergey Ryazanov wrote:
> Earlier, the whole http.proxy option string was passed to curl without
> any preprocessing so curl could complain about the invalid proxy
> configuration.
>
> After the commit 372370f167 ("http: use credential API to handle proxy
Brandon Williams wrote:
> As far as I understand the only instance of threading and forking which exists
> in the current code base is 'git grep --recurse-submodules', and the standard
> builds against glibc shouldn't exhibit any of this deadlocking.
I don't think we consider builds against glibc
On 04/11, Eric Wong wrote:
> Jonathan Nieder wrote:
> > Why can't git use e.g. posix_spawn to avoid this?
>
> posix_spawn does not support chdir, and it seems we run non-git
> commands so no using "git -C" for those.
This is actually the biggest reason why I didn't go down that route from
the st
Eric Wong wrote:
> Jonathan Nieder wrote:
>> Why can't git use e.g. posix_spawn to avoid this?
>
> posix_spawn does not support chdir, and it seems we run non-git
> commands so no using "git -C" for those.
On the other hand, a number of the non-git commands we run are in a
shell. At the cost of
Brandon Williams wrote:
> On 04/10, Jonathan Nieder wrote:
>> struct argv_array result = ARGV_ARRAY_INIT;
>> struct string_list mods = STRING_LIST_INIT_DUP;
>> struct strbuf key = STRBUF_INIT;
>> const char **p;
>>
>> for (p = cmd_env; *p; p++) {
>> const cha
On 04/10, Jonathan Nieder wrote:
> Brandon Williams wrote:
>
> > In order to avoid allocation between 'fork()' and 'exec()' prepare the
> > environment to be used in the child process prior to forking.
>
> If using something like posix_spawn(), this would be needed anyway, so
> I'll review it.
>
Earlier, the whole http.proxy option string was passed to curl without
any preprocessing so curl could complain about the invalid proxy
configuration.
After the commit 372370f167 ("http: use credential API to handle proxy
authentication", 2016-01-26), if the user specified an invalid HTTP
proxy op
Hello,
this is few patches, which fixes regressions in the proxy handling.
Changes since v2:
- fix grammar (thanks to Ævar)
- add new patch which fixes the silent ignoring of proxy missconfiguration
Sergey Ryazanov (2):
http: honor empty http.proxy option to bypass proxy
http: fix the sile
On 04/11, Eric Wong wrote:
> Brandon Williams wrote:
> > On 04/11, Eric Wong wrote:
> > > Hi Brandon, this series tickles an old itch of mine, so I
> > > started working off of it. I'm only somewhat concerned
> > > with the path resolution in execvp(e) pontentially calling
> > > malloc on some li
Curl distinguishes between an empty proxy address and a NULL proxy
address. In the first case it completely disables proxy usage, but if
the proxy address option is NULL then curl attempts to determine the
proxy address from the http_proxy environment variable.
According to the documentation, if t
Brandon Williams wrote:
> On 04/11, Eric Wong wrote:
> > Hi Brandon, this series tickles an old itch of mine, so I
> > started working off of it. I'm only somewhat concerned
> > with the path resolution in execvp(e) pontentially calling
> > malloc on some libcs; but I suppose that's a separate pa
On 04/11, Jeff King wrote:
> On Tue, Apr 11, 2017 at 01:02:56PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
> > >> Yes, this is a bug. I'll need to add a git_options along with
> > >> submodule_options and pass -c grep.patternType=
> > >
> > > Maybe that's an indication we should have --pcre1-rege
On 04/11, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > v3 builds upon v2 by adding 3 additional patches to add functionality to
> > also
> > propagate the remote and refspec down to children process's working to push
> > submodules. The remote and refspec will only be propagated if th
On 04/11, Eric Wong wrote:
> Hi Brandon, this series tickles an old itch of mine, so I
> started working off of it. I'm only somewhat concerned
> with the path resolution in execvp(e) pontentially calling
> malloc on some libcs; but I suppose that's a separate patch
> for another time.
>
> Only l
On Fri, Apr 07, 2017 at 08:03:49AM -0400, Ben Peart wrote:
> @@ -642,7 +621,41 @@ static struct cmd2process
> *start_multi_file_filter(struct hashmap *hashmap, cons
> done:
> sigchain_pop(SIGPIPE);
>
> - if (err || errno == EPIPE) {
> + if (err || errno == EPIPE)
> +
We are using Git in a distributed environment.
In the United States, we have the master repository in one state and a build
cluster in a different state.
In addition to people in the US doing builds, we have people in other countries
(Ireland, India, Israel,
Russia, possibly others) doing builds
> Well, what do you suggest as an alternative?
>
> Git tells you that you are in detached state and where you came from
> (detached from).
I think it'd be best if git status somehow indicated that you're no
longer at the same commit. Maybe something like:
$ git status
HEAD detached from origin/ma
On Tue, Apr 11, 2017 at 05:56:56PM +0300, Sergey Ryazanov wrote:
> > I don't know _what_ "https://"; should do. It's clearly bogus. But
> > telling curl to use the defaults seems funny. In that sense, your
> > original was much better (we'd feed it to curl, which would be free to
> > complain).
>
On Tue, Apr 11, 2017 at 4:06 PM, Jeff King wrote:
> On Tue, Apr 11, 2017 at 12:20:50PM +0300, Sergey Ryazanov wrote:
>> diff --git a/http.c b/http.c
>> index 96d84bb..8be75b2 100644
>> --- a/http.c
>> +++ b/http.c
>> @@ -836,8 +836,14 @@ static CURL *get_curl_handle(void)
>> }
>>
Enis Bayramoğlu venit, vidit, dixit 11.04.2017 10:57:
> I've encountered a very misleading output from `git status`. Here's a
> sequence of events that demonstrates the issue:
>
> $ git --version
> git version 2.12.0
>
> $ git checkout origin/master
>
> $ git status
> HEAD detached from origin/m
New attempt due to whitespace fixes after EndOfSenctence.
Junio C Hamano writes:
> This is probably a shared issue with the original text for
> "diff-files", but I think we must stress that these options make
> sense only when you are in the middle of conflict resolution.
>
> In addition, unlike
On Tue, Apr 11, 2017 at 12:20:50PM +0300, Sergey Ryazanov wrote:
> diff --git a/http.c b/http.c
> index 96d84bb..8be75b2 100644
> --- a/http.c
> +++ b/http.c
> @@ -836,8 +836,14 @@ static CURL *get_curl_handle(void)
> }
> }
>
> - if (curl_http_proxy) {
> - cur
On Tue, Apr 11, 2017 at 01:02:56PM +0200, Ævar Arnfjörð Bjarmason wrote:
> >> Yes, this is a bug. I'll need to add a git_options along with
> >> submodule_options and pass -c grep.patternType=
> >
> > Maybe that's an indication we should have --pcre1-regexp and
> > --pcre2-regexp, so we don't
Sent from my iPhone
On Tue, Apr 11, 2017 at 02:37:27PM +0200, Stefan Haller wrote:
> > I agree that probably makes the multiple-operation stuff go away, which
> > is nice. It does raise the question of when the integration point
> > happens, and how we handle alternate paths through which commits may
> > land in a lo
Ævar Arnfjör? Bjarmason wrote:
> Does this proposal require that all the things that can update a ref
> be hooked to maintain these lease values?
It is true that the proposal relies on people using git push and git
pull, not some lower level approximation such as git fetch + git
update-ref. Whet
Jeff King wrote:
> On Sun, Apr 09, 2017 at 10:38:42AM +0200, Stefan Haller wrote:
>
> > I think it's wrong to think about these leases as something that you
> > take before you start a rewindy operation. That's the wrong time to take
> > the lease; by that time, the remote tracking branch may al
Jacob Keller wrote:
> On Sun, Apr 9, 2017 at 4:00 AM, Stefan Haller wrote:
>
> > Maybe I wasn't clear enough about that in my proposal, but I propose to
> > always store the commit hash of the remote tracking branch as a new
> > lease after push and pull, not the local branch. This way it works
> On 04 Apr 2017, at 17:20, Ramsay Jones wrote:
>
>
>
> On 04/04/17 00:53, David Turner wrote:
>> Unfortunately, in order to push some large repos, the http postbuffer
>> must sometimes exceed two gigabytes. On a 64-bit system, this is OK:
>> we just malloc a larger buffer.
>>
>> This means
On Tue, Apr 11, 2017 at 12:54 PM, Jeff King wrote:
> On Tue, Apr 11, 2017 at 11:27:57AM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> Junio: If you're not in some rush to pick this up I'll take this, fix
>> up a bunch of other bugs & tests failures on odd --root directories
>> and submit this and Jef
On Tue, Apr 11, 2017 at 12:48 PM, Jeff King wrote:
> On Tue, Apr 11, 2017 at 12:45:55PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> On Tue, Apr 11, 2017 at 12:37 PM, Jeff King wrote:
>> > On Sat, Apr 08, 2017 at 01:25:05PM +, Ævar Arnfjörð Bjarmason wrote:
>> >
>> >> diff --git a/builtin/grep.
On Tue, Apr 11, 2017 at 11:27:57AM +0200, Ævar Arnfjörð Bjarmason wrote:
> Junio: If you're not in some rush to pick this up I'll take this, fix
> up a bunch of other bugs & tests failures on odd --root directories
> and submit this and Jeff's \r patch (after adding tests etc) along
> with it.
Th
On Tue, Apr 11, 2017 at 12:51:09PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > Yeah, I think it's nice to keep the build-time knobs compatible. In the
> > long run I assume we'll want to add a USE_LIBPCRE1 flag and USE_LIBPCRE
> > just becomes a synonym for it (in fact, we could do that in this
> >
On Tue, Apr 11, 2017 at 12:32:57PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > This can be tricky since POSIX allows implementations to add arbitrary
> > extensions for otherwise invalid syntax.
>
> For POSIX basic v.s. extended I'm relying on (|) not being
> metacharacters in basic but metachars n
On Tue, Apr 11, 2017 at 12:35 PM, Jeff King wrote:
> On Sat, Apr 08, 2017 at 01:25:04PM +, Ævar Arnfjörð Bjarmason wrote:
>
>> Change the internal USE_LIBPCRE define, & build options flag to use a
>> naming convention ending in PCRE1, without changing the long-standing
>> USE_LIBPCRE Makefile
On Tue, Apr 11, 2017 at 12:45:55PM +0200, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Apr 11, 2017 at 12:37 PM, Jeff King wrote:
> > On Sat, Apr 08, 2017 at 01:25:05PM +, Ævar Arnfjörð Bjarmason wrote:
> >
> >> diff --git a/builtin/grep.c b/builtin/grep.c
> >> index 9478ab5dff..dffb9743b8 100644
On Sat, Apr 08, 2017 at 01:25:06PM +, Ævar Arnfjörð Bjarmason wrote:
> --- a/Makefile
> +++ b/Makefile
> @@ -32,6 +32,14 @@ all::
> # Define LIBPCREDIR=/foo/bar if your libpcre header and library files are in
> # /foo/bar/include and /foo/bar/lib directories.
> #
> +# Define USE_LIBPCRE if
On Sat, Apr 08, 2017 at 01:24:54PM +, Ævar Arnfjörð Bjarmason wrote:
> This adds PCRE v2 support, but as I was adding that I kept noticing
> other related problems to fix. It's all bundled up into the same
> series because much of it conflicts because it modifies the same test
> or other code.
On Tue, Apr 11, 2017 at 12:37 PM, Jeff King wrote:
> On Sat, Apr 08, 2017 at 01:25:05PM +, Ævar Arnfjörð Bjarmason wrote:
>
>> diff --git a/builtin/grep.c b/builtin/grep.c
>> index 9478ab5dff..dffb9743b8 100644
>> --- a/builtin/grep.c
>> +++ b/builtin/grep.c
>> @@ -490,7 +490,7 @@ static void
On Sat, Apr 08, 2017 at 01:25:05PM +, Ævar Arnfjörð Bjarmason wrote:
> diff --git a/builtin/grep.c b/builtin/grep.c
> index 9478ab5dff..dffb9743b8 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -490,7 +490,7 @@ static void compile_submodule_options(const struct
> grep_opt *opt,
>
On Sat, Apr 08, 2017 at 01:25:04PM +, Ævar Arnfjörð Bjarmason wrote:
> Change the internal USE_LIBPCRE define, & build options flag to use a
> naming convention ending in PCRE1, without changing the long-standing
> USE_LIBPCRE Makefile flag which enables this code.
>
> This is for preparation
1 - 100 of 126 matches
Mail list logo