Jeff King writes:
>> It was a bit more painful than necessary to make sure I have
>> something that can be merged for 2.14.x maintenance track, but I
>> think the topic is now in a reasonable shape, and I've merged it to
>> 'next'. On the first-parent chain from 'master' to 'pu', the merge
>> of
On Mon, Oct 16, 2017 at 11:51:01PM -0700, Jonathan Nieder wrote:
> > OK, so it seems we both have slight preference for the "peel back"
> > approach. Adding Jonathan to Cc:
>
> Which approach is "harder but right" / "peel back"?
"peel back" is reverting back to the pre-v2.14.2 state (Junio has
On Tue, Oct 17, 2017 at 03:26:25PM +0900, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Jeff King writes:
> >
> >> After pondering over it, I have a slight preference for that, too. But
> >> I'm also happy to hear more input.
> >
> > OK, so it seems we both have slight preference for the
On Wed, Oct 18, 2017 at 05:55:18AM +0900, Junio C Hamano wrote:
> I'll take these three to replace what I tentatively queued, not
> necessarily because I like the change in 1/3 better, but because
> these are explained much better; besides I prefer a version that at
> least two people deeply looke
On Wed, Oct 18, 2017 at 12:41:03PM +0900, Junio C Hamano wrote:
> Jeff King writes:
>
> > It does make me wonder if there are other instances of the missing-space
> > problem lurking. Grepping for backtick followed by single-quote shows
> > only one more case in user-manual.txt. I have no idea i
Jeff King writes:
> It does make me wonder if there are other instances of the missing-space
> problem lurking. Grepping for backtick followed by single-quote shows
> only one more case in user-manual.txt. I have no idea if that one hits
> the same problem on older docbook versions.
I had an imp
On Wed, Oct 18, 2017 at 11:34:31AM +0900, Junio C Hamano wrote:
> -- >8 --
> branch doc: sprinkle a few commas for readability
>
> The "--force" option can also be used when the named branch does not
> yet exist, and the point of the option is the user can (re)point the
> branch to the named comm
Junio C Hamano writes:
> Andreas Schwab writes:
>
>> On Okt 16 2017, Jeff King wrote:
>>
>>> We do have some hacks/workarounds for broken versions of the toolchain.
>>> You can try tweaking various knobs you find in Documentation/Makefile).
>>> DOCBOOK_SUPPRESS_SP sounds promising, but I think
Weird, it was not working for me earlier today, but now it works.
Thank you,
Gilberto
On Tue, Oct 17, 2017 at 5:57 PM, Junio C Hamano wrote:
> Gilberto Stankiewicz writes:
>
>> I am trying to clone git://repo.or.cz/git-gui.git as described at
>> https://github.com/git/git/blob/master/Documenta
Junio C Hamano writes:
> base to show an incremental improvement, but here is how I would do
> the "code" part.
>
> builtin/push.c | 22 ++
> 1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/push.c b/builtin/push.c
> index 03846e8379..89ef029c67 10064
Marius Paliga writes:
> builtin/push.c: add push.pushOption config
This is a good title for this change; it would be perfect if it were
on the Subject: header ;-)
> Currently push options need to be given explicitly, via
> the command line as "git push --push-option".
>
> The UX of Git would be
Gilberto Stankiewicz writes:
> I am trying to clone git://repo.or.cz/git-gui.git as described at
> https://github.com/git/git/blob/master/Documentation/SubmittingPatches
> but it seems the repo does not exist.
$ git fetch -v git-gui
Looking up repo.or.cz ... done.
Connecting to repo.or.cz (port
David Glasser writes:
> From: David Glasser
>
> The docs claim that filters are applied in the listed order, so
> subdirectory-filter should come first.
>
> For consistency, apply the same order to the SYNOPSIS and the script's usage,
> as
> well as the switch while parsing arguments.
>
> Add m
Stefan Beller writes:
> On Mon, Oct 16, 2017 at 6:59 AM, Heiko Voigt wrote:
>> To make extending this logic later easier.
>>
>> Signed-off-by: Heiko Voigt
>
> Thanks for this readability fix!
>
> Stefan
Thanks, both.
Stefan Beller writes:
>> + /* make sure name does not collide with existing one
>> */
>> + submodule = submodule_from_name(commit_oid, name);
>> + if (submodule) {
>> + warning("Submodule in commit %s
Hello,
I am trying to clone git://repo.or.cz/git-gui.git as described at
https://github.com/git/git/blob/master/Documentation/SubmittingPatches
but it seems the repo does not exist.
Has the repo changed from location?
Thank you,
Gilberto
René Scharfe writes:
> Stop advertising -h as the short equivalent of --heads, because it's
> used for showing a short help text for almost all other git commands.
> Since the ba5f28bf79 (ls-remote: use parse-options api) it has only
> been working when used together with other parameters anyway.
On Tue, Oct 17, 2017 at 10:45:15PM +0100, Thomas Gummerer wrote:
> > Seems reasonable, though if we are deprecating "save" should we demote
> > it from being in the synopsis entirely?
>
> I saw that as a next step, with the "official" deprecation of "save".
> I thought we might want to advertise
On 10/17, Jeff King wrote:
> On Thu, Oct 05, 2017 at 09:00:49PM +0100, Thomas Gummerer wrote:
>
> > Since you were asking :) With the introduction of 'git stash push',
> > my hope was always that we could eventually get rid of 'git stash
> > save' and only keep one interface around.
> >
> > As t
On 10/17, Jeff King wrote:
> On Thu, Oct 05, 2017 at 09:10:29PM +0100, Thomas Gummerer wrote:
>
> > Because 'stash push' and 'stash save' are so closely related they share one
> > section in the man page. Currently 'stash save' comes first, as that
> > was the command that people were historicall
On 17/10/2017 19:30, Johannes Sixt wrote:
> Am 17.10.2017 um 01:01 schrieb Rafael Ascensao:
>>> This is worth discussing, though not my preference. The picture to "pick
>>> cherries" has become quite common, and now that we use it for the name of
>>> the command, "cherry-pick", the direction of flo
On Wed, Oct 18, 2017 at 06:02:59AM +0900, Junio C Hamano wrote:
> Brandon Williams writes:
>
> > I haven't noticed any issues myself but maybe this has something to do
> > with my changes to this test in the 'bw/protocol-v1' topic?
>
> As I've seen this on 'master', too, I suspect the topic has
Kevin Daudt writes:
> The commit that changed what you described is 1073094f3 (git-sh-setup:
> be explicit where to dot-source git-sh-i18n from., 2016-10-29). That
> commit claims there were already scripts that assumed GIT_EXEC_PATH is
> just a single entry. That commit was included in v2.11.
>
Junio C Hamano wrote:
> Jonathan Nieder writes:
>> From: Junio C Hamano
>>
>> "git check-ref-format --branch $name" feature was originally
>> introduced (and was advertised) as a way for scripts to take any
>> end-user supplied string (like "master", "@{-1}" etc.) and see if it
>> is usable when
Brandon Williams writes:
> I haven't noticed any issues myself but maybe this has something to do
> with my changes to this test in the 'bw/protocol-v1' topic?
As I've seen this on 'master', too, I suspect the topic has nothing
to do with it.
Here is what I have on 'pu'.
-- >8 --
From: Junio
Jonathan Nieder writes:
> nits:
>
> s/most typically/typically/
> s/an fully/a fully/
>
> With those tweaks,
> Reviewed-by: Jonathan Nieder
Thanks.
Andreas Schwab writes:
> On Okt 16 2017, Jeff King wrote:
>
>> We do have some hacks/workarounds for broken versions of the toolchain.
>> You can try tweaking various knobs you find in Documentation/Makefile).
>> DOCBOOK_SUPPRESS_SP sounds promising, but I think it actually does the
>> opposite
Jonathan Nieder writes:
> From: Junio C Hamano
>
> "git check-ref-format --branch $name" feature was originally
> introduced (and was advertised) as a way for scripts to take any
> end-user supplied string (like "master", "@{-1}" etc.) and see if it
> is usable when Git expects to see a branch n
On Okt 17 2017, Jeff King wrote:
> One other thing to try:
>
> rm git-branch.1
> make NO_MAN_BOLD_LITERAL=1 git-branch.1
That doesn't help:
Reset to if exists already\&. Without
\-f\fIgit branch\fR
refuses to change an existing branch\&. In combination with
Andreas.
--
Andrea
Hi Junio,
Junio C Hamano wrote:
> Since a9d34933 ("Merge branch 'fm/fetch-raw-sha1'", 2015-06-01) we
> allow to fetch by an object name when the other side accepts such a
> request, but we never updated the documentation to match.
>
> Signed-off-by: Junio C Hamano
> ---
> Documentation/pull-fet
On Tue, Oct 17, 2017 at 07:52:03PM +0200, Andreas Schwab wrote:
> > Yes, it's in that step, but xmlto is just driving the xslt
> > transformation done by docbook. So the interesting version is probably
> > docbook. I have docbook-xsl 1.79.1+dfsg-2 (from Debian unstable).
>
> docbook-xsl-styleshee
On Mon, Oct 16, 2017 at 6:59 AM, Heiko Voigt wrote:
> To make extending this logic later easier.
>
> Signed-off-by: Heiko Voigt
Thanks for this readability fix!
Stefan
On Okt 16 2017, Jeff King wrote:
> We do have some hacks/workarounds for broken versions of the toolchain.
> You can try tweaking various knobs you find in Documentation/Makefile).
> DOCBOOK_SUPPRESS_SP sounds promising, but I think it actually does the
> opposite (removes extra spaces).
An easy
On Mon, Oct 16, 2017 at 6:57 AM, Heiko Voigt wrote:
> The current implementation of submodules supports on-demand fetch if
> there is no .gitmodules entry for a submodule. Let's add a test to
> document this behavior.
>
> Signed-off-by: Heiko Voigt
> ---
> t/t5526-fetch-submodules.sh | 42 ++
On Okt 17 2017, Jeff King wrote:
> On Tue, Oct 17, 2017 at 07:25:28PM +0200, Andreas Schwab wrote:
>
>> >> I see this in git-branch.1:
>> >>
>> >> Reset to if exists already\&.
>> >> Without
>> >> \fB\-f\fR\fIgit branch\fR
>> >> refuses to change an existing branch\&. In combination wi
On Mon, Oct 16, 2017 at 6:58 AM, Heiko Voigt wrote:
> We store the changed submodules paths to calculate which submodule needs
> fetching. This does not work for moved submodules since their paths do
> not stay the same in case of a moved submodules. In case of new
> submodules we do not have a pa
René Scharfe wrote:
> Stop advertising -h as the short equivalent of --heads, because it's
> used for showing a short help text for almost all other git commands.
> Since the ba5f28bf79 (ls-remote: use parse-options api) it has only
> been working when used together with other parameters anyway.
>
René Scharfe wrote:
> Since ba5f28bf79 (ls-remote: use parse-options api) git ls-remote -h
> without any other options has shown the short help text of the command
> instead of acting as the short equivalent of --heads. Fix this
> regression by turning off internal handling of -h for repository s
On 17 October 2017 at 17:39, René Scharfe wrote:
> Since ba5f28bf79 (ls-remote: use parse-options api) git ls-remote -h
> without any other options has shown the short help text of the command
> instead of acting as the short equivalent of --heads. Fix this
> regression by turning off internal ha
On 17 October 2017 at 17:39, René Scharfe wrote:
> Stop advertising -h as the short equivalent of --heads, because it's
> used for showing a short help text for almost all other git commands.
> Since the ba5f28bf79 (ls-remote: use parse-options api) it has only
> been working when used together wi
Hi,
René Scharfe wrote:
> Builtin commands have skipped repo setup when called with just a single
> option -h and thus shown their short help text even outside of
> repositories since 99caeed05d3 (Let 'git -h' show usage
> without a git dir).
>
> Add the flag NO_INTERNAL_HELP for builtins to opt
Am 17.10.2017 um 01:01 schrieb Rafael Ascensao:
This is worth discussing, though not my preference. The picture to "pick
cherries" has become quite common, and now that we use it for the name of
the command, "cherry-pick", the direction of flow is quite obvious and
strongly implied: from somewher
On Tue, Oct 17, 2017 at 07:25:28PM +0200, Andreas Schwab wrote:
> >> I see this in git-branch.1:
> >>
> >> Reset to if exists already\&.
> >> Without
> >> \fB\-f\fR\fIgit branch\fR
> >> refuses to change an existing branch\&. In combination with
> >>
> >> This is with asciidoc 8.6.9.
>
On Okt 17 2017, Jeff King wrote:
> On Tue, Oct 17, 2017 at 06:29:59PM +0200, Andreas Schwab wrote:
>
>> On Okt 16 2017, Jeff King wrote:
>>
>> > I get:
>> >
>> > Reset to if exists already\&.
>> > Without
>> > \fB\-f\fR
>> > \fIgit branch\fR
>> > refuses to change an existing branch
On 10/17, Junio C Hamano wrote:
> I seem to be seeing sporadic errors with this test, and today I got
> annoyed enough to do
>
> cd t && while sh t5601-clone.sh -i -v; do :; done
>
> I saw an error from "cp" saying "plink.exe - text file busy" or
> something like that at around test #45; he
On Tue, Oct 17, 2017 at 06:29:59PM +0200, Andreas Schwab wrote:
> On Okt 16 2017, Jeff King wrote:
>
> > I get:
> >
> > Reset to if exists already\&.
> > Without
> > \fB\-f\fR
> > \fIgit branch\fR
> > refuses to change an existing branch\&. In combination with
>
> I see this in git-
On Okt 16 2017, Jeff King wrote:
> I get:
>
> Reset to if exists already\&. Without
> \fB\-f\fR
> \fIgit branch\fR
> refuses to change an existing branch\&. In combination with
I see this in git-branch.1:
Reset to if exists already\&. Without
\fB\-f\fR\fIgit branch\fR
refuse
Translate 70 new messages came from git.pot update in 25eab542b
(l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)) and 9c07fab78
(l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)).
Signed-off-by: Ralf Thielow
---
po/de.po | 253 ++-
Change an error message in sequencer.c for the case that
we could not write to a file to match other instances.
Signed-off-by: Ralf Thielow
---
sequencer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 75f5356f6..f2a10cc4f 100644
--- a/sequen
On Tue, Oct 17, 2017 at 06:21:22PM +0300, Nikolay Yakimov wrote:
> Hello. After updating to a recent git release (2.14, I believe, but
> possibly earlier), setting GIT_EXEC_PATH to multiple directories
> stopped working. It did work before, and I believe the culprit is
> 'git-sh-setup', which uses
Since ba5f28bf79 (ls-remote: use parse-options api) git ls-remote -h
without any other options has shown the short help text of the command
instead of acting as the short equivalent of --heads. Fix this
regression by turning off internal handling of -h for repository setup,
and option parsing, as
Stop advertising -h as the short equivalent of --heads, because it's
used for showing a short help text for almost all other git commands.
Since the ba5f28bf79 (ls-remote: use parse-options api) it has only
been working when used together with other parameters anyway.
Signed-off-by: Rene Scharfe
Builtin commands have skipped repo setup when called with just a single
option -h and thus shown their short help text even outside of
repositories since 99caeed05d3 (Let 'git -h' show usage
without a git dir).
Add the flag NO_INTERNAL_HELP for builtins to opt out of this special
treatment and pr
Hello. After updating to a recent git release (2.14, I believe, but
possibly earlier), setting GIT_EXEC_PATH to multiple directories
stopped working. It did work before, and I believe the culprit is
'git-sh-setup', which uses 'git --exec-path' output directly, while
most other git components observ
Hi ,
Would you be interested in the "Attendees list of Society for Neuroscience -
SfN-2017"
Let me know your interest to send you the number of Attendees and cost .
Regards,
Donald Charles,
If you do not wish to receive future emails from us, please reply as 'leave
out'.
We meticulously pass the `exclude` flag to the `treat_directory()`
function so that we can indicate that files in it are excluded rather
than untracked when recursing.
But we did not yet treat submodules the same way.
Signed-off-by: Johannes Schindelin
---
Published-As: https://github.com/dscho/
On 10/05/2017 05:04 AM, Joshua Lamusga wrote:
Anyway, I follow a very simple merging model for this one-person
project. Recently, I made a new local branch off of develop called
feature-printing. After checking out feature-printing, making my
changes, and committing changes, I merged it with deve
Salut mon bon ami!
Vous avez été désigné comme le plus proche parent de mon client en
retard qui a déposé les 7,3 millions de dollars avant sa mort et votre
profil a été ajouté à notre base de données. Vous êtes maintenant ravi
de répondre avec effet immédiat pour plus information.
Voici votre nu
From: David Glasser
The docs claim that filters are applied in the listed order, so
subdirectory-filter should come first.
For consistency, apply the same order to the SYNOPSIS and the script's usage, as
well as the switch while parsing arguments.
Add missing --prune-empty to the script's usage
Hi Dear,
how are you today I hope that everything is OK with you as it is my great
pleasure to contact you in having communication with you starting from today, i
was just going through the Internet search when i found your email address, I
want to make a very new and special friend, so i dec
Hi Steve,
On Mon, 16 Oct 2017, Steve Hoelzer wrote:
> On Mon, Oct 16, 2017 at 5:57 AM, Johannes Schindelin
> wrote:
> > Hi Steve,
> >
> > On Sun, 15 Oct 2017, Johannes Schindelin wrote:
> >
> >> On Fri, 13 Oct 2017, Steve Hoelzer wrote:
> >>
> >> > On Thu, Oct 12, 2017 at 5:53 PM, Johannes Schin
Jonathan Nieder writes:
> Junio C Hamano wrote:
>> Jonathan Nieder writes:
>
>>> Handles the nongit case in strbuf_check_branch_ref instead of
>>> introducing a new check_branch_ref_format helper.
>>
>> I view that as a regression, actually. Don't we want a function
>> that does not require a s
Junio C Hamano wrote:
> Jonathan Nieder writes:
>> And in that spirit, I think the patch you replied with aims to go in
>> the right direction, by providing the core functionality when in a
>> repository while avoiding breaking such a script outside of one
>> (though I do not understand it fully
2017-10-17 8:53 GMT+02:00 Junio C Hamano :
> Jiang Xin writes:
>
>> Git v2.15.0-rc1 released with a typo fix from commit dfab1eac23
>> ("i18n: add a missing space in message", Sun Oct 8 14:18:39 2017 +0200).
>> This time there are 2 updated messages need to be translated since last
>> update. Let
Junio C Hamano wrote:
> Jonathan Nieder writes:
>> And in that spirit, I think the patch you replied with aims to go in
>> the right direction, by providing the core functionality when in a
>> repository while avoiding breaking such a script outside of one
>> (though I do not understand it fully
Junio C Hamano wrote:
> Jonathan Nieder writes:
>> Handles the nongit case in strbuf_check_branch_ref instead of
>> introducing a new check_branch_ref_format helper.
>
> I view that as a regression, actually. Don't we want a function
> that does not require a strbuf when asking a simple question
I just sent a patch to a new thread which is not what I wanted.
However I already sent the same patch a few days ago:
https://public-inbox.org/git/CAK7vU=2ePR3jQsgu=rxsmrxytaahqxc0sfrn5yozlzqzp2z...@mail.gmail.com/
2017-10-17 6:01 GMT+02:00 Junio C Hamano :
> Thais Diniz writes:
>
>> +Just to cl
From: Junio C Hamano
"git check-ref-format --branch $name" feature was originally
introduced (and was advertised) as a way for scripts to take any
end-user supplied string (like "master", "@{-1}" etc.) and see if it
is usable when Git expects to see a branch name, and also obtain the
concrete bra
Jonathan Nieder writes:
> Handles the nongit case in strbuf_check_branch_ref instead of
> introducing a new check_branch_ref_format helper.
I view that as a regression, actually. Don't we want a function
that does not require a strbuf when asking a simple question: "I
have a string, and I want
From: Junio C Hamano
The expansion returned from strbuf_check_branch_ref always starts with
"refs/heads/" by construction, but there is nothing about its name or
advertised API making that obvious. This command is used to process
human-supplied input from the command line and is usually not the
From: Junio C Hamano
Running "git check-ref-format --branch @{-1}" from outside any
repository produces
$ git check-ref-format --branch @{-1}
BUG: environment.c:182: git environment hasn't been setup
This is because the expansion of @{-1} must come from the HEAD reflog,
which in
Hi,
Junio C Hamano wrote:
> Subject: [PATCH] check-ref-format: --branch cannot grok @{-1} outside a
> repository
How about this? It is written to be more conservative than the patch
I am replying to, but except for the commit message, it should be
pretty much equivalent.
[...]
> --- a/builtin
Jonathan Nieder writes:
> And in that spirit, I think the patch you replied with aims to go in
> the right direction, by providing the core functionality when in a
> repository while avoiding breaking such a script outside of one
> (though I do not understand it fully yet).
Given that, is it saf
73 matches
Mail list logo
