The default pre-commit script checks the config variable
"hooks.allownonascii" to determine whether to allow non-ASCII file
names -- mention this in "man githooks", just as the section on
"update" mentions the use of "hooks.allowunannotated".
Signed-off-by: Robert P. J. Day
---
diff --git a/D
>>> Junio C Hamano schrieb am 19.02.2019 um 20:32 in
Nachricht
:
> Elijah Newren writes:
>
>> +With ‑‑no‑commit perform the merge and stop just before creating
>> +a merge commit, to give the user a chance to inspect and further
>> +tweak the merge result before committing.
>> ++
>> +Note that f
Thomas Gummerer writes:
>> Now, I seriously believe that we missed the best time to move
>> ps/stash-in-c into `next` for cooking. The best time would have been just
>> ...
>> Anyway, that's my plan for now.
>
> I must say I am not very happy about this plan. The series has been
> marked as "Wil
On Wed, Feb 20, 2019 at 5:05 AM Elijah Newren wrote:
>
> On Tue, Feb 19, 2019 at 11:10 AM Junio C Hamano wrote:
> >
> > Junio C Hamano writes:
> >
> > > I am getting the impression that to save typing, you would want to
> > > make "--index --worktree" the default (i.e. among the above, only
> >
On Wed, Feb 20, 2019 at 5:29 AM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > On Tue, Feb 19, 2019 at 11:10 AM Junio C Hamano wrote:
> >>
> >> Junio C Hamano writes:
> >>
> >> > I am getting the impression that to save typing, you would want to
> >> > make "--index --worktree" the defau
On Wed, Feb 20, 2019 at 2:10 AM Junio C Hamano wrote:
>
> Junio C Hamano writes:
>
> > I am getting the impression that to save typing, you would want to
> > make "--index --worktree" the default (i.e. among the above, only
> > --no-index and --no-worktree need to be spelled explicitly), but
> >
On Wed, Feb 20, 2019 at 5:36 AM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> >> As long as worktree-only mode does not lose track of a
> >> previously-untracked path in the index (perhaps use the i-t-a bit),
> >> I do not have a strong objection against making the worktree-only
> >> mode t
On Wed, Feb 20, 2019 at 1:08 AM Junio C Hamano wrote:
>
> Duy Nguyen writes:
>
> > On Sun, Feb 17, 2019 at 2:36 AM Ævar Arnfjörð Bjarmason
> > wrote:
> >>
> >>
> >> On Sat, Feb 16 2019, Nguyễn Thái Ngọc Duy wrote:
> >>
> >> [Re-CC some people involved the last time around]
> >>
> >> > A new attr
On Wed, Feb 20, 2019 at 7:07 AM Joe Enzminger
wrote:
>
> Currently, git clone supports shallow-exclude=. The client
> will clone up to, but not including, the commit with the tag.
>
> It would be useful to have the ability to include the commit with the
> tag. The suggestion would be to add a "s
On February 19, 2019 18:29, Junio C Hamano wrote:
> A release candidate Git v2.21.0-rc2 is now available for testing at the usual
> places. It is comprised of 474 non-merge commits since v2.20.0, contributed
> by 61 people, 16 of which are new faces.
Thanks. t5562 works properly on NonStop (3 tes
In 7171d8c15f ("upload-pack: send symbolic ref information as
capability"), we added a symref capability to the pack protocol, but it
was never documented. Adapt the patch notes from that commit and add
them to the capabilities documentation.
While we're at it, add a disclaimer to the top of
proto
On 2019.02.13 22:56, Jeff King wrote:
> On Wed, Feb 13, 2019 at 03:41:28PM -0800, Josh Steadmon wrote:
>
> > ---
> > Range-diff against v1:
> > 1: 4ffb11ff77 ! 1: cb1b2834b7 protocol-capabilities.txt: document symref
> > @@ -12,6 +12,17 @@
> > diff --git a/Documentation/technical/proto
Currently, git clone supports shallow-exclude=. The client
will clone up to, but not including, the commit with the tag.
It would be useful to have the ability to include the commit with the
tag. The suggestion would be to add a "shallow-include" options to
clone to support this behavior.
I hav
The resolve_ref_unsafe() function can, and sometimes will in the case
of this codepath, return the char * passed to it to the caller. In
this case we construct a strbuf, free it, and then continue using the
dst_name after that free().
The code being fixed dates back to da3efdb17b ("receive-pack: d
On 02/19, Johannes Schindelin wrote:
> Hi Gábor & Thomas,
>
> On Tue, 19 Feb 2019, SZEDER Gábor wrote:
>
> > > I'll hopefully be in a position to
> > > send a patch with a proper log message why this is the right fix in
> > > the next couple of days.
> > >
> > > diff --git a/builtin/stash--helpe
On 02/19, Matheus Tavares Bernardino wrote:
> On Mon, Feb 18, 2019 at 8:35 PM Thomas Gummerer wrote:
> > > Also, I just noticed that dir-iterator follows hidden paths while
> > > copy_or_link_directory don't. Maybe another option to add for
> > > dir-iterator?
> >
> > That feels like quite a speci
A release candidate Git v2.21.0-rc2 is now available for testing
at the usual places. It is comprised of 474 non-merge commits
since v2.20.0, contributed by 61 people, 16 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following pu
On Tue, Feb 19, 2019 at 2:36 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> >> As long as worktree-only mode does not lose track of a
> >> previously-untracked path in the index (perhaps use the i-t-a bit),
> >> I do not have a strong objection against making the worktree-only
> >> mode t
Elijah Newren writes:
>> $ git checkout master^0
>> $ git merge --no-commit next
>> warning: defaulting to --no-ff, given a --no-commit request
>> Automatic merge went well; stopped before committing as requested
>> hint: if you'd rather have a fast-forward without creating a commit,
>>
Elijah Newren writes:
>> As long as worktree-only mode does not lose track of a
>> previously-untracked path in the index (perhaps use the i-t-a bit),
>> I do not have a strong objection against making the worktree-only
>> mode the default.
>
> Could you unpack that for me a bit?
Suppose in an a
Elijah Newren writes:
> On Tue, Feb 19, 2019 at 11:03 AM Junio C Hamano wrote:
>> * --no-index --worktree ...
>>
>>Update only the working tree files without touching the index
>>(new feature that cannot be done with the current Git, although
>>"cat-file -p >path" may be close enoug
On Tue, Feb 19, 2019 at 11:32 AM Junio C Hamano wrote:
> Elijah Newren writes:
>
> > +With --no-commit perform the merge and stop just before creating
> > +a merge commit, to give the user a chance to inspect and further
> > +tweak the merge result before committing.
> > ++
> > +Note that fast-fo
Elijah Newren writes:
> On Tue, Feb 19, 2019 at 11:10 AM Junio C Hamano wrote:
>>
>> Junio C Hamano writes:
>>
>> > I am getting the impression that to save typing, you would want to
>> > make "--index --worktree" the default (i.e. among the above, only
>> > --no-index and --no-worktree need to
On Tue, Feb 19, 2019 at 11:07 AM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > Overall this looks good, but there's just one part that confuses me.
> > Here you seem to suggest that if you pass --source but neither --index
> > or --worktree that both the index and working tree will be wri
On Tue, Feb 19, 2019 at 11:03 AM Junio C Hamano wrote:
> * --no-index --worktree ...
>
>Update only the working tree files without touching the index
>(new feature that cannot be done with the current Git, although
>"cat-file -p >path" may be close enough at times), from the index
I
> > +when the server sends the packfile, it MAY send a `packfile-uris` section
> > +directly before the `packfile` section (right after `wanted-refs` if it is
> > +sent) containing HTTP(S) URIs. See protocol-v2.txt for the documentation of
> > +this section.
> > +
> > +Clients then should understan
On Tue, Feb 19, 2019 at 11:10 AM Junio C Hamano wrote:
>
> Junio C Hamano writes:
>
> > I am getting the impression that to save typing, you would want to
> > make "--index --worktree" the default (i.e. among the above, only
> > --no-index and --no-worktree need to be spelled explicitly), but
> >
On February 19, 2019 15:16, Max Kirillov wrote:
> On Mon, Feb 18, 2019 at 10:57:13PM +0100, Johannes Schindelin wrote:
> > I have to take that assessment back. So sad.
> >
> > After that build, I cherry-picked the commit on top of shears/pu
> > (which is Git for Windows' ever-green branch that con
On Tue, Feb 19, 2019 at 10:15:36PM +0200, Max Kirillov wrote:
> expecially at
> Windows where you cannot just unlink busy file and reuse its
> place in directory
It was at Linux actually. Well, whatever the rename feels more
sure thing to me.
Hi all,
On 19/02/2019 14:58, Johannes Schindelin wrote:
Hi Gábor,
On Tue, 19 Feb 2019, SZEDER Gábor wrote:
On Tue, Feb 19, 2019 at 09:02:43AM +0100, Senol Yazici wrote:
1. Dictator
Concern: "Bad" connotation.
"Benevolent dictator" is a well-established term in open source
projects, and it h
On Mon, Feb 18, 2019 at 10:57:13PM +0100, Johannes Schindelin wrote:
> I have to take that assessment back. So sad.
>
> After that build, I cherry-picked the commit on top of shears/pu (which is
> Git for Windows' ever-green branch that continuously rebases Git for
> Windows' `master` onto git.git
> > Good points about SSH support and the client needing to control which
> > protocols the server will send URIs for. I'll include a line in the
> > client request in which the client can specify which protocols it is OK
> > with.
>
> What if a client is ok to fetch from some servers but not othe
Johannes Schindelin writes:
>> > diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
>> > index c77f62c895..3dab488bd6 100644
>> > --- a/builtin/stash--helper.c
>> > +++ b/builtin/stash--helper.c
>> > @@ -231,6 +231,7 @@ static int reset_tree(struct object_id *i_tree, int
>> > update,
"Robert P. J. Day" writes:
>> But perhaps it should be documented as the functionality of the
>> default hook in githooks(5), similarly to how we document
>> hooks.allowunannotated. Patches welcome :)
>
> sure, i'll take care of that.
Sounds like a sensible way forward. Thanks, both.
Elijah Newren writes:
> +With --no-commit perform the merge and stop just before creating
> +a merge commit, to give the user a chance to inspect and further
> +tweak the merge result before committing.
> ++
> +Note that fast-forward updates do not need to create a merge
> +commit and therefore t
Junio C Hamano writes:
> I am getting the impression that to save typing, you would want to
> make "--index --worktree" the default (i.e. among the above, only
> --no-index and --no-worktree need to be spelled explicitly), but
> there is one glitch. Updating from the index must be spelled
> expl
Elijah Newren writes:
> Overall this looks good, but there's just one part that confuses me.
> Here you seem to suggest that if you pass --source but neither --index
> or --worktree that both the index and working tree will be written to.
> Why are "restored" changes considered ready for commit?
Duy Nguyen writes:
> On Sat, Feb 2, 2019 at 12:57 AM Junio C Hamano wrote:
>>
>> Duy Nguyen writes:
>>
>> > Of course we could just do --index and --worktree, each option
>> > restores the respective part. Then it's combinable (and extensible in
>> > the future). But then "git restore" means "g
Max Kirillov writes:
> If was found during stress-test run that a test may hang by 60 seconds.
> It supposedly happens because SIGCHILD was received before sleep has
> started.
>
> Fix by looping by smaller chunks, checking $exited after each of them.
> Then lost SIGCHILD would not cause longer d
Duy Nguyen writes:
> On Sun, Feb 17, 2019 at 2:36 AM Ævar Arnfjörð Bjarmason
> wrote:
>>
>>
>> On Sat, Feb 16 2019, Nguyễn Thái Ngọc Duy wrote:
>>
>> [Re-CC some people involved the last time around]
>>
>> > A new attribute "precious" is added to indicate that certain files
>> > have valuable co
Signed-off-by: Frederick Eaton
---
Documentation/cmd-list.perl | 2 +-
command-list.txt| 295 +++-
2 files changed, 158 insertions(+), 139 deletions(-)
diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl
index 5aa73cfe45..62c32f58d
This is a follow-up to my proposal to de-alphabetize the command
listings in the git(1) manual page, from 6 July 2018.
Some projects have manual page items listed in alphabetical order,
some don't. As I argued in my proposal, I find it easier to learn from
material which is not alphabetized. If th
The former wording implied that --no-commit would always cause the
merge operation to "pause" and allow the user to make further changes
and/or provide a special commit message for the merge commit. This
is not the case for fast-forward merges, as there is no merge commit
to create. Without a mer
Hi,
$ git version
git version 2.20.1.windows.1
I'm running `git clone --recurse-submodules https://XXX`
The command seems to run well and completes with success.
However, I noticed strange output from git:
```
Submodule 'Binary/A' (https://XXX) registered for path '!f() {
~/AppData/Local/Fork/F
On Tue, 19 Feb 2019 15:47:08 +0100 (STD)
Johannes Schindelin wrote:
> Hi Michal,
>
> On Tue, 19 Feb 2019, Michal Suchánek wrote:
>
> > On Tue, 19 Feb 2019 09:02:43 +0100
> > Senol Yazici wrote:
> >
> > > Suggestion for substitution: Assistant or assistant integrator.
> >
> > So now the t
On Mon, Feb 18, 2019 at 8:35 PM Thomas Gummerer wrote:
>
> >
> > You are right. I didn't know the differences from lstat and stat. And
> > reflecting on this now, I realize that the problem is even deeper:
> > copy_or_link_directory follows symlinks but dir-iterator don't, so I
> > cannot use dir-
On Tue, 19 Feb 2019 15:58:00 +0100 (STD)
Johannes Schindelin wrote:
> Hi Gábor,
>
> On Tue, 19 Feb 2019, SZEDER Gábor wrote:
>
> > On Tue, Feb 19, 2019 at 09:02:43AM +0100, Senol Yazici wrote:
> > > 1. Dictator
> > > Concern: "Bad" connotation.
> >
> > "Benevolent dictator" is a well-estab
Hi Gábor,
On Tue, 19 Feb 2019, SZEDER Gábor wrote:
> On Tue, Feb 19, 2019 at 09:02:43AM +0100, Senol Yazici wrote:
> > 1. Dictator
> > Concern: "Bad" connotation.
>
> "Benevolent dictator" is a well-established term in open source
> projects, and it has an inherently good connotation.
It is a w
On Tue, Feb 19, 2019 at 9:42 PM Elijah Newren wrote:
> > OK this hopefully will be the final design
> >
> > (git restore) "[--worktree] " restores worktree paths from index
> >
> > "--index " restores the index from HEAD (aka "git reset")
> >
> > "--source (--index|--worktree) " restores index or
Hi Michal,
On Tue, 19 Feb 2019, Michal Suchánek wrote:
> On Tue, 19 Feb 2019 09:02:43 +0100
> Senol Yazici wrote:
>
> > Suggestion for substitution: Assistant or assistant integrator.
>
> So now the terms sound a lot like a corporate lingo. Is it now turn for
> enthusiasts and entrepreneurs to
Hi Duy,
On Mon, Feb 18, 2019 at 8:21 PM Duy Nguyen wrote:
>
> On Sat, Feb 2, 2019 at 12:57 AM Junio C Hamano wrote:
> >
> > Duy Nguyen writes:
> >
> > > Of course we could just do --index and --worktree, each option
> > > restores the respective part. Then it's combinable (and extensible in
> >
Hi Sebastián
On 19/02/2019 14:03, Sebastián Mancilla wrote:
My system is macOS Mojave 10.14.2. I normally use Git from Homebrew (currently
Git 2.20.1).
I investigated this further, and I think I found the problem on my end.
When I actually run "git rebase --interactive " from the terminal,
eve
On Tue, Dec 04 2018, Jonathan Tan wrote:
I meant to follow-up after Git Merge, but didn't remember until this
thread was bumped.
But some things I'd like to clarify / am concerned about...
> +when the server sends the packfile, it MAY send a `packfile-uris` section
> +directly before the `pack
No, it's not a typo. I just checked again.
That's the file that results when I start the rebase from tig (the Nix
version), which results in the error for rebase --continue.
When I start the rebase manually or from tig (the Homebrew version)
it has the quote.
GIT_AUTHOR_NAME='Sebastián M
On Tue, Feb 19, 2019 at 3:03 PM Sebastián Mancilla wrote:
>
> My system is macOS Mojave 10.14.2. I normally use Git from Homebrew (currently
> Git 2.20.1).
>
> I investigated this further, and I think I found the problem on my end.
[...]
> I also did bisect Git (I never though I would be bisecti
On Tue, Feb 19, 2019 at 9:04 PM Sebastián Mancilla wrote:
> And the content of .git/rebase-merge/author-script is always the same:
>
> GIT_AUTHOR_NAME='Sebastián Mancilla'
> GIT_AUTHOR_EMAIL='smanc...@jlab.org'
> GIT_AUTHOR_DATE='@1550530007 -0300
>
Just to be clear, the l
Hi Max,
On Mon, 18 Feb 2019, Max Kirillov wrote:
> On Mon, Feb 18, 2019 at 10:06:21PM +0100, Ævar Arnfjörð Bjarmason wrote:
> >> But in our attempt to exit(), we try to "cleanup children" and that
> >> is what gets stuck.
> >
> > I have not paid enough attention to this thread to say if this is
Hi Max & Randall,
On Mon, 18 Feb 2019, Max Kirillov wrote:
> On Mon, Feb 18, 2019 at 03:46:34PM -0500, Randall S. Becker wrote:
> > On February 18, 2019 15:41, Johannes Schindelin wrote:
> > > So could you try with this patch?
> > >
> > > -- snipsnap --
> > > diff --git a/http-backend.c b/http-b
My system is macOS Mojave 10.14.2. I normally use Git from Homebrew (currently
Git 2.20.1).
I investigated this further, and I think I found the problem on my end.
When I actually run "git rebase --interactive " from the terminal,
everything works fine.
But almost every time I start my rebases f
On Tue, 19 Feb 2019 14:52:40 +0100
Christian Couder wrote:
> On Tue, Feb 19, 2019 at 12:23 PM Ævar Arnfjörð Bjarmason
> wrote:
> >
> > Two things:
> >
> > 1) Whatever anyone's abstract position on the wording of our
> > documentation, either the one stored in git.git or at
> > https://g
On Tue, Feb 19, 2019 at 12:23 PM Ævar Arnfjörð Bjarmason
wrote:
>
> Two things:
>
> 1) Whatever anyone's abstract position on the wording of our
> documentation, either the one stored in git.git or at
> https://github.com/git/git-scm.com there's only so much a
> theoretical discussion
On Tue, Dec 04 2018, brian m. carlson wrote:
> On Mon, Dec 03, 2018 at 03:37:35PM -0800, Jonathan Tan wrote:
>> Signed-off-by: Jonathan Tan
>> ---
>> Documentation/technical/packfile-uri.txt | 83
>> Documentation/technical/protocol-v2.txt | 6 +-
>> 2 files changed,
On Tue, 19 Feb 2019 12:19:51 +0100
Ævar Arnfjörð Bjarmason wrote:
> On Tue, Feb 19 2019, Senol Yazici wrote:
>
> 2) Any piece of software or technical tool is going to unavoidably need
> to use some amount of jargon, or words that are lifted from a more
> general vocabulary and intende
On Tue, Dec 4, 2018 at 8:31 PM Jonathan Tan wrote:
>
> > Some thoughts here:
> >
> > First, I'd like to see a section (and a bit in the implementation)
> > requiring HTTPS if the original protocol is secure (SSH or HTTPS).
> > Allowing the server to downgrade to HTTP, even by accident, would be a
Hi Jason,
let's belatedly fix the incredible misrepresenting subject line.
On Mon, 18 Feb 2019, Jason Pyeron wrote:
> > -Original Message-
> > From: Johannes Schindelin
> > Sent: Monday, February 18, 2019 4:00 PM
> >
> > On Mon, 18 Feb 2019, Senol Yazici wrote:
> > >
> > > I just stumb
On Tue, 19 Feb 2019, Ævar Arnfjörð Bjarmason wrote:
>
> On Tue, Feb 19 2019, Robert P. J. Day wrote:
>
> > was just perusing the sample hook scripts, and the sample pre-commit
> > script provided with git does the following check:
> >
> > # If you want to allow non-ASCII filenames set this varia
On Tue, Feb 19 2019, Robert P. J. Day wrote:
> was just perusing the sample hook scripts, and the sample pre-commit
> script provided with git does the following check:
>
> # If you want to allow non-ASCII filenames set this variable to true.
> allownonascii=$(git config --bool hooks.allownona
On Tue, Feb 19 2019, Senol Yazici wrote:
> Thank you for the quick response and apologize my late reply (good
> morning from Europe).
>
> I understand that well "established" concepts might make it easier
> grasping concepts.
>
> My concerns towards using these particular expressions
> (dictator
was just perusing the sample hook scripts, and the sample pre-commit
script provided with git does the following check:
# If you want to allow non-ASCII filenames set this variable to true.
allownonascii=$(git config --bool hooks.allownonascii)
but that config variable (hooks.allownonascii)
Hi Gabor,
thanks for the constructive feedback.
Hi Michal,
- I might be an enthusiast but i am definitively not offended. :D
- I am wondering for whom dictator has a positive weight... no matter
who calls them dictator! ;)
- Which negative connotation do you have with "principal" or
"integrato
Hi Gábor & Thomas,
On Tue, 19 Feb 2019, SZEDER Gábor wrote:
> On Tue, Feb 12, 2019 at 11:18:37PM +, Thomas Gummerer wrote:
> > Thanks. I still didn't manage to reproduce it locally, but I was now
> > able to test it on Travis CI.
> >
> > The diff below fixes the issue, but I still need to s
Hi,
On Mon, 18 Feb 2019, Randall S. Becker wrote:
> On February 18, 2019 13:46, Junio C Hamano wrote:
> > Junio C Hamano writes:
> >
> > > I have been wondering about the whole /dev/zero business. Although we
> > > have b46221ff ("Merge branch 'rb/no-dev-zero-in-test'",
> > > 2019-02-13) in 'm
On Tue, Feb 19, 2019 at 09:02:43AM +0100, Senol Yazici wrote:
> 1. Dictator
> Concern: "Bad" connotation.
"Benevolent dictator" is a well-established term in open source
projects, and it has an inherently good connotation.
> Further, "googling" dictator does not give Linus as a result in (at
> l
Dear Sebastián
On 19/02/2019 07:22, Eric Sunshine wrote:
[cc:+phillip.w...@talktalk.net]
Thanks Eric
On Tue, Feb 19, 2019 at 1:45 AM Christian Couder
wrote:
On Tue, Feb 19, 2019 at 5:20 AM Sebastián Mancilla wrote:
But since Git 2.20.x it doesn't work anymore. Now after solving the confl
On Tue, 19 Feb 2019 09:02:43 +0100
Senol Yazici wrote:
> Dear all,
>
> Thank you for the quick response and apologize my late reply (good
> morning from Europe).
>
> I understand that well "established" concepts might make it easier
> grasping concepts.
>
> My concerns towards using these part
From: Nickolai Belakovski
To display worktree path for refs checked out in a linked worktree
Signed-off-by: Nickolai Belakovski
---
Documentation/git-branch.txt | 6 --
builtin/branch.c | 4
t/t3203-branch-output.sh | 21 -
3 files changed, 28 ins
From: Nickolai Belakovski
I've made the various cosmetic changes that were suggested, as well as adding
tests for 3/3
I don't have a particularly strong opinion on the subject of keeping the atom
as "worktreepath"
or changing it to "worktree:path". We did feel earlier in this thread that if
w
From: Nickolai Belakovski
The output of git branch is modified to mark branches checkout out in a
linked worktree with a "+" and color them in cyan (in contrast to the
current branch, which will still be denoted with a "*" and colored in green)
This is meant to communicate to the user that the b
From: Nickolai Belakovski
Add an atom providing the path of the linked worktree where this ref is
checked out, if it is checked out in any linked worktrees, and empty
string otherwise.
Signed-off-by: Nickolai Belakovski
---
Documentation/git-for-each-ref.txt | 5 +++
ref-filter.c
Dear all,
Thank you for the quick response and apologize my late reply (good
morning from Europe).
I understand that well "established" concepts might make it easier
grasping concepts.
My concerns towards using these particular expressions
(dictator/lieutenant/blessed) are nevertheless motivated
80 matches
Mail list logo
