All,
this implements the changes requested in v3 of this patch:
- removes an extra comma from the enum
- reworks the logic for config handling so that the author and committer
variables are handled along with the user variables.
Please review.
William Hubbs (1):
config: allow giving separat
The author.email, author.name, committer.email and committer.name
settings are analogous to the GIT_AUTHOR_* and GIT_COMMITTER_*
environment variables, but for the git config system. This allows them
to be set separately for each repository.
Git supports setting different authorship and committer
/usr/local/versioner/perl/versions is also not provided with macOS or
Xcode AFAIK
Carlo
Sent from my iPhone...
> On Jan 29, 2019, at 15:59, SZEDER Gábor wrote:
>
>> On Tue, Jan 29, 2019 at 03:46:07PM -0800, Jeremy Huddleston Sequoia wrote:
>>
>>
>>> On Jan 29, 2019, at 2:47 PM, Junio C Hamano wrote:
>>>
>>> Jeremy Huddleston Sequoia writes:
>>>
Signed-off-by: Jeremy H
On Tue, Jan 29, 2019 at 03:46:07PM -0800, Jeremy Huddleston Sequoia wrote:
>
>
> > On Jan 29, 2019, at 2:47 PM, Junio C Hamano wrote:
> >
> > Jeremy Huddleston Sequoia writes:
> >
> >> Signed-off-by: Jeremy Huddleston Sequoia
> >> ---
> >> t/test-lib.sh | 3 +++
> >> 1 file changed, 3 inserti
> On Jan 29, 2019, at 3:10 PM, Junio C Hamano wrote:
>
> Jeremy Huddleston Sequoia writes:
>
>> Useful for setting up osxkeychain in Xcode.app's gitconfig
>>
>> Signed-off-by: Jeremy Huddleston Sequoia
>> ---
>
> A concern shared with 13/13 is this.
>
> While it may not hurt too much to
> On Jan 29, 2019, at 2:47 PM, Junio C Hamano wrote:
>
> Jeremy Huddleston Sequoia writes:
>
>> Signed-off-by: Jeremy Huddleston Sequoia
>> ---
>> t/test-lib.sh | 3 +++
>> 1 file changed, 3 insertions(+)
>
> This obviously won't be acceptable as-is to my tree. Shouldn't this
> be somethin
Jeremy Huddleston Sequoia wrote:
> From: Matt Wright
>
> Signed-off-by: Matt Wright
Hi Jeremy/Matt: I expect to see a description of said "problem"
More comments inline below...
> diff --git a/git-svn.perl b/git-svn.perl
> index 050f2a36f4..d29730be3b 100755
> --- a/git-svn.perl
> +++ b/git-
William Hubbs writes:
> diff --git a/cache.h b/cache.h
> index 009e8b3b15..375be1f68b 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -1494,10 +1494,19 @@ int date_overflows(timestamp_t date);
> #define IDENT_STRICT1
> #define IDENT_NO_DATE 2
> #define IDENT_NO_NAME
Hi,
Jonathan Tan wrote:
> --- a/t/lib-httpd/apache.conf
> +++ b/t/lib-httpd/apache.conf
> @@ -78,6 +78,7 @@ PassEnv GNUPGHOME
> PassEnv ASAN_OPTIONS
> PassEnv GIT_TRACE
> PassEnv GIT_CONFIG_NOSYSTEM
> +PassEnv GIT_TEST_SIDEBAND_ALL
This is producing
[env:warn] [pid 248632] AH01506: PassEnv
[jc: just forwarding to the area expert]
Jeremy Huddleston Sequoia writes:
> From: Matt Wright
>
> Signed-off-by: Matt Wright
> ---
> git-svn.perl | 30 ++
> 1 file changed, 30 insertions(+)
>
> diff --git a/git-svn.perl b/git-svn.perl
> index 050f2a36f4..d29730be3
Jeremy Huddleston Sequoia writes:
> Useful for setting up osxkeychain in Xcode.app's gitconfig
>
> Signed-off-by: Jeremy Huddleston Sequoia
> ---
A concern shared with 13/13 is this.
While it may not hurt too much to look at one extra location even on
non-Apple platform, it probably is a mista
All,
this version of the patch adds more test cases, combines the tests into
the main patch, creates the static set_ident function, updates the
documentation and fixes some formatting.
It also applies against master.
Please review.
William Hubbs (1):
config: allow giving separate author and c
The author.email, author.name, committer.email and committer.name
settings are analogous to the GIT_AUTHOR_* and GIT_COMMITTER_*
environment variables, but for the git config system. This allows them
to be set separately for each repository.
Git supports setting different authorship and committer
Jeremy Huddleston Sequoia writes:
> Because the default Git version string looks like "git version
> 2.10.0-1-g480871e09e", this was mostly OK, but people can change this
> version string to arbitrary thing while compiling, which can break the
> assumption if they had SP in it. Notably, Apple sh
Jeremy Huddleston Sequoia writes:
> Signed-off-by: Jeremy Huddleston Sequoia
> ---
> builtin/help.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/help.c b/builtin/help.c
> index 7739a5c155..e001b6157c 100644
> --- a/builtin/help.c
> +++ b/builtin/help.c
> @@ -
On Tue, Jan 29, 2019 at 10:35:33PM +0100, SZEDER Gábor wrote:
> t0025 with '--stress' usually fails within seconds when run on the
> merge of 'jk/add-ignore-errors-bit-assignment-fix' and 'master' [1]:
Thanks for the pointer. I mostly cargo-culted the test from the rest of
that script, so I didn'
From: Matt Wright
Signed-off-by: Matt Wright
---
git-svn.perl | 30 ++
1 file changed, 30 insertions(+)
diff --git a/git-svn.perl b/git-svn.perl
index 050f2a36f4..d29730be3b 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1815,6 +1815,36 @@ sub complete_url_ls_init
Jeremy Huddleston Sequoia writes:
> Signed-off-by: Jeremy Huddleston Sequoia
> ---
> t/test-lib.sh | 3 +++
> 1 file changed, 3 insertions(+)
This obviously won't be acceptable as-is to my tree. Shouldn't this
be something to be dealt with in config.mak.uname or something that
is meant to def
On Fri, Jan 25, 2019 at 11:58:10PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> On Fri, Jan 25 2019, William Hubbs wrote:
>
> > @@ -480,6 +515,46 @@ int git_ident_config(const char *var, const char
> > *value, void *data)
> > return 0;
> > }
> >
> > + if (!strcmp(var, "author.name
On Tue, Jan 29, 2019 at 10:03:46PM +0100, Ævar Arnfjörð Bjarmason wrote:
> > I think these are reasonable to have (and I personally much prefer
> > "prove" to the raw "make test" output anyway).
>
> I wonder if anyone would mind if we removed the non-prove path.
>
> When I added it in 5099b99d25
On Tue, Jan 29, 2019 at 03:53:40PM -0500, Eric Sunshine wrote:
> > > The implementation of --broken uses diff-index which calls
> > > setup_work_tree() itself.
> >
> > If I hadn't just read the rest of the thread, I'd probably wonder why we
> > are talking about --broken at all. Maybe:
> >
> > T
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The fourth batch of topics are in
On 1/28/2019 5:23 PM, Junio C Hamano wrote:
"Jeff Hostetler via GitGitGadget" writes:
+test_expect_success 'perf stream, return code 0' '
+ test_when_finished "rm trace.perf actual expect" &&
+ GIT_TR2_PERF="$(pwd)/trace.perf" && export GIT_TR2_PERF &&
+ $TT trace2 001retu
Signed-off-by: Jeremy Huddleston Sequoia
---
t/test-lib.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0f1faa24b2..4060a53f56 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1017,6 +1017,9 @@ fi
GITPERLLIB="$GIT_BUILD_DIR"/perl/build/lib
expor
On Tue, Jan 29, 2019 at 03:49:58PM -0500, Derrick Stolee wrote:
> On 1/29/2019 1:10 PM, Derrick Stolee wrote:
> > On 1/29/2019 12:34 PM, SZEDER Gábor wrote:
> >> On Tue, Jan 29, 2019 at 04:58:27PM +0100, SZEDER Gábor wrote:
> >> And in the related email discussion [1]:
> >>
> >> But even though t
Alban Gruin writes:
> Indeed, this semicolon was removed by 29d51e214c ("sequencer.c: remove a
> stray semicolon", 2018-11-03). But this commit isn’t part of nd/the-index.
I thought you said it was based on nd/the-index, so I've been
queuing the topic since earlier iterations on top of cde55548
Phillip Wood writes:
> Thanks for the comments. I've updated the code as suggested by Dscho
> and tried to make it clearer in the commit message that this is fixing
> git creating a todo-list that it cannot parse.
Will queue. Thanks.
Hello all,
A common point of friction when flipping back and forth between branches,
especially when dealing with build configurations/artifacts that were sometimes
included in the repository and sometimes not (e.g. the artifacts of an
`autoreconf` run) is when a file not in the index at all would
On Thu, Jan 17, 2019 at 11:27:11AM -0500, Jeff King wrote:
> On Thu, Jan 17, 2019 at 06:22:05PM +0300, Dmitriy Smirnov wrote:
>
> > Calling `git add —ignore-errors` appears to be equal to calling `git add
> > —renormalize`:
> >
> > Main.java is saved with CRLF in repo
> > git config core.autocrl
Signed-off-by: Jeremy Huddleston Sequoia
---
attr.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/attr.c b/attr.c
index eaece6658d..1b87905d4a 100644
--- a/attr.c
+++ b/attr.c
@@ -823,6 +823,14 @@ static const char *git_etc_gitattributes(void)
return system_wide;
}
+
Useful for setting up osxkeychain in Xcode.app's gitconfig
Signed-off-by: Jeremy Huddleston Sequoia
---
config.c | 13 +
config.h | 2 ++
2 files changed, 15 insertions(+)
diff --git a/config.c b/config.c
index ff521eb27a..656bfef8ab 100644
--- a/config.c
+++ b/config.c
@@ -1631,6
Jeff King writes:
> There's some small value in leaving
> %X alone if we do not understand "X" (not to mention the backwards
> %compatibility you mentioned), but I think %() is a pretty
> deliberate indication that a placeholder was meant there.
Good point.
> We already do this for ref-filter e
Signed-off-by: Jeremy Huddleston Sequoia
---
t/t0500-apple.sh | 40
1 file changed, 40 insertions(+)
create mode 100755 t/t0500-apple.sh
diff --git a/t/t0500-apple.sh b/t/t0500-apple.sh
new file mode 100755
index 00..d5f79237a8
--- /dev/null
+++
On Tue, Jan 29 2019, Jeff King wrote:
> On Tue, Jan 29, 2019 at 06:56:08AM -0800, Derrick Stolee via GitGitGadget
> wrote:
>
>> From: Derrick Stolee
>>
>> When running the test suite for code coverage using
>> 'make coverage-test', a single test failure stops the
>> test suite from completing.
On Tue, Jan 29, 2019 at 8:12 AM Jeff King wrote:
> On Tue, Jan 29, 2019 at 06:18:58AM +0100, Sebastian Staudt wrote:
> > This ensures the given working tree is used for --dirty.
>
> There's been a lot of digging and discussion on the list about what
> happens if we don't do this. Could we summariz
On 1/29/2019 1:10 PM, Derrick Stolee wrote:
> On 1/29/2019 12:34 PM, SZEDER Gábor wrote:
>> On Tue, Jan 29, 2019 at 04:58:27PM +0100, SZEDER Gábor wrote:
>> And in the related email discussion [1]:
>>
>> But even though the docs claim it [-j] should be possible,
>> I've been getting "random" te
Signed-off-by: Jeremy Huddleston Sequoia
---
builtin/help.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/help.c b/builtin/help.c
index 7739a5c155..e001b6157c 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -383,7 +383,7 @@ static void get_html_page_path(struct s
This patch has been trimmed down significantly from its original version
when rebasing on top of git 2.18 because git 2.18 included support for
runtime prefix support for darwin, making this patch mostly duplicative.
The remaining changes are needed to ensure that git-perl can find the
subversion
480871e09e ("format-patch: show base info before email signature",
2016-09-07) added a helper function to recreate the signature at the end
of the e-mail, i.e. "-- " line followed by the version string of Git,
using output from "git --version" and stripping everything before the last
SP.
Because t
Hi Junio,
Le 29/01/2019 à 21:14, Junio C Hamano a écrit :
> Alban Gruin writes:
>
>> if (opts->allow_ff && skip_unnecessary_picks(r, &oid))
>> return error(_("could not skip unnecessary pick commands"));
>>
>> if (checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_hea
Alban Gruin writes:
> if (opts->allow_ff && skip_unnecessary_picks(r, &oid))
> return error(_("could not skip unnecessary pick commands"));
>
> if (checkout_onto(opts, onto_name, oid_to_hex(&oid), orig_head))
> return -1;
> -;
> +
> if (require_clea
This was causing problems with ppc/sha1ppc.S
Signed-off-by: Jeremy Huddleston Sequoia
---
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 0d77ea5894..a5db584576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -195,7 +195,7 @@
*.deb
/git.
See
Signed-off-by: Jeremy Huddleston Sequoia
---
Makefile | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 1a44c811aa..60711d6abe 100644
--- a/Makefile
+++ b/Makefile
@@ -2065,10 +2065,7 @@ version.sp version.s version.o: EXTRA_CPPFLAGS = \
Signed-off-by: Jeremy Huddleston Sequoia
---
GIT-VERSION-GEN | 4
1 file changed, 4 insertions(+)
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d1a2814ec7..6fb90854b9 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -3,6 +3,10 @@
GVF=GIT-VERSION-FILE
DEF_VER=v2.20.1
+if [ -n
Xcode 10.2 Beta 1 contains Apple Git-116. A couple months ago, Peff encouraged
me to re-send our changes in a patch series to the mailing list, so here they
are!
As reference, these (and past patch series for Apple Git) are availale at:
https://github.com/jeremyhu/git
Some of these patches a
See
Signed-off-by: Jeremy Huddleston Sequoia
---
git-mergetool--lib.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 83bf52494c..f85be7406f 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -273,9 +2
Signed-off-by: Jeremy Huddleston Sequoia
---
t/t5701-git-serve.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
index ae79c6bbc0..7bc25700fa 100755
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@ -7,7 +7,7 @@ test_descript
Hi Sverre,
On Sun, 6 Nov 2011, Sverre Rabbelier wrote:
> On Sun, Nov 6, 2011 at 05:45, Jonathan Nieder wrote:
> >> Extract a handle_reset function that deals with this, which can then
> >> be re-used in a later commit.
> >
> > So, does this patch drop the confusing behavior and add one that is
>
From: Phillip Wood
If the user gives an empty argument to --exec then git creates a todo
list that it cannot parse. The rebase starts to run before erroring out
with
error: missing arguments for exec
error: invalid line 2: exec
You can fix this with 'git rebase --edit-todo' and then run 'g
I was hoping to attend the contributors' summit remotely, but now my leave is
starting before then. This email contains a summary of what I would have
added to the discussion.
Thanks,
-Stolee
Commit-Graph Status Report
==
I'm really happy with the progress in this area,
Johannes Schindelin writes:
> On Mon, 28 Jan 2019, Junio C Hamano wrote:
>
>> * pw/rebase-x-sanity-check (2019-01-28) 1 commit
>> - rebase -x: sanity check command
>>
>> "git rebase -x $cmd" did not reject multi-line command, even though
>> the command is incapable of handling such a command.
On 1/29/2019 12:34 PM, SZEDER Gábor wrote:
> On Tue, Jan 29, 2019 at 04:58:27PM +0100, SZEDER Gábor wrote:
> And in the related email discussion [1]:
>
> But even though the docs claim it [-j] should be possible,
> I've been getting "random" test failures when compiled with coverage
> suppor
Works with me. I'll resubmit without the double casting next chance I
have to work on it. My long-term plan for that struct was to use the
memory pool for all allocations anyway. I think that should let me
implement it without moving objects around, which will make their
addresses stable. That shou
Stefan Xenos writes:
> Sorry, folks. I normally can't do any open source work on weekdays.
> That also includes writing responses on the mailing list, so there
> will normally be a week or two lag for me to iterate on this sort of
> thing.
>
> Feel free to either include this fix or revert my pat
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> The js/vsts-ci and sg/travis-specific-cc branches do not interact so
> well... While Travis has the Homebrew package gcc@8 installed in their
> Xcode 10.1 images, Azure Pipelines' agents do not.
>
> Signed-off-by: Joh
Jeff King writes:
> The usual style is to put the whole snippet into single-quotes, and then
> double-quote as appropriate within it. Like:
>
> test_expect_failure 'describe --dirty with --work-tree' '
> (
> cd "$TEST_DIRECTORY" &&
> git --git-dir "$TRASH_DIREC
Here is today's test coverage report.
Since the last report, I have overhauled the machinery for generating these
reports. The code is available on GitHub [1], and the reports are available
online in text [2] and HTML [3] form.
In addition to the two output formats, the code also has the ability
Jeff King writes:
> On Tue, Jan 29, 2019 at 06:18:58AM +0100, Sebastian Staudt wrote:
>
>> Subject: Re: [PATCH v3 2/3] Setup working tree in describe
>
> We usually write subjects as "area: do some thing" which is a little
> easier when scanning big lists of "git log --oneline".
>
> I think it's
On Tue, Jan 29, 2019 at 04:58:27PM +0100, SZEDER Gábor wrote:
> On Tue, Jan 29, 2019 at 06:56:08AM -0800, Derrick Stolee via GitGitGadget
> wrote:
> > @@ -3077,6 +3080,10 @@ coverage-test: coverage-clean-results
> > coverage-compile
> > $(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_
From: Derrick Stolee
Sometimes there are test failures in the 'pu' branch. This
is somewhat expected for a branch that takes the very latest
topics under development, and those sometimes have semantic
conflicts that only show up during test runs. This also can
happen when running the test suite w
Sometimes there are test failures in the 'pu' branch. This is somewhat
expected for a branch that takes the very latest topics under development,
and those sometimes have semantic conflicts that only show up during test
runs. This also can happen when running the test suite with different
GIT_TEST_
On Tue, Jan 29, 2019 at 07:45:06AM +0100, Anders Waldenborg wrote:
> > Instead of using "char buf[8]", just using a strbuf and avoidng
> > strlcpy() would make the code much better, I would think.
>
> Yes, taking the heap allocation hit would most likely make the intent
> clearer.
If you can reu
On Tue, Dec 18, 2018 at 10:30:04PM +0100, Anders Waldenborg wrote:
>
> Junio C Hamano writes:
> > That way, we can handle %(trailers:only=bogo) more sensibly,
> > no? Syntactically we can recognize that the user wanted to give
> > 'bogo' as the value to 'only', and say "'bogo' is not a boolean"
On Tue, Jan 29, 2019 at 11:37:34AM -0500, Derrick Stolee wrote:
> > I'm afraid that this issue would badly affect 'coverage-prove' as well
> > (I didn't try). Or if doesn't (anymore?), then that should be
> > mentioned in the commit message, and then perhaps it's time to remove
> > that '-j1' fro
On Tue, Jan 29, 2019 at 11:35:41AM -0500, Derrick Stolee wrote:
> > For people who don't have "prove" available, I think they could just do
> > "make -k test" to make sure the full suite runs. Should we perhaps be
> > doing that automatically in the sub-make run by coverage-test?
>
> I wanted to
On 1/29/2019 10:58 AM, SZEDER Gábor wrote:
> On Tue, Jan 29, 2019 at 06:56:08AM -0800, Derrick Stolee via GitGitGadget
> wrote:
>> +prove: all
>> +$(MAKE) -C t/ prove
>> +
>
> You don't need this 'prove' target in the "main" Makefile, because
> 'make test' will run the test suite using DEFAUL
On 1/29/2019 11:00 AM, Jeff King wrote:
> On Tue, Jan 29, 2019 at 06:56:08AM -0800, Derrick Stolee via GitGitGadget
> wrote:
>
>> From: Derrick Stolee
>>
>> When running the test suite for code coverage using
>> 'make coverage-test', a single test failure stops the
>> test suite from completing.
On Tue, Jan 29, 2019 at 06:56:08AM -0800, Derrick Stolee via GitGitGadget wrote:
> From: Derrick Stolee
>
> When running the test suite for code coverage using
> 'make coverage-test', a single test failure stops the
> test suite from completing. This leads to significant
> undercounting of cover
On Tue, Jan 29, 2019 at 06:56:08AM -0800, Derrick Stolee via GitGitGadget wrote:
> When running the test suite for code coverage using
> 'make coverage-test', a single test failure stops the
> test suite from completing. This leads to significant
> undercounting of covered blocks.
>
> Add two new
Hi Junio,
On Tue, 29 Jan 2019, Johannes Schindelin wrote:
> On Mon, 28 Jan 2019, Junio C Hamano wrote:
>
> > * tt/bisect-in-c (2019-01-02) 7 commits
> > - bisect--helper: `bisect_start` shell function partially in C
> > - bisect--helper: `get_terms` & `bisect_terms` shell function in C
> > -
On Tue, Jan 29, 2019 at 07:43:45AM +0700, Duy Nguyen wrote:
> On Tue, Jan 29, 2019 at 12:27 AM Jeff King wrote:
> > > In general I think it would be much better to rely more on 'git
> > > for-each-ref' to do the heavy lifting, extending it with new format
> > > specifiers/options as necessary.
>
Hi Phillip,
On Tue, 29 Jan 2019, Phillip Wood wrote:
> On 28/01/2019 21:56, Johannes Schindelin wrote:
> >
> > On Mon, 28 Jan 2019, Junio C Hamano wrote:
> >
> >> Phillip Wood writes:
> >>
> >>> From: Phillip Wood
> >>>
> >>> If the user gives an empty argument to --exec then the rebase start
Hi Phillip,
[sorry for the double-send, I dropped the Cc: list by mistake the first
time I replied]
On Tue, 29 Jan 2019, Phillip Wood wrote:
> On 28/01/2019 22:03, Johannes Schindelin wrote:
> > Hi Phillip,
> >
> > On Mon, 28 Jan 2019, Phillip Wood wrote:
> >
> >> From: Phillip Wood
> >>
> >>
Hi Stolee,
On Tue, 29 Jan 2019, Derrick Stolee via GitGitGadget wrote:
> From: Derrick Stolee
>
> When running the test suite for code coverage using
> 'make coverage-test', a single test failure stops the
> test suite from completing. This leads to significant
> undercounting of covered blocks
This changes complete_action() to use edit_todo_list(), now that it can
handle the initial edit of the todo list.
Signed-off-by: Alban Gruin
---
sequencer.c | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 8f47f0cf39..21b0
Just like complete_action(), edit_todo_list() used a
function (transform_todo_file()) that read the todo list from the disk
and wrote it back, resulting in useless disk accesses.
This changes edit_todo_list() to call directly todo_list_write_to_file()
instead.
Signed-off-by: Alban Gruin
---
reb
edit_todo_list() is changed to work on a todo_list, and to handle the
initial edition of the todo list (ie. making a backup of the todo
list).
It does not check for dropped commits yet, as todo_list_check() does not
take the commits that have already been processed by the rebase (ie. the
todo list
This introduces a new function to recreate the text of a todo list from
its commands and write it to a file. This will be useful as the next
few commits will change the use of the buffer in struct todo_list so it
will no longer be a mirror of the file on disk.
This functionality already exists in
As transform_todo_file() is only needed inside of rebase--interactive.c,
it is moved there from sequencer.c.
Signed-off-by: Alban Gruin
---
builtin/rebase--interactive.c | 26 +-
sequencer.c | 23 ---
sequencer.h |
This makes sequencer_make_script() write its script to a strbuf (ie. the
buffer of a todo_list) instead of a FILE. This reduce the amount of
read/write made by rebase interactive.
Signed-off-by: Alban Gruin
---
builtin/rebase--interactive.c | 13 ++-
sequencer.c | 41 +
The 'arg' field of todo_item used to store the address of the first byte
of the parameter of a command in a todo list. It was associated with
the length of the parameter (the 'arg_len' field).
This replaces the 'arg' field by 'arg_offset'. This new field does not
store the address of the paramet
This clears the number of items of a todo_list before parsing it to
allow to parse the same list multiple times without issues. As its
items are not dynamically allocated, or don’t need to allocate memory,
no additionnal memory management is required here.
Furthermore, if a line is invalid, the t
This refactors transform_todos() to work on a todo_list. The function
is renamed todo_list_transform().
As rebase -p still need to check the todo list from the disk, a new
function is introduced, transform_todo_file(). It is still used by
complete_action() and edit_todo_list() for now, but they
This refactors check_todo_list() to work on a todo_list to avoid
redundant reads and writes to the disk. The function is renamed
todo_list_check(). The parsing of the two todo lists is left to the
caller.
As rebase -p still need to check the todo list from the disk, a new
function is introduced,
At the center of the "interactive" part of the interactive rebase lies
the todo list. When the user starts an interactive rebase, a todo list
is generated, presented to the user (who then edits it using a text
editor), read back, and then is checked and processed before the actual
rebase takes pla
This moves the writing of the comment "Rebase $shortrevisions onto
$shortonto ($command_count commands)" from todo_list_write_to_file() to
append_todo_help().
shortrevisions, shortonto, and command_count are passed as parameters to
append_todo_help().
During the initial edit of the todo list, sho
This makes the structures todo_list and todo_item, and the functions
todo_list_release() and parse_insn_buffer(), accessible outside of
sequencer.c.
Signed-off-by: Alban Gruin
---
sequencer.c | 69 ++---
sequencer.h | 50 +++
This refactors sequencer_add_exec_commands() to work on a todo_list to
avoid redundant reads and writes to the disk.
Instead of inserting the `exec' commands between the other commands and
re-parsing the buffer at the end, they are appended to the buffer once,
and a new list of items is created.
This refactors skip_unnecessary_picks() to work on a todo_list. As this
function is only called by complete_action() (and thus is not used by
rebase -p), the file-handling logic is completely dropped here.
Instead of truncating the todo list’s buffer, the items are moved to
the beginning of the l
complete_action() used functions that read the todo-list file, made some
changes to it, and wrote it back to the disk.
The previous commits were dedicated to separate the part that deals with
the file from the actual logic of these functions. Now that this is
done, we can call directly the "logic
This refactors rearrange_squash() to work on a todo_list to avoid
redundant reads and writes. The function is renamed
todo_list_rearrange_squash().
The old version created a new buffer, which was directly written to the
disk. This new version creates a new item list by just copying items
from th
From: Derrick Stolee
When running the test suite for code coverage using
'make coverage-test', a single test failure stops the
test suite from completing. This leads to significant
undercounting of covered blocks.
Add two new targets to the Makefile:
* 'prove' runs the test suite using 'prove'.
Sometimes there are test failures in the 'pu' branch. This is somewhat
expected for a branch that takes the very latest topics under development,
and those sometimes have semantic conflicts that only show up during test
runs. This also can happen when running the test suite with different
GIT_TEST_
Hi Junio,
while reading the What's Cooking mail, even if I did not specifically
looked for them, I found some typos. Here is the diff I would suggest to
apply on top of the tip of `todo`, which is f9efee013546 (What's cooking
(2019/01 #04), 2019-01-28) for me at the time of writing:
-- snipsnap -
Hi Junio,
On Mon, 28 Jan 2019, Junio C Hamano wrote:
> * ps/stash-in-c (2019-01-18) 28 commits
> - stash: fix segmentation fault when files were added with intent
> - tests: add a special setup where stash.useBuiltin is off
> - stash: optionally use the scripted version again
> - stash: add b
Hi Junio,
On Mon, 28 Jan 2019, Junio C Hamano wrote:
> * js/vsts-ci (2019-01-28) 21 commits
> - ci: parallelize testing on Windows
> - ci: speed up Windows phase
> - tests: optionally skip bin-wrappers/
> - t0061: fix with --with-dashes and RUNTIME_PREFIX
> - tests: add t/helper/ to the PATH
From: Johannes Schindelin
This speeds up the tests by a bit on Windows, where running Unix shell
scripts (and spawning processes) is not exactly a cheap operation.
Signed-off-by: Johannes Schindelin
---
t/README | 9 +
t/test-lib.sh | 19 +--
2 files changed, 22 i
From: Johannes Schindelin
When building Git with RUNTIME_PREFIX and starting a test helper from
t/helper/, it fails to detect a system prefix. The reason is that the
RUNTIME_PREFIX feature wants to use the location of the Git executable
to determine where the support files can be found, e.g. syst
From: Johannes Schindelin
The fact that Git's test suite is implemented in Unix shell script that
is as portable as we can muster, combined with the fact that Unix shell
scripting is foreign to Windows (and therefore has to be emulated),
results in pretty abysmal speed of the test suite on that p
1 - 100 of 145 matches
Mail list logo
