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:
> 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
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 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
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
> > > ---
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.
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,
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
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
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 () { :; }
>
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
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,
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:
> 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
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
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
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
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
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.
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
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
> > +++
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:
> 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
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
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
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,
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
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
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 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
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
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.
This change removes one direct use of 'config_from_gitmodules' in code
not strictly related to submodules, in the effort
Now that 'config_from_gitmodules' is not used in the open, it can be
marked as private.
Hopefully this will prevent its usage for retrieving arbitrary
configuration form the '.gitmodules' file.
Signed-off-by: Antonio Ospite
---
submodule-config.c | 8
submodule-config.h | 12
The .gitmodules file is not meant as a place to store arbitrary
configuration to distribute with the repository.
Move config_from_gitmodules() out of config.c and into
submodule-config.c to make it even clearer that it is not a mechanism to
retrieve arbitrary configuration from the .gitmodules
Reuse config_from_gitmodules in repo_read_gitmodules to remove some
duplication and also have a single point where the .gitmodules file is
read.
The change does not introduce any new behavior, the same gitmodules_cb
config callback is still used, which only deals with configuration
specific to
Generlize config_from_gitmodules to accept a repository as an argument.
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
---
submodule-config.c | 10 +-
1 file
Add a helper function to make it clearer that retrieving 'update-clone'
configuration from the .gitmodules file is a special case supported
solely for backward compatibility purposes.
This change removes one direct use of 'config_from_gitmodules' for
options not strictly related to submodules:
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 configuration should not be distributed with the
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
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
>>
101 - 148 of 148 matches
Mail list logo
