Hi Matheus,
On Mon, Oct 21, 2019 at 7:14 PM Matheus Tavares Bernardino
wrote:
>
> I wrote a small follow-up post to talk about the conclusion of my GSoC
> project. I believe the main remaining tasks are now finally complete
> :) If you would be interested in taking a look, the post i
Hi, everyone
I wrote a small follow-up post to talk about the conclusion of my GSoC
project. I believe the main remaining tasks are now finally complete
:) If you would be interested in taking a look, the post is at
https://matheustavares.gitlab.io/posts/gsoc-follow-ups
Thanks,
Matheus
Hey Everyone!
GSoC is finally over and I present to you my final report[1].
Thanks for all your support and reviews without which this
would not be possible.
Thanks
Rohit
[1]: https://rashiwal.me/2019/final-report/
Hi, everyone
Just wanted to share with you the final report on my GSoC project:
https://matheustavares.gitlab.io/posts/gsoc-final-report I plan to
continue the project (as it isn't finished yet) and keep contributing
with whatever I can :) Thank you all for the support during this SoC!
> About static function-scope variables I wonder if we could have one
> day some .h and .c files with only thread safe functions in them.
Yes, that would probably require quite some work but would definitely
be very helpful!
> > I hope you enjoyed this summer :) Thank you for your re
ly thread safe functions in them.
> I hope you enjoyed this summer :) Thank you for your readiness to
> continue contributing after GSoC. It is not mandatory, you do not have
> to finish the project, but if you want - all the community will be so
> glad to see you as the contributor
p. Moreover, if you want,
you can make something like a documentation and delegate some parts.
I hope you enjoyed this summer :) Thank you for your readiness to
continue contributing after GSoC. It is not mandatory, you do not have
to finish the project, but if you want - all the community will be s
Hi, everyone
I just posted the penultimate report on my project:
https://matheustavares.gitlab.io/posts/going-for-a-too-big-step This
week I’ve been working on a v2 of threaded git-grep w/ parallel
inflation, to allow threads when grepping submodules. I also tried
some more optimizations along the
Hi Everyone
Please ignore this patch. I forgot to clean the output dir before
sending this iteration.
Thanks
Rohit
The previous commit introduced --ignore-date flag to interactive
rebase, but the name is actually very vague in context of rebase -i
since there are two dates we can work with. Add an alias to convey
the precise purpose.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt | 1 +
builti
On 14/08/2019 20:33, Junio C Hamano wrote:
Phillip Wood writes:
That's an important distinction, particularly if GIT_COMMITTER_DATE is
set in the environment - are we aiming to have the author and
committer dates match or are we just resetting the author date to now?
Rohit - do you know which
Phillip Wood writes:
> That's an important distinction, particularly if GIT_COMMITTER_DATE is
> set in the environment - are we aiming to have the author and
> committer dates match or are we just resetting the author date to now?
> Rohit - do you know which --ignore-date does in the am based reb
On 13/08/2019 22:45, Junio C Hamano wrote:
Rohit Ashiwal writes:
--ignore-date::
- This flag is passed to 'git am' to change the author date
- of the rebased commits (see linkgit:git-am[1]).
+ Instead of using the given author date, re-set it to the value
+ same as co
Hi Junio & Rohit
On 13/08/2019 18:21, Junio C Hamano wrote:
Phillip Wood writes:
+static void push_dates(struct child_process *child)
+{
+ time_t now = time(NULL);
+ struct strbuf date = STRBUF_INIT;
+
+ strbuf_addf(&date, "@%"PRIuMAX, (uintmax_t)now);
+ argv_array_pus
On 13/08/2019 18:06, Junio C Hamano wrote:
Phillip Wood writes:
[...]
+
+ strbuf_addf(&date, "@%s",ident.date_begin);
I think we should use %s.* and ident.date_end to be sure we getting
what we want. Your version is OK if the author is formatted correctly
but I'm uneasy about r
Rohit Ashiwal writes:
> --ignore-date::
> - This flag is passed to 'git am' to change the author date
> - of the rebased commits (see linkgit:git-am[1]).
> + Instead of using the given author date, re-set it to the value
> + same as committer (current) date. This implies --force-
Rohit Ashiwal writes:
> The previous commit introduced --ignore-date flag to interactive
> rebase, but the name is actually very vague in context of rebase -i
> since there are two dates we can work with. Add an alias to convey
> the precise purpose.
This sounds more like the existing "--reset-a
Phillip Wood writes:
>> +static void push_dates(struct child_process *child)
>> +{
>> +time_t now = time(NULL);
>> +struct strbuf date = STRBUF_INIT;
>> +
>> +strbuf_addf(&date, "@%"PRIuMAX, (uintmax_t)now);
>> +argv_array_pushf(&child->args, "--date=%s", date.buf);
>
> it doesn't
Phillip Wood writes:
>> + if (opts->committer_date_is_author_date) {
>> +size_t len;
>> +int res = -1;
>> +struct strbuf datebuf = STRBUF_INIT;
>> +char *date = read_author_date_or_null();
>
> You must always check the return value of functions t
On 12/08/2019 20:42, Rohit Ashiwal wrote:
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 8 +++-
builtin/rebase.c
Hi Rohit
On 12/08/2019 20:42, Rohit Ashiwal wrote:
The purpose of amend_author was to free() the malloc()'d string
obtained from get_author() while amending a commit. But we can
also use the variable to free() the author at our convenience.
Rename it to convey this meaning.
Thanks for rewordin
Hi Rohit
This is looking better - there are a couple of memory management issues
and minor nit-picks but apart from that it looks good.
On 12/08/2019 20:42, Rohit Ashiwal wrote:
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let'
On 13/08/2019 11:38, Phillip Wood wrote:
Hi Rohit
[...]
@@ -964,6 +976,25 @@ static int run_git_commit(struct repository *r,
{
struct child_process cmd = CHILD_PROCESS_INIT;
+ if (opts->committer_date_is_author_date) {
+ size_t len;
+ int res = -1;
+ struct strbu
Hi Rohit
Thanks for the re-roll
On 12/08/2019 20:42, Rohit Ashiwal wrote:
There are two backends available for rebasing, viz, the am and the
interactive. Naturally, there shall be some features that are
implemented in one but not in the other. One such flag is
--ignore-whitespace which indicate
Hi Matheus,
On Tue, Aug 13, 2019 at 6:06 AM Matheus Tavares Bernardino
wrote:
>
> I just posted a new update on my project:
> https://matheustavares.gitlab.io/posts/simplified-version-of-parallel-inflation
Great blog post as usual!
> This week I sent a simplified version of the series I was wor
Hi Rohit
This is looking good, I think it is almost there now
On 12/08/2019 20:42, Rohit Ashiwal wrote:
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documen
Hi, everyone
I just posted a new update on my project:
https://matheustavares.gitlab.io/posts/simplified-version-of-parallel-inflation
This week I sent a simplified version of the series I was working on
last week (which would still take some time to finish). And I'm
working to improve it with su
Hi All!
Here[1] is an update about the last week. Sorry for a late update.
I couldn't find time to post since we are in the middle of an
internship season.
Thanks for reading
Rohit
[1]: https://rashiwal.me/2019/another-iteration/
The purpose of amend_author was to free() the malloc()'d string
obtained from get_author() while amending a commit. But we can
also use the variable to free() the author at our convenience.
Rename it to convey this meaning.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file changed,
The previous commit introduced --ignore-date flag to interactive
rebase, but the name is actually very vague in context of rebase -i
since there are two dates we can work with. Add an alias to convey
the precise purpose.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt | 1 +
builti
I've tried to work on all the suggestion in this revision.
Based on: 2e27de94d485a6da0c8e264c165e55100f1a13a8 (tag: v2.23.0-rc2)
Rohit Ashiwal (6):
rebase -i: add --ignore-whitespace flag
sequencer: add NULL checks under read_author_script
rebase -i: support --committer-date-is-author-date
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let's add the same
for interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 6 +--
builtin/rebase.c| 21 +++---
There are two backends available for rebasing, viz, the am and the
interactive. Naturally, there shall be some features that are
implemented in one but not in the other. One such flag is
--ignore-whitespace which indicates merge mechanism to treat lines
with only whitespace changes as unchanged. Wi
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 8 +++-
builtin/rebase.c| 20 ++---
sequencer
read_author_script reads name, email and author date from the author
script. However, it does not check if the arguments are NULL. Adding
NULL checks will allow us to selectively get the required value, for
example:
char *date;
if (read_author_script(_path_, NULL, NULL, &date, _int_))
Hi Phillip
On Thu, 8 Aug 2019 17:44:38 +0100 Phillip Wood
wrote:
>
> [...]
> > --ignore-whitespace::
> > + This flag is either passed to the 'git apply' program
> > + (see linkgit:git-apply[1]), or to 'git merge' program
> > + (see linkgit:git-merge[1]) as `-Xignore-space-change`,
> > +
15.4172s
8| 13.6304s | 13.8659s
For now, the optimization is not supported when --textconv or
--recurse-submodules are used, but I hope to send another patchset for
that still during GSoC. We may also try to allow even more parallelism,
refining the added 'obj_read_lock'
git-grep has some internal locks to protect thread-unsafe operations
when running with threads. The usage of these locks can be toggled
through the variable 'grep_use_locks'. However, it's not currently
possible to enable each lock individually. And since object reading has
its own locks now, it is
git-grep uses 'grep_read_mutex' to protect some object reading
operations. But these have their own internal lock now, which ensure a
better performance (with more parallel regions). So, disable the former
when it's possible to use the latter, with enable_obj_read_lock().
Signed-off-by: Matheus Ta
They were disabled at 53b8d93 ("grep: disable threading in non-worktree
case", 12-12-2011), due to observable performance drops. But now that
zlib inflation can be performed in parallel, for some of git-grep's
options, we can regain the speedup.
Grepping 'abcd[02]' ("Regex 1") and '(static|extern)
Allow read_object_file_extended() to be called by multiple threads
protecting it with a lock. The lock usage can be toggled with
enable_obj_read_lock() and disable_obj_read_lock().
Probably there are many spots in read_object_file_extended()'s call
chain that could be executed unlocked (and thus,
On 08/08/2019 12:42, Phillip Wood wrote:
On 06/08/2019 18:36, Rohit Ashiwal wrote:
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let's add the same
for interactive machinery.
Signed-off-by: Rohit Ashiwal
---
>> [...[
static c
Hi Rohit
On 06/08/2019 18:36, Rohit Ashiwal wrote:
There are two backends available for rebasing, viz, the am and the
interactive. Naturally, there shall be some features that are
implemented in one but not in the other. One such flag is
--ignore-whitespace which indicates merge mechanism to tre
Phillip Wood writes:
> ...
> I think it would be better to handle committer_date_is_author_date in
> a single place in this function, not have two implementations one of
> ...
> git has a high level api for manipulation author/committer information
> in ident.c, it would be best to use that. In a
On Tue, Aug 6, 2019 at 4:16 AM Christian Couder
wrote:
>
> Hi Matheus,
>
> On Tue, Aug 6, 2019 at 4:54 AM Matheus Tavares Bernardino
> wrote:
> >
> > Here's my report from last week:
> > https://matheustavares.gitlab.io/posts/week-11-wip-grep-protecting-textconv-and-submodules
>
> Thank you for a
Hi Rohit
On 06/08/2019 18:36, Rohit Ashiwal wrote:
The previous commit introduced --ignore-date flag to interactive
rebase, but the name is actually very vague in context of rebase -i
since there are two dates we can work with. Add an alias to convey
the precise purpose.
That's an excellent id
On 06/08/2019 18:36, Rohit Ashiwal wrote:
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let's add the same
for interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 6 ++--
builti
Hi Rohit
On 06/08/2019 18:36, Rohit Ashiwal wrote:
The purpose of amend_author was to free() the malloc()'d string
obtained from get_author(). But the name does not actually convey
this purpose. Rename it to something meaningful.
The name was intended to covey that it was only used when amendi
Hi Rohit
On 06/08/2019 18:36, Rohit Ashiwal wrote:
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 8 +++-
builtin/r
Hi Junio and Dscho
On Thu, Aug 8, 2019 at 1:52 AM Junio C Hamano wrote:
>
> Johannes Schindelin writes:
>
> > On Tue, 6 Aug 2019, Rohit Ashiwal wrote:
> >
> >> @@ -1046,6 +1066,8 @@ static int run_git_commit(struct repository *r,
> >> argv_array_push(&cmd.args, "--amend");
> >>
Hi Junio
On Wed, Aug 7, 2019 at 11:08 AM Junio C Hamano wrote:
>
> Rohit Ashiwal writes:
>
> > diff --git a/builtin/rebase.c b/builtin/rebase.c
> > index db6ca9bd7d..3c195ddc73 100644
> > --- a/builtin/rebase.c
> > +++ b/builtin/rebase.c
> > ...
> > @@ -511,6 +523,8 @@ int cmd_rebase__interactiv
Johannes Schindelin writes:
> On Tue, 6 Aug 2019, Rohit Ashiwal wrote:
>
>> @@ -1046,6 +1066,8 @@ static int run_git_commit(struct repository *r,
>> argv_array_push(&cmd.args, "--amend");
>> if (opts->gpg_sign)
>> argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign);
Hi Rohit,
On Tue, 6 Aug 2019, Rohit Ashiwal wrote:
> @@ -1046,6 +1066,8 @@ static int run_git_commit(struct repository *r,
> argv_array_push(&cmd.args, "--amend");
> if (opts->gpg_sign)
> argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign);
> + if (opts->igno
Rohit Ashiwal writes:
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index db6ca9bd7d..3c195ddc73 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> ...
> @@ -511,6 +523,8 @@ int cmd_rebase__interactive(int argc, const char **argv,
> const char *prefix)
> argc = parse_options
rebase am already has this flag to "lie" about the author date
by changing it to the committer (current) date. Let's add the same
for interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 6 ++--
builtin/rebase.c| 17 +
The previous commit introduced --ignore-date flag to interactive
rebase, but the name is actually very vague in context of rebase -i
since there are two dates we can work with. Add an alias to convey
the precise purpose.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt | 1 +
builti
The purpose of amend_author was to free() the malloc()'d string
obtained from get_author(). But the name does not actually convey
this purpose. Rename it to something meaningful.
Signed-off-by: Rohit Ashiwal
---
sequencer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
The previous versions of this patch series were sent here[1]. This patch
accounts for all the suggestions mentioned there and also introduces a flag
--ignore-date (also aliased --author-date-is-committer-date).
Caveat:
The flag --ignore-date (of rebase -am) silently overrides the
There are two backends available for rebasing, viz, the am and the
interactive. Naturally, there shall be some features that are
implemented in one but not in the other. One such flag is
--ignore-whitespace which indicates merge mechanism to treat lines
with only whitespace changes as unchanged. Wi
read_author_script reads name, email and author date from the author
script. However, it does not check if the arguments are NULL. Adding
NULL checks will allow us to selectively get the required value, for
example:
char *date;
if (read_author_script(_path_, NULL, NULL, &date, _int_))
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 8 +++-
builtin/rebase.c| 20 +++---
sequence
Hi Matheus,
On Tue, Aug 6, 2019 at 4:54 AM Matheus Tavares Bernardino
wrote:
>
> Here's my report from last week:
> https://matheustavares.gitlab.io/posts/week-11-wip-grep-protecting-textconv-and-submodules
Thank you for another great report!
> I'm working to protect the operations I left behin
Hi,
Here's my report from last week:
https://matheustavares.gitlab.io/posts/week-11-wip-grep-protecting-textconv-and-submodules
I'm working to protect the operations I left behind on the first
version of the patchset[1]. And for that, I used a lot of the code Duy
provided[2] me as an example in th
Hi Everyone!
Here[1] is an update about my last week and some insight on the
future work.
Thanks
Rohit
[1]: https://rashiwal.me/2019/the-discussion/
Hi Junio
On Fri, 19 Jul 2019 15:36:15 -0700 Junio C Hamano wrote:
>
> [...]
> Hmph, are we sure that author-script is always available at this
> point so that a call to read_author_date_or_die() is safe? There
> are three callers to the run_git_commit() function and I am not sure
> if codepaths
Running git-grep with --recurse-submodules results in a cached grep for
the submodules even when --cached is not used. This makes all
modifications in submodules' tracked files be always ignored when
grepping. Solve that making git-grep respect the cached option when
invoking grep_cache() inside gr
On Wed, Jul 31, 2019 at 12:57 PM Junio C Hamano wrote:
>
> Christian Couder writes:
>
> > On Tue, Jul 30, 2019 at 10:04 PM Junio C Hamano wrote:
> >>
> >> Matheus Tavares writes:
> >
> >> > @@ -598,7 +599,8 @@ static int grep_tree(struct grep_opt *opt, const
> >> > struct pathspec *pathspec,
>
Christian Couder writes:
> On Tue, Jul 30, 2019 at 10:04 PM Junio C Hamano wrote:
>>
>> Matheus Tavares writes:
>
>> > @@ -598,7 +599,8 @@ static int grep_tree(struct grep_opt *opt, const
>> > struct pathspec *pathspec,
>> > free(data);
>> > } else if (recur
Running git-grep with --recurse-submodules results in a cached grep for
the submodules even when --cached is not used. This makes all
modifications in submodules' tracked files be always ignored when
grepping. Solve that making git-grep respect the cached option when
invoking grep_cache() inside gr
On Tue, Jul 30, 2019 at 5:04 PM Junio C Hamano wrote:
>
> Matheus Tavares writes:
>
> > @@ -475,7 +475,7 @@ static int grep_submodule(struct grep_opt *opt,
> > strbuf_release(&base);
> > free(data);
> > } else {
> > - hit = grep_cache(&subopt, pathspe
On Tue, Jul 30, 2019 at 10:04 PM Junio C Hamano wrote:
>
> Matheus Tavares writes:
> > @@ -598,7 +599,8 @@ static int grep_tree(struct grep_opt *opt, const struct
> > pathspec *pathspec,
> > free(data);
> > } else if (recurse_submodules && S_ISGITLINK(entry.m
Matheus Tavares writes:
> @@ -475,7 +475,7 @@ static int grep_submodule(struct grep_opt *opt,
> strbuf_release(&base);
> free(data);
> } else {
> - hit = grep_cache(&subopt, pathspec, 1);
> + hit = grep_cache(&subopt, pathspec, cached);
>
Running git-grep with --recurse-submodules results in a cached grep for
the submodules even when --cached is not used. This makes all
modifications in submodules' tracked files be always ignored when
grepping. Solve that making git-grep respect the cached option when
invoking grep_cache() inside gr
Hi, everyone
I just posted an update about my project here:
https://matheustavares.gitlab.io/posts/week-10-a-bug-in-git-grep-submodules
This one is focused on a patch to correct a bug at git-grep
--recurse-submodules and some tests for the parallel inflation
patchset. Please, feel free to leave an
Hey Everyone!
Here an update about my last week[1]. There were reviews on
patches I submitted which need to be accounted. There is also
some _mess_ (commit ordering and merging topics) that needs to
be taken out. Polishing them will teach rebase -i some new flags!
Thanks
Rohit
[1]: https://rashi
There are two backends available for rebasing, viz, the am and the
interactive. Naturally, there shall be some features that are
implemented in one but not in the other. One such flag is
--ignore-whitespace which indicates merge mechanism to treat lines
with only whitespace changes as unchanged. Wi
This revision removes --ignore-whitespace from rebase--interactive since its
only caller preserve-merges is now deprecated. Also rename t3431 to t3433.
Rohit Ashiwal (1):
rebase -i: add --ignore-whitespace flag
Documentation/git-rebase.txt| 10 +++-
builtin/rebase.c
Hi Rohit
On 23/07/2019 20:57, Rohit Ashiwal wrote:
Hi Phillip
On Sat, 20 Jul 2019 15:56:50 +0100 Phillip Wood
wrote:
[...]
@@ -467,6 +470,9 @@ int cmd_rebase__interactive(int argc, const char **argv,
const char *prefix)
OPT_BOOL(0, "autosquash", &opts.autosquash,
Hi Elijah & Rohit,
On Tue, 23 Jul 2019, Elijah Newren wrote:
> On Tue, Jul 23, 2019 at 1:01 PM Rohit Ashiwal
> wrote:
> > On Mon, 22 Jul 2019 11:00:40 +0100 Phillip Wood
> > wrote:
> > > [...]
> > >
> > > > @@ -489,6 +501,8 @@ int cmd_rebase__interactive(int argc, const char
> > > > **argv, c
On Tue, Jul 23, 2019 at 1:01 PM Rohit Ashiwal
wrote:
> On Mon, 22 Jul 2019 11:00:40 +0100 Phillip Wood
> wrote:
> > [...]
> >
> > > @@ -489,6 +501,8 @@ int cmd_rebase__interactive(int argc, const char
> > > **argv, const char *prefix)
> > > { OPTION_STRING, 'S', "gpg-sign", &opts.gp
Rohit Ashiwal writes:
> Hi Junio
>
> On Fri, 19 Jul 2019 14:33:49 -0700 Junio C Hamano wrote:
>>
>> > t/t3431-rebase-options-compatibility.sh | 66 +
>>
>> Isn't 3431 already taken?
>
> It is not in git/git[1].
That's a very selfish attitude ;-) Pay attention to what
Hi Junio
On Fri, 19 Jul 2019 14:33:49 -0700 Junio C Hamano wrote:
>
> > t/t3431-rebase-options-compatibility.sh | 66 +
>
> Isn't 3431 already taken?
It is not in git/git[1].
> > 5 files changed, 97 insertions(+), 6 deletions(-)
> > create mode 100755 t/t3431-rebase-
Hi Phillip
On Mon, 22 Jul 2019 11:00:40 +0100 Phillip Wood
wrote:
>
> [...]
> >
> > + if (opts->ignore_whitespace) {
> > + struct strbuf buf = STRBUF_INIT;
> > +
> > + if (opts->strategy_opts)
> > + strbuf_addstr(&buf, opts->strategy_opts);
> > +
> > +
Hi Phillip
On Sat, 20 Jul 2019 15:56:50 +0100 Phillip Wood
wrote:
>
> [...]
>
> > @@ -467,6 +470,9 @@ int cmd_rebase__interactive(int argc, const char
> > **argv, const char *prefix)
> > OPT_BOOL(0, "autosquash", &opts.autosquash,
> > N_("move commits that beg
Hi, everyone
Unfortunately, not quite much to report this week :( I'm attending
DebConf until July 28th but I'm trying to conciliate that with the
work on my project. You can see my brief report of last week here:
https://matheustavares.gitlab.io/posts/week-9-an-rfc-on-parallel-inflation
As alway
Hi Rohit,
It's good to see another patch reducing the differences between the
rebase back ends.
On 18/07/2019 19:55, Rohit Ashiwal wrote:
> There are two backends available for rebasing, viz, the am and the
> interactive. Naturally, there shall be some features that are
> implemented in one but n
Hi Rohit
It's good to see this patch reducing the differences between the rebase
backends.
On 18/07/2019 20:03, Rohit Ashiwal wrote:
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.
Signed-off-b
Allow read_object_file_extended() to be called by multiple threads
protecting it with a lock. The lock usage can be toggled with
enable_obj_read_lock() and disable_obj_read_lock().
Probably there are many spots in read_object_file_extended()'s call
chain that could be executed unlocked (and thus,
git-grep has locks around the object reading operations it performs. But
these have an internal lock now, which can be enabled through
enable_obj_read_lock(). So let's use it and drop git-grep's ones.
Signed-off-by: Matheus Tavares
---
builtin/grep.c | 18 +++---
grep.c | 3
They were disabled at 53b8d93 ("grep: disable threading in non-worktree
case", 12-12-2011), due to observable perfomance drops. But now that
zlib inflation can be performed in parallel, we can regain the speedup.
Grep'ing 'abcd[02]' ("Regex 1") and '(static|extern) (int|double) \*'
("Regex 2") at
Threads were disabled in git-grep for non-worktree case at 53b8d93
("grep: disable threading in non-worktree case", 12-12-2011), due to
perfomance drops.
To regain performance, this series work on the object reading code so
that zlib inflation may be performed in parallel. This is a good hotspot
Rohit Ashiwal writes:
> @@ -1688,10 +1699,12 @@ int cmd_rebase(int argc, const char **argv, const
> char *prefix)
> state_dir_base, cmd_live_rebase, buf.buf);
> }
>
> + if (options.committer_date_is_author_date)
> + options.flags |= REBASE_FORCE;
> +
>
Junio C Hamano writes:
> Rohit Ashiwal writes:
>
>> Another revision to keep this thread alive.
>
> And on top of what commit have these two been built on?
I had trouble figuring out where to base the other one, on top of
which these two apply. Why are these split into separate topics?
Rohit Ashiwal writes:
> t/t3431-rebase-options-compatibility.sh | 66 +
Isn't 3431 already taken?
> 5 files changed, 97 insertions(+), 6 deletions(-)
> create mode 100755 t/t3431-rebase-options-compatibility.sh
> ...
> + git checkout --orphan master &&
> + q_to
Rohit Ashiwal writes:
> Another revision to keep this thread alive.
And on top of what commit have these two been built on?
rebase am already has this flag to "lie" about the committer date
by changing it to the author date. Let's add the same for
interactive machinery.
Signed-off-by: Rohit Ashiwal
---
Documentation/git-rebase.txt| 7 ++--
builtin/rebase.c| 23 ++---
seque
read_author_script reads name, email and author date from the author
script. However, it does not check if the arguments are NULL. Adding
NULL checks will allow us to selectively get the required value, for
example:
char *date;
if (read_author_script(_path_, NULL, NULL, &date, _int_))
Another revision to keep this thread alive.
Rohit Ashiwal (2):
sequencer: add NULL checks under read_author_script
rebase -i: support --committer-date-is-author-date
Documentation/git-rebase.txt| 7 ++-
builtin/rebase.c| 23 +++--
sequencer.c
There are two backends available for rebasing, viz, the am and the
interactive. Naturally, there shall be some features that are
implemented in one but not in the other. One such flag is
--ignore-whitespace which indicates merge mechanism to treat lines
with only whitespace changes as unchanged. Wi
Another revision to keep the thread alive.
Rohit Ashiwal (1):
rebase -i: add --ignore-whitespace flag
Documentation/git-rebase.txt| 9 +++-
builtin/rebase.c| 26 --
sequencer.h | 1 +
t/t3422-rebase-incompatible-options.
1 - 100 of 2649 matches
Mail list logo
