From: "Junio C Hamano"
"Philip Oakley" writes:
It appears that acciidoctor sees the art as being a separated
mono-spaced block, with border/background as locally
appropriate. While the asciidoc looks to simply change to mono-spaced
text.
FWIW, I changed my mind and your patch is now queued
On Sat, Oct 22, 2016 at 12:59:38AM -0400, Jeff King wrote:
> When we are checking the path via path_ok(), we use some
> fixed PATH_MAX buffers. We write into them via snprintf(),
> so there's no possibility of overflow, but it does mean we
> may silently truncate the path, leading to potentially
>
On Fri, Oct 21, 2016 at 9:45 PM, Jeff King wrote:
> I thought I'd just knock this out in 5 minutes before I forgot about it.
> But as with so many things, getting it right proved slightly harder than
> I thought.
Always seems to be that way, doesn't it?
> But I did learn about TAP's "Bail out!"
On Fri, Oct 21, 2016 at 09:39:45PM -0700, Junio C Hamano wrote:
> And this is the final one.
>
> -- >8 --
> From: Junio C Hamano
> Date: Fri, 21 Oct 2016 21:33:06 -0700
> Subject: [PATCH] transport: compute summary-width dynamically
>
> Now all that is left to do is to actually iterate over the
When we are checking the path via path_ok(), we use some
fixed PATH_MAX buffers. We write into them via snprintf(),
so there's no possibility of overflow, but it does mean we
may silently truncate the path, leading to potentially
confusing errors when the partial path does not exist.
We're better
On Fri, Oct 21, 2016 at 09:15:28AM -0700, Jacob Keller wrote:
> >> > For $HARNESS_ACTIVE with _just_ "--verbose", I don't think it would be a
> >> > good idea to activate it. We should either silently ignore --verbose
> >> > then, or complain and die.
> >>
> >> We should probably do that to make s
Junio C Hamano writes:
> Now we have identified three callchains that have a set of refs that
> they want to show their object names in an aligned output,
> we can replace their reference to the constant TRANSPORT_SUMMARY_WIDTH
> with a helper function call to transport_summary_width() that take
On Fri, Oct 21, 2016 at 03:39:27PM -0700, Junio C Hamano wrote:
> Now we have identified three callchains that have a set of refs that
> they want to show their object names in an aligned output,
> we can replace their reference to the constant TRANSPORT_SUMMARY_WIDTH
> with a helper function cal
On Fri, Oct 21, 2016 at 11:23:53AM -0700, Junio C Hamano wrote:
> A request to "git:///", depending on , results
> in "directory" given to path_ok() in a bit different forms. Namely,
> connect.c::parse_connect_url() gives
>
> URL directory
> git://site/nouse
On Fri, Oct 21, 2016 at 10:26:29PM +0100, Philip Oakley wrote:
> > updating the source they work on. Otherwise, the broken "doc-tool
> > stack" will keep producing broken output next time a source that
> > respects "tab is to skip to the next multiple of 8" rule is fed to
> > it, no?
>
> By avoi
On Fri, Oct 21, 2016 at 4:59 PM, Junio C Hamano wrote:
> On Fri, Oct 21, 2016 at 10:54 AM, Jonathan Tan
> wrote:
>> I've updated patch 5/8 to use strcspn and to pass in the list of
>> separators, meaning that we no longer accept '=' in file input (and also
>> updated its commit message according
When adding a submodule via "git submodule add ",
the relative url applies to the superprojects remote. When the
superproject was cloned via "git clone . super", the remote url
is ending with '/.'.
The logic to construct the relative urls is not smart enough to
detect that the ending /. is referri
On Fri, Oct 21, 2016 at 10:54 AM, Jonathan Tan wrote:
> I've updated patch 5/8 to use strcspn and to pass in the list of
> separators, meaning that we no longer accept '=' in file input (and also
> updated its commit message accordingly).
Thanks for a pleasant read. Queued.
Hopefully this is rea
The remote URL for the submodule can be specified relative
to the URL of the superproject in .gitmodules. A top-level
git://site.xz/toplevel.git can specify in its .gitmodules
[submodule "sub"]
url = ../submodule.git
path = sub
to say that git://site.xz/su
Fix the argument order for test_cmp. When given the expected
result first the diff shows the actual output with '+' and the
expectation with '-', which is the convention for our tests.
Signed-off-by: Stefan Beller
---
t/t7506-status-submodule.sh | 4 ++--
1 file changed, 2 insertions(+), 2 delet
previous patch:
http://public-inbox.org/git/20161018210623.32696-1-sbel...@google.com/
First fix our test suite in patch 2,
then patch 3 is a resend of the previous patch to normalize the configured
remote.
Thanks,
Stefan
Stefan Beller (3):
t7506: fix diff order arguments in test_cmp
submod
On Fri, Oct 21, 2016 at 3:41 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> Turns out that somehow I must have messed up my command because "git
>> diff " does indeed do exactly what I
>> want.
>
> Thanks. I was wondering why it didn't work for you, as the feature
> was done exactly to
"Philip Oakley" writes:
> It appears that acciidoctor sees the art as being a separated
> mono-spaced block, with border/background as locally
> appropriate. While the asciidoc looks to simply change to mono-spaced
> text.
FWIW, I changed my mind and your patch is now queued on 'next'.
Thanks.
Jacob Keller writes:
> Turns out that somehow I must have messed up my command because "git
> diff " does indeed do exactly what I
> want.
Thanks. I was wondering why it didn't work for you, as the feature
was done exactly to support that use case ;-)
The leaf function on the "fetch" side that uses TRANSPORT_SUMMARY_WIDTH
constant is builtin/fetch.c::format_display() and it has two distinct
callchains. The one that reports the primary result of fetch originates
at store_updated_refs(); the other one that reports the pruning of
the remote-tracki
Now we have identified three callchains that have a set of refs that
they want to show their object names in an aligned output,
we can replace their reference to the constant TRANSPORT_SUMMARY_WIDTH
with a helper function call to transport_summary_width() that takes
the set of ref as a parameter.
It turns out that there are three codepaths, all of which have a set
of refs that they want to show them using TRANSPORT_SUMMARY_WIDTH
constant. The two preparatory steps turn the constant used at the
leaf level into a parameter that is passed down through these
callchains, and the last step intro
The callchain that originates at transport_print_push_status()
eventually hits a single leaf function, print_ref_status(), that is
used to show from what old object to what new object a ref got
updated, and the width of the part that shows old and new object
names used a constant TRANSPORT_SUMMARY_
Jeff King writes:
> The "right" fix is to queue up the list of ref updates to print, find
> the abbreviations for each, and then print them all in one shot, knowing
> ahead of time the size necessary to align them. This could also let us
> improve the name-alignment.
Heh, that was what I was sta
On Fri, Oct 21, 2016 at 2:40 PM, Jacob Keller wrote:
> Hi,
>
> I recently determined that I can produce an interdiff for a series
> that handles rebasing nicely and shows the conflicts resolved when
> rebasing plus any other changes.
>
> The basic idea is something like the following, assuming tha
On Fri, Oct 21, 2016 at 10:12:16AM -0700, Junio C Hamano wrote:
> > -if test "$verbose" = "t"
> > +if test "$verbose_log" = "t"
> > +then
> > + exec 3>>"$GIT_TEST_TEE_OUTPUT_FILE" 4>&3
> > +elif test "$verbose" = "t"
> > then
> > exec 4>&2 3>&1
> > else
>
> OK, unlike "verbose" case where
On Fri, Oct 21, 2016 at 09:50:49AM -0700, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> > On Fri, Oct 21, 2016 at 7:11 PM, Duy Nguyen wrote:
> >> Yeah.. replacing the 4 DEFAULT_ABBREV in fetch.c with something
> >> sensible should do it.
> >
> > Correction (if somebody will pick this up), it's
Hi,
I recently determined that I can produce an interdiff for a series
that handles rebasing nicely and shows the conflicts resolved when
rebasing plus any other changes.
The basic idea is something like the following, assuming that v1 is a
tag that points to the first version, v2 is a tag that p
From: "Junio C Hamano"
Philip Oakley writes:
The doc-tool stack does not always respect the 'tab = 8 spaces' rule,
particularly the git-scm doc pages
https://git-scm.com/docs/git-merge-base
and the Git generated html pages.
Sorry, but I do not understand this change.
https://git.github.i
On Tue, Oct 18, 2016 at 7:05 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>>> I am not sure. Certainly we would want to make sure that the normal
>>> case (i.e. no funny trailing junk) to work correctly, but we do want
>>> to protect the fix from future breakage as well, no?
>>
>> Exactly
Am 21.10.2016 um 12:59 schrieb Duy Nguyen:
On Thu, Oct 20, 2016 at 11:40 PM, René Scharfe wrote:
I get this on WSL with prove -j8:
Files=750, Tests=13657, 906 wallclock secs ( 8.51 usr 17.17 sys + 282.62 cusr
3731.85 csys = 4040.15 CPU)
And this for a run on Debian inside a Hyper-V VM on the
Am 21.10.2016 um 15:10 schrieb Matthieu Moy:
> René Scharfe writes:
>
>> I get this on WSL with prove -j8:
>>
>> Files=750, Tests=13657, 906 wallclock secs ( 8.51 usr 17.17 sys + 282.62
>> cusr 3731.85 csys = 4040.15 CPU)
>>
>> And this for a run on Debian inside a Hyper-V VM on the same system:
Stefan Beller writes:
> So when pushing it is possible to have multiple urls
> (remote..url) configured.
>
> When fetching only the first configured url is considered.
> Would it make sense to allow multiple urls and
> try them one by one until one works?
I do not think the two are related. Pus
On 21/10/16 17:48, Junio C Hamano wrote:
> Matthieu Moy writes:
>
>> e3fdbcc8e1 (parse_mailboxes: accept extra text after <...> address,
>> 2016-10-13) improved our in-house address parser and made it closer to
>> Mail::Address. As a consequence, some tests comparing it to
>> Mail::Address now
Johannes Schindelin writes:
> Changes vs v4:
I still do not understand (note that I am not saying "I do not
accept"--acceptance or rejection happens after an understandable
explanation is given, and "do not understand" means no such
explanation has been given yet) your justification behind addin
Johannes Schindelin writes:
> This commit prepares for future callers that will have a pointer/length
> to some text to be written that lacks an LF, yet an LF is desired.
> Instead of requiring the caller to append an LF to the buffer (and
> potentially allocate memory to do so), the write_messag
Johannes Schindelin writes:
> Nothing in the name "write_message()" suggests that the function
> releases the strbuf passed to it. So let's release the strbuf in the
> caller instead.
>
> Signed-off-by: Johannes Schindelin
> ---
I agree that it makes quite a lot of sense from the point of view
Junio C Hamano writes:
> Duy Nguyen writes:
>
>> The amount of changes is unbelievable for fixing such a rare case
>> though. I wonder if we can just detect this in daemon.c and pass
>> "./~foo/bar" instead of "~foo/bar" to enter_repo() in non-strict mode
>> to "disable" expand_user_path(). If i
So when pushing it is possible to have multiple urls
(remote..url) configured.
When fetching only the first configured url is considered.
Would it make sense to allow multiple urls and
try them one by one until one works?
Background:
http://www.businessinsider.com/amazon-spotify-twitter-github-an
Currently, creation and addition (to a list) of trailer items are spread
across multiple functions. Streamline this by only having 2 functions:
one to parse the user-supplied string, and one to add the parsed
information to a list.
Signed-off-by: Jonathan Tan
---
trailer.c | 130
Currently, interpret-trailers requires that a trailer be only on 1 line.
For example:
a: first line
second line
would be interpreted as one trailer line followed by one non-trailer line.
Make interpret-trailers support RFC 822-style folding, treating those
lines as one logical trailer.
Signe
Replace the existing handwritten implementation of a doubly-linked list
in trailer.c with the functions and macros from list.h. This
significantly simplifies the code.
Signed-off-by: Jonathan Tan
Signed-off-by: Ramsay Jones
---
trailer.c | 258 ++-
Currently, interpret-trailers allows leading whitespace in trailer
lines. This leads to false positives, especially for quoted lines or
bullet lists.
Forbid leading whitespace in trailers.
Signed-off-by: Jonathan Tan
---
Documentation/git-interpret-trailers.txt | 2 +-
t/t7513-interpret-traile
Currently, interpret-trailers requires all lines of a trailer block to
be trailers (or comments) - if not it would not identify that block as a
trailer block, and thus create its own trailer block, inserting a blank
line. For example:
echo -e "\nSigned-off-by: x\nnot trailer" |
git interpret-
I've updated patch 5/8 to use strcspn and to pass in the list of
separators, meaning that we no longer accept '=' in file input (and also
updated its commit message accordingly).
We also discussed inlining find_separator, but after looking at the
code, I think that it is more convenient if find_se
Change "const char *" to "char *" in struct trailer_item and in the
return value of apply_command (since those strings are owned strings).
Change "struct conf_info *" to "const struct conf_info *" (since that
struct is not modified).
Signed-off-by: Jonathan Tan
---
trailer.c | 14 +++---
The parse_trailer function has a few modes of operation, all depending
on whether the separator is present in its input, and if yes, the
separator's position. Some of these modes are failure modes, and these
failure modes are handled differently depending on whether the trailer
line was sourced fro
Improve type safety by making arguments (whether from configuration or
from the command line) have their own "struct arg_item" type, separate
from the "struct trailer_item" type used to represent the trailers in
the buffer being manipulated.
This change also prepares "struct trailer_item" to be fu
Jeff King writes:
>> 16:42:45$ cat /proc/2601/cmdline | xargs -0 -n1 echo
>> /bin/sh
>> -c
>> echo $PWD;sleep 600
>> echo $PWD;sleep 600
>
> This duplicated argument is expected and normal.
Well explained. Thanks.
On Fri, Oct 21, 2016 at 3:41 AM, Jeff King wrote:
> On Fri, Oct 21, 2016 at 04:43:48AM -0400, Jeff King wrote:
>
>> The obvious fix would be to send "--verbose" output to stderr, but I
>> suspect that would end up annoying for people who do:
>>
>> ./t5547-push-quarantine.sh -v | less
>>
>> to re
Jeff King writes:
> This patch implements option (5), which seems to work well
> in practice.
Your journey to reach this final design and implementation may have
been painful---I really like the end result. This was an accident
waiting to happen.
Thanks for fixing it.
> @@ -319,7 +332,10 @@ f
Duy Nguyen writes:
> On Fri, Oct 21, 2016 at 7:11 PM, Duy Nguyen wrote:
>> Yeah.. replacing the 4 DEFAULT_ABBREV in fetch.c with something
>> sensible should do it.
>
> Correction (if somebody will pick this up), it's
> TRANSPORT_SUMMARY_WIDTH that needs to be adjusted, not those four.
Yes, it
Matthieu Moy writes:
> e3fdbcc8e1 (parse_mailboxes: accept extra text after <...> address,
> 2016-10-13) improved our in-house address parser and made it closer to
> Mail::Address. As a consequence, some tests comparing it to
> Mail::Address now pass, but e3fdbcc8e1 forgot to update the test.
>
>
Thank you.
Running on debian stretch/testing it got past the 11 second mark and has
been running for a day now. I expect it will take days, perhaps longer,
so we'll see.
--rich
- CONFIDENTIAL-
This email and any files transmitted with it are confidential, and
> On 21 Oct 2016, at 06:08, Johannes Schindelin
> wrote:
>
> Hi Junio & Lars,
>
> On Thu, 20 Oct 2016, Junio C Hamano wrote:
>
>> * ls/filter-process (2016-10-17) 14 commits
>> (merged to 'next' on 2016-10-19 at ffd0de042c)
>> + contrib/long-running-filter: add long running filter example
>>
Duy Nguyen writes:
> The amount of changes is unbelievable for fixing such a rare case
> though. I wonder if we can just detect this in daemon.c and pass
> "./~foo/bar" instead of "~foo/bar" to enter_repo() in non-strict mode
> to "disable" expand_user_path(). If it works, it's much simpler
> cha
On Fri, Oct 21, 2016 at 8:48 AM, Jeff King wrote:
> On Fri, Oct 21, 2016 at 08:42:58AM -0700, Jacob Keller wrote:
>
>> > For $HARNESS_ACTIVE with _just_ "--verbose", I don't think it would be a
>> > good idea to activate it. We should either silently ignore --verbose
>> > then, or complain and die
On Fri, Oct 21, 2016 at 08:42:58AM -0700, Jacob Keller wrote:
> > For $HARNESS_ACTIVE with _just_ "--verbose", I don't think it would be a
> > good idea to activate it. We should either silently ignore --verbose
> > then, or complain and die.
>
> We should probably do that to make sure people rea
On Fri, Oct 21, 2016 at 8:35 AM, Jeff King wrote:
> On Fri, Oct 21, 2016 at 08:29:49AM -0700, Jacob Keller wrote:
>
>> > The Travis tests do exactly this (along with --tee to actually save the
>> > output). It seems like a minor miracle that this is the first test
>> > output that has actually tri
Johannes Schindelin writes:
>> Ah, make that four steps. The final one is:
>>
>> - add append_eol parameter that nobody uses at this step in the
>> series.
>>
>> This is a new feature to the helper. While it is OK to have it as a
>> preparatory step in this series, it is easier to un
On Fri, Oct 21, 2016 at 08:29:49AM -0700, Jacob Keller wrote:
> > The Travis tests do exactly this (along with --tee to actually save the
> > output). It seems like a minor miracle that this is the first test
> > output that has actually triggered as TAP input. I'd suggest that the
> > problem is
Hey Johannes,
On Fri, Oct 21, 2016 at 6:38 PM, Johannes Schindelin
wrote:
> I am unfortunately still busy with trying to figure out what exactly makes
> t6030 hang on `pu` (seems it thinks stdin is a tty and just waits for an
> answer), and then trying to reduce that insane amount of time wasted
On Fri, Oct 21, 2016 at 1:43 AM, Jeff King wrote:
> prove t5547-push-quarantine.sh :: -v
>
> The Travis tests do exactly this (along with --tee to actually save the
> output). It seems like a minor miracle that this is the first test
> output that has actually triggered as TAP input. I'd suggest
René Scharfe writes:
> I get this on WSL with prove -j8:
>
> Files=750, Tests=13657, 906 wallclock secs ( 8.51 usr 17.17 sys + 282.62 cusr
> 3731.85 csys = 4040.15 CPU)
>
> And this for a run on Debian inside a Hyper-V VM on the same system:
>
> Files=759, Tests=13895, 99 wallclock secs ( 4.81 u
On Fri, Oct 21, 2016 at 3:40 PM, Johannes Schindelin
wrote:
> Are you referring to Git for Windows?
> Which version? From where did you obtain it?
I'm not sure about the answer to these questions, so to clear things
up, I'm downloading it anew now. Getting it from
https://git-scm.com/download/win
Hi Junio & Lars,
On Thu, 20 Oct 2016, Junio C Hamano wrote:
> * ls/filter-process (2016-10-17) 14 commits
> (merged to 'next' on 2016-10-19 at ffd0de042c)
> + contrib/long-running-filter: add long running filter example
> + convert: add filter..process option
> + convert: prepare filter..pro
On Fri, Oct 21, 2016 at 7:11 PM, Duy Nguyen wrote:
> Yeah.. replacing the 4 DEFAULT_ABBREV in fetch.c with something
> sensible should do it.
Correction (if somebody will pick this up), it's
TRANSPORT_SUMMARY_WIDTH that needs to be adjusted, not those four.
--
Duy
Hi Stefan,
On Fri, 21 Oct 2016, Stefan Monov wrote:
> The default git distribution for windows
Are you referring to Git for Windows? Which version? From where did you
obtain it?
> contains, besides the CLI tools, a shell integration, i.e. a context
> menu for Windows Explorer. This context men
Nothing in the name "write_message()" suggests that the function
releases the strbuf passed to it. So let's release the strbuf in the
caller instead.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
i
Previously, we required an strbuf. But that limits the use case too much.
In the upcoming patch series (for which the current patch series prepares
the sequencer), we will want to write content to a file for which we have
a pointer and a length, not an strbuf.
Signed-off-by: Johannes Schindelin
-
There is no need to wait until the atexit() handler kicks in at the end.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 745c86f..9fced42 100644
--- a/sequencer.c
+++ b/sequencer.c
@
The sequencer was introduced to make the cherry-pick and revert
functionality available as library function, with the original idea
being to extend the sequencer to also implement the rebase -i
functionality.
The test to ensure that all of the commands in the script are identical
to the overall op
The definition of this function goes back all the way to 043a449
(sequencer: factor code out of revert builtin, 2012-01-11), long before a
serious effort was made to translate all the error messages.
It is slightly out of the context of the current patch series (whose
purpose it is to re-implement
This makes the code consistent by fixing quite a couple of error messages.
Suggested by Jakub Narębski.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index ff76b6f..340d0e
Quite a few error messages touched by this developer during the work to
speed up rebase -i started with an upper case letter, violating our
current conventions. Instead of sneaking in this fix (and forgetting
quite a few error messages), let's just have one wholesale patch fixing
all of the error m
This commit prepares for future callers that will have a pointer/length
to some text to be written that lacks an LF, yet an LF is desired.
Instead of requiring the caller to append an LF to the buffer (and
potentially allocate memory to do so), the write_message() function
learns to append an LF at
There was actually only one error message that was not yet marked for
translation.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 26 --
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 4c10c93..a61fe76 100644
--- a/seq
We really do not need the *pointer to a* pointer to the options in
the read_populate_opts() function.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index cb16cbd..c2fbf6f 100644
--- a/sequenc
In interactive rebases, we commit a little bit differently than the
sequencer did so far: we heed the "author-script", the "message" and the
"amend" files in the .git/rebase-merge/ subdirectory.
Likewise, we may want to edit the commit message *even* when providing a
file containing the suggested
In the upcoming commits, we will implement more and more of rebase -i's
functionality inside the sequencer. One particular feature of the
commands to come is that some of them allow editing the commit message
while others don't, i.e. we cannot define in the replay_opts whether the
commit message sh
Signed-off-by: Johannes Schindelin
---
sequencer.c | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 04fcfd8..120a8ee 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -229,11 +229,8 @@ static int error_dirty_index(struct replay_opts *opts)
It is not unheard of that editors on Windows write CR/LF even if the
file originally had only LF. This is particularly awkward for exec lines
of a rebase -i todo sheet. Take for example the insn "exec echo": The
shell script parser splits at the LF and leaves the CR attached to
"echo", which leads
The subcommands are used exactly once, at the very beginning of
sequencer_pick_revisions(), to determine what to do. This is an
unnecessary level of indirection: we can simply call the correct
function to begin with. So let's do that.
While at it, ensure that the subcommands return an error code s
Not only does this DRY up the code (providing a better documentation what
the code is about, as well as allowing to change the behavior in a single
place), it also makes it substantially shorter to use the same
functionality in functions to be introduced when we teach the sequencer to
process inter
The `git-rebase-todo` file contains a list of commands. Most of those
commands have the form
The is displayed primarily for the user's convenience, as
rebase -i really interprets only the part. However, there
are *some* places in interactive rebase where the is used to
display mess
The sequencer is our attempt to lib-ify cherry-pick. Yet it behaves
like a one-shot command when it reads its configuration: memory is
allocated and released only when the command exits.
This is kind of okay for git-cherry-pick, which *is* a one-shot
command. All the work to make the sequencer its
The run_git_commit() function already knows how to amend commits, and
with this new option, it can also clean up commit messages (i.e. strip
out commented lines). This is needed to implement rebase -i's 'fixup'
and 'squash' commands as sequencer commands.
Signed-off-by: Johannes Schindelin
---
s
Over the next commits, we will work on improving the sequencer to the
point where it can process the todo script of an interactive rebase. To
that end, we will need to teach the sequencer to read interactive
rebase's todo file. In preparation, we consolidate all places where
that todo file is neede
When we came up with the "sequencer" idea, we really wanted to have
kind of a plumbing equivalent of the interactive rebase. Hence the
choice of words: the "todo" script, a "pick", etc.
However, when it came time to implement the entire shebang, somehow this
idea got lost and the sequencer was use
Interactive rebase's scripts may be indented; we need to handle this
case, too, now that we prepare the sequencer to process interactive
rebases.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sequencer.c b/sequencer.c
index 8646ca5..d74
This teaches the run_git_commit() function to take an argument that will
allow us to implement "todo" commands that need to amend the commit
messages ("fixup", "squash" and "reword").
Signed-off-by: Johannes Schindelin
---
sequencer.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
As we are slowly teaching the sequencer to perform the hard work for
the interactive rebase, we need to read files that were written by
shell scripts.
These files typically contain a single line and are invariably ended
by a line feed (and possibly a carriage return before that). Let's use
a helpe
This patch series marks the '4' in the countdown to speed up rebase -i
by implementing large parts in C (read: there will be three more patch
series after that before the full benefit hits git.git: sequencer-i,
rebase--helper and rebase-i-extra). It is based on the `libify-sequencer`
patch series I
This change is not completely faithful: instead of initializing all fields
to 0, we choose to initialize command and subcommand to -1 (instead of
defaulting to REPLAY_REVERT and REPLAY_NONE, respectively). Practically,
it makes no difference at all, but future-proofs the code to require
explicit as
Signed-off-by: Johannes Schindelin
---
builtin/commit.c | 2 +-
sequencer.c | 11 ++-
sequencer.h | 5 +
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 1cba3b7..9fddb19 100644
--- a/builtin/commit.c
+++ b/builtin/c
In a couple of commits, we will teach the sequencer to handle the
nitty gritty of the interactive rebase, which keeps its state in a
different directory.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/
Hi.
The default git distribution for windows contains, besides the CLI
tools, a shell integration, i.e. a context menu for Windows Explorer.
This context menu has a "Git bash" option which I suppose should open
a Git bash prompt cd'd to the current directory. But instead, the git
bash window opens
On Fri, Oct 21, 2016 at 7:26 AM, Jeff King wrote:
> I recently started using lt/abbrev-auto via 'next'. This is the fetch
> output I saw today:
>
> $ git fetch
> remote: Counting objects: 332, done.
> remote: Compressing objects: 100% (237/237), done.
> remote: Total 332 (delta 182), reused 64 (de
Hi Junio,
On Thu, 20 Oct 2016, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > If I were doing this, I would make this into three separate steps:
> >
> > - move the strbuf_release(msgbuf) to the caller in
> > do_pick_commit();
> >
> > - add the missing rollback_lock_file(), w
Hi Junio,
On Thu, 20 Oct 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > The return value of do_recursive_merge() may be positive (indicating merge
> > conflicts), or 0 (indicating success). It also may be negative, indicating
> > a fatal error that requires us to abort.
> >
> >
1 - 100 of 113 matches
Mail list logo
