Replace `$(prefix)/etc/gitconfig` and `$(prefix)/etc/gitattributes` in
generated documentation with the paths chosen when building. Readers of
the documentation should not need to know how `$(prefix)` was defined.
It's also more consistent than sometimes using `$(prefix)/etc/gitconfig`
and other
The default core.excludesfile path is $XDG_CONFIG_HOME/git/ignore.
$HOME/.config/git/ignore is used if XDG_CONFIG_HOME is empty or unset,
as described later in the document.
Signed-off-by: Todd Zullinger
---
Documentation/gitignore.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff
Make it easier to find references to core.excludesfile and the default
$XDG_CONFIG_HOME/git/ignore path.
Signed-off-by: Todd Zullinger
---
I noticed the typo in core.excludesfile and $XDG_CONFIG_HOME while I was
verifing the previous change to clarify the documentation matched the code.
Fixing
On Tue, Jun 26, 2018 at 2:01 PM, Jeff King wrote:
> On Tue, Jun 26, 2018 at 04:46:18PM -0400, Eric Sunshine wrote:
>> Some of these dangers can be de-thoothed during the linting phase by
>> defining do-nothing shell functions:
>>
>> cp () { :; }
>> mv () { :; }
>> ln () { :; }
>>
>>
Jun 26, 2018 at 03:31:11PM -0700, Junio C Hamano wrote:
> Eric Sunshine writes:
>> On Tue, Jun 26, 2018 at 3:38 PM Junio C Hamano wrote:
>>> I like these earlier changes that fix existing breakage, of course.
>>> I also like many of the changes that simplify and/or modernise the
>>> test
Sie haben 5, OOO, OOO.OO EUR in das laufende Spendenprogramm der FIFA Fussball
Weltmeisterschaft Russland 2018 gespendet. Bitte antworten Sie zurück für
Ansprüche.
---
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus
Ian Campbell writes:
> On Mon, 2018-06-25 at 21:07 -0700, Michael Barabanov wrote:
>> The commits in state:filter.map have already been processed, so don't
>> filter them again. This makes incremental git filter-branch much
>> faster.
>>
>> Also add tests for --state-branch option.
>>
>>
Hi Paul,
I think I had revewied these 4 patches before, and I'd wager a bet that
you addressed all of my suggestions, if any.
I had a look over patches 2-4, and want to take a little bit more time
tomorrow to pour over patch 1 (which is a little larger, as it lays a lot
of ground work), to make
Eric Sunshine writes:
> On Tue, Jun 26, 2018 at 3:38 PM Junio C Hamano wrote:
>> I first looked at 29/29 and got heavily inclined to reject that
>> step, and then continued reading from 1/29 to around 15/29.
>>
>> I like these earlier changes that fix existing breakage, of course.
>> I also
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> index 84a537f39..fbf78249c 100644
> --- a/builtin/stash--helper.c
> +++ b/builtin/stash--helper.c
> @@ -522,6 +528,41 @@ static int drop_stash(int argc, const char
Christian Couder writes:
> Obviousness is often not the same for everybody.
... which you just learned---what you thought obvious turns out to
be not so obvious after all, so you adjust to help your readers.
>> In this particular case it even feels as if this test is not even testing
>> what
Herzlichen Glückwunsch, Sie haben in den Euro Millions / Google 650.000 Euro
gewonnen
Promo monatliche Auslosungen am 1. Juni 2018 statt.
Kontaktieren Sie unseren Schadenmakler mit den folgenden Informationen für
Schäden
auf dieser E-Mail: johnlubos...@gmail.com
1. Vollständiger Name:
2.
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> index 1c4387b10..84a537f39 100644
> --- a/builtin/stash--helper.c
> +++ b/builtin/stash--helper.c
> @@ -414,6 +451,77 @@ static int apply_stash(int argc, const char
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> This second series of patches contains commits to convert `apply`, `drop`,
> `clear`, `branch`, `pop` stash subcommands to builtins.
>
>
> Joel Teichroeb (4):
> stash: convert apply to builtin
> stash: convert drop and clear
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> Renamed some test cases' labels to be more descriptive and under 80
> characters per line.
>
> Signed-off-by: Paul-Sebastian Ungureanu
As I suggested this kind of change, I am obviously happy with this patch.
Apart from minor
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> Removed whitespaces after redirection operators.
That is accurate a description of what the patch does. Let's add the why
(and change the tense to present tense, as is the custom in our commit
messages):
This adjusts
Hi Paul,
as a general rule, we try to keep the commit subjects in the imperative,
i.e.
sha1-name.c: add 'get_oidf', which acts like 'get_oid'
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> Compared to 'get_oid', 'get_oidf' has as parameters a
> printf format string and the
Hi,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> This first series of patches does bring some changes and improvements to
> the test suite. One of the patches also introduces a new function
> `get_oidf()` which will be hepful for the incoming patches related to
> `git stash`.
For
On 26 Jun 2018, at 16:44, Johannes Schindelin
wrote:
>There is of course one other way to fix this, and that is by rewriting
>this in C.
>
>Which Alban has done here ;-)
>
>http://public-inbox.org/git/20180626161643.31152-3-alban.gr...@gmail.com
Oh, i'm sorry, i didn't see that. That change
Hi Junio,
On Tue, 26 Jun 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Tue, 26 Jun 2018, Alban Gruin wrote:
> >
> >> This adds an error when append_todo_help() fails to write its message to
> >> the todo file.
> >>
> >> Signed-off-by: Alban Gruin
> >
> > ACK.
> >
> > We
The current description of "core.ignoreCase" reads like an option which
is intended to be changed by the user while it's actually expected to
be set by Git on initialization only. Subsequently, Git relies on the
proper configuration of this variable, as noted by Bryan Turner [1]:
Git on a
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This rewrites the edit-todo functionality from shell to C.
>
> To achieve that, a new command mode, `edit-todo`, is added, and the
> `write-edit-todo` flag is removed, as the shell script does not need to
> write the edit todo help message to
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This patch rewrites the edit-todo functionality from shell to C. This is
> part of the effort to rewrite interactive rebase in C.
>
> This patch is based on the fourth iteration of my series rewriting
> append_todo_help() in C.
>
> Changes
Hi, me again,
On Tue, 26 Jun 2018, Johannes Schindelin wrote:
> On Tue, 26 Jun 2018, Johannes Schindelin wrote:
>
> > On Tue, 26 Jun 2018, dana wrote:
> >
> > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > > index 299ded213..a31af6d4c 100644
> > > ---
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This rewrites append_todo_help() from shell to C. It also incorporates
> some parts of initiate_action() and complete_action() that also write
> help texts to the todo file.
>
> This also introduces the source file rebase-interactive.c. This
Brandon Williams writes:
> Expand the transport fetch method signature, by adding an output
> parameter, to allow transports to return information about the refs they
> have fetched. Then communicate shallow status information through this
> mechanism instead of by modifying the input list of
On Tue, Jun 26, 2018 at 5:33 PM Elijah Newren wrote:
> On Tue, Jun 26, 2018 at 1:22 PM, Jeff King wrote:
> > Another option is to not enable this slightly-more-dangerous linting by
> > default. But that would probably rob it of its usefulness, since it
> > would just fall to some brave soul to
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> diff --git a/sequencer.h b/sequencer.h
> index c5787c6b5..08397b0d1 100644
> --- a/sequencer.h
> +++ b/sequencer.h
> @@ -3,6 +3,7 @@
>
> const char *git_path_commit_editmsg(void);
> const char *git_path_seq_dir(void);
> +const char
Brandon Williams writes:
> Refactor find_non_local_tags and get_ref_map to only take the
> information they need instead of the entire transport struct. Besides
> improving code clarity, this also improves their flexibility, allowing
> for a different set of refs to be used instead of relying on
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This patch rewrites append_todo_help() from shell to C. The C version
> covers a bit more than the old shell version. To achieve that, some
> parameters were added to rebase--helper.
>
> This also introduce a new source file,
Brandon Williams writes:
> diff --git a/t/lib-httpd/one-time-sed.sh b/t/lib-httpd/one-time-sed.sh
> new file mode 100644
> index 0..8a9a5aca0
> --- /dev/null
> +++ b/t/lib-httpd/one-time-sed.sh
> @@ -0,0 +1,22 @@
> +#!/bin/sh
> +
> +# If "one-time-sed" exists in $HTTPD_ROOT_PATH, run sed
Hi,
and now for the review...
On Tue, 26 Jun 2018, Johannes Schindelin wrote:
> On Tue, 26 Jun 2018, dana wrote:
>
> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > index 299ded213..a31af6d4c 100644
> > --- a/git-rebase--interactive.sh
> > +++
On Tue, Jun 26, 2018 at 1:22 PM, Jeff King wrote:
> On Tue, Jun 26, 2018 at 04:17:08PM -0400, Jeff King wrote:
>
>> I'm not sure if there's a good solution, though. Even if you retained
>> the subshells and instead did a chain-lint inside each subshell, like
>> this:
>
> So obviously that means
Let's Cc: Wink, who authored the commit mentioned as culprit in the commit
message.
On Tue, 26 Jun 2018, dana wrote:
> Fix a trivial white-space issue introduced by commit d48f97aa8
> ("rebase: reindent function git_rebase__interactive", 2018-03-23). This
> affected the instructional comments
Brandon Williams writes:
> +wanted-refs section
> + * This section is only included if the client has requested a
> + ref using a 'want-ref' line and if a packfile section is also
> + included in the response.
> +
> + * Always begins with the section header "wanted-refs".
On Tue, Jun 26, 2018 at 3:38 PM Junio C Hamano wrote:
> I first looked at 29/29 and got heavily inclined to reject that
> step, and then continued reading from 1/29 to around 15/29.
>
> I like these earlier changes that fix existing breakage, of course.
> I also like many of the changes that
Hi Chris,
On Tue, 26 Jun 2018, Christian Couder wrote:
> On Tue, Jun 26, 2018 at 4:10 PM, Johannes Schindelin
> wrote:
> >
> > The point, for me, is: if this test fails, at some stage in the
> > future, for any reason, it will be a major pain to even dissect what
> > the test is supposed to do.
On Tue, Jun 26, 2018 at 5:01 PM Jeff King wrote:
> On Tue, Jun 26, 2018 at 04:46:18PM -0400, Eric Sunshine wrote:
> > Some of these dangers can be de-thoothed during the linting phase by
> > defining do-nothing shell functions:
> >
> > cp () { :; }
> > mv () { :; }
> > ln () { :; }
>
Jeff King writes:
> One way this series might be worse in practice is that we tend not to
> change process state too much outside of the subshells.
> ...
> Whereas once you start collapsing subshells into the main logic chain,
> there's a very high chance that the subshell is doing a "cd", since
On Tue, Jun 26, 2018 at 04:46:18PM -0400, Eric Sunshine wrote:
> > I'm not sure if there's a good solution, though. Even if you retained
> > the subshells and instead did a chain-lint inside each subshell, like
> > this:
> >
> > (exit 117) &&
> > one &&
> > (
> > (exit 117) &&
> >
Am 26.06.2018 um 20:14 schrieb Eric Sunshine:
On Tue, Jun 26, 2018 at 2:06 PM Johannes Sixt wrote:
Hence, these lines should actually be
p4 help client &&
! p4 help nosuchcommand
Thanks for the comment; you're right, of course. I'll certainly make
this
On Tue, Jun 26, 2018 at 4:22 PM Jeff King wrote:
> So obviously that means "I don't think there's a good solution with this
> approach".
>
> That whole final patch simultaneously impresses and nauseates me. Your
> commit message says "no attempt is made at properly parsing shell code",
> but we
On Tue, 26 Jun 2018 13:15:33 -0700
Junio C Hamano wrote:
> Antonio Ospite writes:
>
> > Generlize config_from_gitmodules to accept a repository as an argument.
>
> generalize???
>
Of course I was going to miss a typo in the first word of the commit
message :|
If this is the only change,
Changes in v5:
* Added a comment explaining the one-time-sed.sh script
* Added a number of tests per reviewer feedback
* Fixed a typo in documentation
Brandon Williams (8):
test-pkt-line: add unpack-sideband subcommand
upload-pack: implement ref-in-want
upload-pack: test negotiation with
On Tue, 26 Jun 2018 13:11:40 -0700
Junio C Hamano wrote:
> Antonio Ospite writes:
>
> > Add a helper function to make it clearer that retrieving 'fetch'
> > configuration from the .gitmodules file is a special case supported
> > solely for backward compatibility purposes.
> > ...
>
> Then
Expand the transport fetch method signature, by adding an output
parameter, to allow transports to return information about the refs they
have fetched. Then communicate shallow status information through this
mechanism instead of by modifying the input list of refs.
This does require clients to
Implement ref-in-want on the client side so that when a server supports
the "ref-in-want" feature, a client will send "want-ref" lines for each
reference the client wants to fetch. This feature allows clients to
tolerate inconsistencies that exist when a remote repository's refs
change during the
Refactor find_non_local_tags and get_ref_map to only take the
information they need instead of the entire transport struct. Besides
improving code clarity, this also improves their flexibility, allowing
for a different set of refs to be used instead of relying on the ones
stored in the transport
Add tests to check the behavior of fetching from a repository which
changes between rounds of negotiation (for example, when different
servers in a load-balancing agreement participate in the same stateless
RPC negotiation). This forms a baseline of comparison to the ref-in-want
functionality
Currently, while performing packfile negotiation, clients are only
allowed to specify their desired objects using object ids. This causes
a vulnerability to failure when an object turns non-existent during
negotiation, which may happen if, for example, the desired repository is
provided by
Populate peer ref OIDs in get_ref_map instead of do_fetch. Besides
tightening scopes of variables in the code, this also prepares for
get_ref_map being able to be called multiple times within do_fetch.
Signed-off-by: Brandon Williams
---
builtin/fetch.c | 36 ++--
Refactor the fetch_refs function into a function that does the fetching
of refs and another function that stores them. This is in preparation
for allowing additional processing of the fetched refs before updating
the local ref store.
Signed-off-by: Brandon Williams
---
builtin/fetch.c | 23
Add an 'unpack-sideband' subcommand to the test-pkt-line helper to
enable unpacking packet line data sent multiplexed using a sideband.
Signed-off-by: Brandon Williams
---
t/helper/test-pkt-line.c | 33 +
1 file changed, 33 insertions(+)
diff --git
On Tue, Jun 26, 2018 at 4:17 PM Jeff King wrote:
> On Tue, Jun 26, 2018 at 03:52:54PM -0400, Eric Sunshine wrote:
> > So, this isn't a new problem introduced by this series, though this
> > series may exacerbate it.
>
> Whereas once you start collapsing subshells into the main logic chain,
>
Brandon Williams writes:
>> Changes since v1:
>> * Remove an extra space before an arrow operator in patch 2
>> * Fix a typo in the commit message of patch 3: s/fetchobjs/fetchjobs
>> * Add a note in the commit message of patch 6 about checking the
>> worktree before loading
On Tue, Jun 26, 2018 at 04:17:08PM -0400, Jeff King wrote:
> I'm not sure if there's a good solution, though. Even if you retained
> the subshells and instead did a chain-lint inside each subshell, like
> this:
So obviously that means "I don't think there's a good solution with this
approach".
On Tue, Jun 26, 2018 at 03:52:54PM -0400, Eric Sunshine wrote:
> The existing --chain-lint already suffers the same shortcoming. Older
> (or even new poorly-written) tests, even without subshells, can fall
> victim already:
>
> (exit $sentinel) &&
> mkdir -p a/b/c &&
> cd a/b/c
>
Antonio Ospite writes:
> Generlize config_from_gitmodules to accept a repository as an argument.
generalize???
>
> This is in preparation to reuse the function in repo_read_gitmodules in
> order to have a single point where the '.gitmodules' file is accessed.
>
> Signed-off-by: Antonio Ospite
Antonio Ospite writes:
> Now that 'config_from_gitmodules' is not used in the open, it can be
> marked as private.
Nice ;-)
Antonio Ospite writes:
> Add a helper function to make it clearer that retrieving 'fetch'
> configuration from the .gitmodules file is a special case supported
> solely for backward compatibility purposes.
> ...
Then perhaps the new public function deserves a comment stating
that?
> +struct
On Tue, Jun 26, 2018 at 3:31 PM Junio C Hamano wrote:
> Eric Sunshine writes:
> > These tests employ a noisy subshell (with missing &&-chain) to feed
> > input into Git commands:
> >
> > (echo a; echo b; echo c) | git some-command ...
> >
> > Drop the subshell in favor of a simple 'printf':
On Tue, Jun 26, 2018 at 02:27:39PM -0400, Jeff King wrote:
> So yeah, we would not want to allow EXT::"rm -rf /" to slip past the
> known-unsafe match. Any normalization should happen before then
> (probably right in transport_helper_init).
>
> Come to think of it, that's already sort-of an
Johannes Schindelin writes:
> Hi Alban,
>
> On Tue, 26 Jun 2018, Alban Gruin wrote:
>
>> This adds an error when append_todo_help() fails to write its message to
>> the todo file.
>>
>> Signed-off-by: Alban Gruin
>
> ACK.
>
> We *may* want to fold that into the commit that adds
On Tue, Jun 26, 2018 at 3:15 PM Junio C Hamano wrote:
> so, with --chain-lint, we would transform this
>
> mkdir -p a/b/c &&
> (
> cd a/b/c
> rm -fr ../../*
> ) &&
> statement 4
>
> into this sequence
>
> (exit $sentinel) &&
Eric Sunshine writes:
> The --chain-lint[1] option detects breakage in the top-level &&-chain of
> tests. This series undertakes the more complex task of teaching it to
> also detect &&-chain breakage within subshells. See patch 29/29 for the
> gory details of how that's done.
I first looked at
On Tue, Jun 26, 2018 at 9:05 PM Junio C Hamano wrote:
>
> Nicolas Dechesne writes:
>
> > i have noticed that merge.conflictstyle has an impact on the rerere
> > resolution. looking briefly at the source code, it seems that git
> > tries to discard the common ancestor diff3 bits, but what I am
Eric Sunshine writes:
> These tests employ a noisy subshell (with missing &&-chain) to feed
> input into Git commands:
>
> (echo a; echo b; echo c) | git some-command ...
>
> Drop the subshell in favor of a simple 'printf':
>
> printf "%s\n" a b c | git some-command ...
That's called
On Mon, 2018-06-25 at 21:07 -0700, Michael Barabanov wrote:
> The commits in state:filter.map have already been processed, so don't
> filter them again. This makes incremental git filter-branch much
> faster.
>
> Also add tests for --state-branch option.
>
> Signed-off-by: Michael Barabanov
Eric Sunshine writes:
> The --chain-lint option detects broken &&-chains by forcing the test to
> exit early (as the very first step) with a sentinel value. If that
> sentinel is the test's overall exit code, then the &&-chain is intact;
> if not, then the chain is broken. Unfortunately, this
Nicolas Dechesne writes:
> i have noticed that merge.conflictstyle has an impact on the rerere
> resolution. looking briefly at the source code, it seems that git
> tries to discard the common ancestor diff3 bits, but what I am seeing
> is that if i do the following then it fails:
>
> 1. from a
Jonathan Tan writes:
> During negotiation, fetch-pack eventually reports as "have" lines all
> commits reachable from all refs. Allow the user to restrict the commits
> sent in this way by providing a whitelist of tips; only the tips
> themselves and their ancestors will be sent.
>
> This
On Tue, Jun 26, 2018 at 10:09:58AM -0700, Junio C Hamano wrote:
> > It may also interact in a funny way with our allowed-protocol code, if
> > "SSH" gets a pass as "ssh" under the default config, but actually runs
> > the otherwise-disallowed git-remote-SSH (though one would _hope_ if you
> >
Elijah Newren writes:
> +# Rebase has lots of useful options like --whitepsace=fix, which are
> +# actually all built in terms of flags to git-am. Since neither
> +# --merge nor --interactive (nor any options that imply those two) use
> +# git-am, using them together will result in flags like
On Tue, Jun 26, 2018 at 2:06 PM Johannes Sixt wrote:
> Am 26.06.2018 um 11:21 schrieb Eric Sunshine:
> >> On Tue, Jun 26, 2018 at 12:29 AM, Eric Sunshine
> >> wrote:
> >>> + p4 help client &&
> >>> + test_must_fail p4 help nosuchcommand
> > [...] So, despite
> > the
Am 26.06.2018 um 11:21 schrieb Eric Sunshine:
On Tue, Jun 26, 2018 at 4:58 AM Elijah Newren wrote:
On Tue, Jun 26, 2018 at 12:29 AM, Eric Sunshine wrote:
+ p4 help client &&
+ test_must_fail p4 help nosuchcommand
same question?
Same answer. Not shown in this
Fix a trivial white-space issue introduced by commit d48f97aa8
("rebase: reindent function git_rebase__interactive", 2018-03-23). This
affected the instructional comments displayed in the editor during an
interactive rebase.
Signed-off-by: dana
---
Sorry if i've done any of this wrong; i've
Hi,
Jonathan Tan wrote:
> During negotiation, fetch-pack eventually reports as "have" lines all
> commits reachable from all refs. Allow the user to restrict the commits
> sent in this way by providing a whitelist of tips; only the tips
> themselves and their ancestors will be sent.
>
> This
Alban Gruin writes:
I do not think "base_commit" is a good name, either, though. When I
hear 'base' in the context of 'rebase', I would imagine that the
speaker is talking about the bottom of the range of the commits to
be rebased (i.e. "rebase --onto ONTO BASE BRANCH",
Alban Gruin writes:
> This rewrites checkout_onto() from shell to C. The new version is called
> detach_onto(), given its role.
The name, given its role, may be good, but is the implementtaion
robust enough to fulfill the promise its name gives?
> git rebase--helper --check-todo-list ||
Jeff King writes:
>> > We seem to match url schemes case-sensitively:
>> >
>> > $ git clone SSH://example.com/repo.git
>> > Cloning into 'repo'...
>> > fatal: Unable to find remote helper for 'SSH'
>> >
>> > whereas rfc3986 is clear that the scheme portion is case-insensitive.
>> > We
> diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
> index e80eacbb1b..776769fe0d 100755
> --- a/t/t9001-send-email.sh
> +++ b/t/t9001-send-email.sh
> @@ -1966,11 +1966,11 @@ test_expect_success $PREREQ 'invoke hook' '
>
> # Verify error message when a patch is rejected
On 06/26, Antonio Ospite wrote:
> Hi,
>
> this is version 2 of the series from
> https://public-inbox.org/git/20180622162656.19338-1-...@ao2.it/
>
> The .gitmodules file is not meant for arbitrary configuration, it should
> be used only for submodules properties.
>
> Plus, arbitrary git
On Tue, 26 Jun 2018, Jeff King wrote:
> On Tue, Jun 26, 2018 at 06:18:26AM -0400, Robert P. J. Day wrote:
>
> >
> > ENVIRONMENT
> > GIT_CONFIG
> > Take the configuration from the given file instead of
> > .git/config. Using the "--global" option forces this to
> >
Taylor Blau writes:
> On Mon, Jun 25, 2018 at 02:43:50PM -0400, Jeff King wrote:
>> On Fri, Jun 22, 2018 at 10:49:26AM -0500, Taylor Blau wrote:
>> > Since the last time, only a couple of things have changed at Peff's
>> > suggestions in [1]. The changes are summarized here, and an inter-diff
>>
Jonathan Tan writes:
> As for whether both these functions are necessary in the first place, I
> think they are.
I do not mind their existence.
I was wondering if they can share more implementation; such a design
would need s/the_commit_graph/the_repo->objstore->commit_graph/ only
once as a
This patch rewrites the edit-todo functionality from shell to C. This is
part of the effort to rewrite interactive rebase in C.
This patch is based on the fourth iteration of my series rewriting
append_todo_help() in C.
Changes since v2:
- Moving edit_todo() from sequencer.c to
As part of the rewrite of interactive rebase, the sequencer will need to
open the sequence editor to allow the user to edit the todo list.
Instead of duplicating the existing launch_editor() function, this
refactors it to a new function, launch_specified_editor(), which takes
the editor as a
This rewrites the edit-todo functionality from shell to C.
To achieve that, a new command mode, `edit-todo`, is added, and the
`write-edit-todo` flag is removed, as the shell script does not need to
write the edit todo help message to the todo list anymore.
The shell version is then stripped in
This rewrites append_todo_help() from shell to C. It also incorporates
some parts of initiate_action() and complete_action() that also write
help texts to the todo file.
This also introduces the source file rebase-interactive.c. This file
will contain functions necessary for interactive rebase
This makes rebase_path_todo(), get_missign_commit_check_level() and the
enum check_level accessible outside sequencer.c. This will be needed
for the rewrite of append_todo_help() from shell to C, as it will be in
a new library source file, rebase-interactive.c.
Signed-off-by: Alban Gruin
---
This patch rewrites append_todo_help() from shell to C. The C version
covers a bit more than the old shell version. To achieve that, some
parameters were added to rebase--helper.
This also introduce a new source file, rebase-interactive.c.
This is part of the effort to rewrite interactive rebase
Hi Dscho,
On Tue, Jun 26, 2018 at 4:10 PM, Johannes Schindelin
wrote:
>
> On Tue, 26 Jun 2018, Christian Couder wrote:
>
>> On Mon, Jun 25, 2018 at 7:33 PM, Junio C Hamano wrote:
>>
>> > I hate to say this, but the above looks like a typical
>> > unmaintainable mess.
>> >
>> > What happens when
Hi Eric,
On Tue, Jun 26, 2018, 2:31 AM Eric Sunshine wrote:
>
> On Tue, Jun 26, 2018 at 5:20 AM Elijah Newren wrote:
> > On Tue, Jun 26, 2018 at 12:29 AM, Eric Sunshine
> > wrote:
> > > Aside from identifying a rather significant number of &&-chain breaks,
> > > repairing those broken chains
Hi Chris,
On Tue, 26 Jun 2018, Christian Couder wrote:
> On Mon, Jun 25, 2018 at 7:33 PM, Junio C Hamano wrote:
> > Tiago Botelho writes:
> >
> >> +test_expect_success "--bisect-all --first-parent" '
> >> +cat >expect1 < >> +$(git rev-parse CC) (dist=2)
> >> +$(git rev-parse EX) (dist=1)
> >>
hi there,
i have noticed that merge.conflictstyle has an impact on the rerere
resolution. looking briefly at the source code, it seems that git
tries to discard the common ancestor diff3 bits, but what I am seeing
is that if i do the following then it fails:
1. from a clean rr-cache state, with
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This adds an error when append_todo_help() fails to write its message to
> the todo file.
>
> Signed-off-by: Alban Gruin
ACK.
We *may* want to fold that into the commit that adds `append_todo_help()`.
And, as I mentioned previously, I would
On Tue, Jun 26, 2018 at 06:18:26AM -0400, Robert P. J. Day wrote:
>
> ENVIRONMENT
> GIT_CONFIG
> Take the configuration from the given file instead of
> .git/config. Using the "--global" option forces this to
> ~/.gitconfig. Using the "--system" option forces this to
>
On Mon, Jun 25, 2018 at 11:19:51AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > We seem to match url schemes case-sensitively:
> >
> > $ git clone SSH://example.com/repo.git
> > Cloning into 'repo'...
> > fatal: Unable to find remote helper for 'SSH'
> >
> > whereas rfc3986 is
On Mon, Jun 25, 2018 at 7:33 PM, Junio C Hamano wrote:
> Tiago Botelho writes:
>
>> +test_expect_success "--bisect-all --first-parent" '
>> +cat >expect1 <> +$(git rev-parse CC) (dist=2)
>> +$(git rev-parse EX) (dist=1)
>> +$(git rev-parse D) (dist=1)
>> +$(git rev-parse FX) (dist=0)
>> +EOF
>>
On Tue, Jun 26, 2018 at 12:47 AM, Junio C Hamano wrote:
Happy 2.18.0 everyone!
> * ab/fetch-tags-noclobber (2018-05-16) 9 commits
> - fixup! push tests: assert re-pushing annotated tags
> - fetch: stop clobbering existing tags without --force
> - fetch tests: add a test clobbering tag
1 - 100 of 148 matches
Mail list logo
