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's start new round of translation for Git 2.15.0.
Hi,
Junio C Hamano wrote:
> Jeff King writes:
>> On Sat, Oct 14, 2017 at 12:01:46PM +0900, Junio C Hamano wrote:
>>> True. Let's see what others think. I know Jonathan is running
>>> the fork at $work with "downgrade always to auto" patches, and while
>>> I think both approaches would probably
builtin/push.c: add push.pushOption config
Currently push options need to be given explicitly, via
the command line as "git push --push-option".
The UX of Git would be enhanced if push options could be
configured instead of given each time on the command line.
Add the config option push.pushOpti
Brauchen Sie ein Darlehen, um Ihr Geschäft zu verbessern ?, Darlehen, um Ihre
Schulden zu konsolidieren, Darlehen für den persönlichen Gebrauch, Darlehen für
Kreditkarten, medizinische Versorgung Darlehen, Autokredit, Hypothekendarlehen,
Studentendarlehen, Darlehen für irgendwelche Zwecke? etc.
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 "peel back"
> approach. Adding Jonathan to Cc:
It was a bit more painful than
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; here is an workaround that
seems to work (the
> On 16 Oct 2017, at 20:59, Steve Hoelzer wrote:
>
> Johannes,
>
> 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, Joha
Junio C Hamano writes:
>> I don't think there is any need to prepare it upon my 4d03f955,
>> though. I'd think it could simply replace it.
>
> Yeah, it ended up that way, it seems. Still it needs a bit of doc
> updates to balance the description.
So here is what I have now on 'pu'. Clearly no
Hi,
Junio C Hamano wrote:
> Things like @{-1} would not make any sense when the command is run
> outside a repository, and the documentation is quite clear that it
> is the primary reason why we added "--branch" option to the command,
> i.e.
>
> With the `--branch` option, it expands the ``pr
On Tue, Oct 17, 2017 at 11:40:17AM +0900, Junio C Hamano wrote:
> Kevin Daudt writes:
>
> >> + setup_git_directory_gently(&nongit);
> >> +
> >> + if (!nongit)
> >> + malformed = (strbuf_check_branch_ref(&sb, arg) ||
> >> + !skip_prefix(sb.buf, "refs/heads/", &name
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 historically using. However this makes
> the ne
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 there still many references to it around o
Michael J Gruber writes:
> This series revives an old suggestion of mine to make merge honor
> pre-commit hook or a separate pre-merge hook
This seems to have become an abandoned loose end, so I'll drop the
topic from my tree for now; revival of the discussion is _not_
unwelcome (aka "droppi
Thais Diniz writes:
> +Just to clarify I did not see Marius patch.
> +Did see Marius' comment saying he would look it in the leftoverbits list,
> +but since i didn't see any patch i thought i could work on it and did so
> based on Stephan's comment
> +(which i suppose Mario also did and that is
Just to clarify I did not see Marius patch.
Did see Marius' comment saying he would look it in the leftoverbits list,
but since i didn't see any patch i thought i could work on it and did
so based on Stephan's comment
(which i suppose Mario also did and that is why the code resulted to
be similar).
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-fetch-param.txt | 6 --
1 file changed, 4 inse
From: Thais Diniz Braz
---
emailReply | 4
1 file changed, 4 insertions(+)
create mode 100644 emailReply
diff --git a/emailReply b/emailReply
new file mode 100644
index 0..2d591b55b
--- /dev/null
+++ b/emailReply
@@ -0,0 +1,4 @@
+Just to clarify I did not see Marius patch.
+Did se
Jeff King writes:
> On Tue, Oct 17, 2017 at 10:22:31AM +0900, Junio C Hamano wrote:
>
>> > I like the state this puts us in, but there's one catch: we're
>> > completely changing the meaning of "check-ref-format --branch", aren't
>> > we?
>> >
>> > It is going from "this is how you resolve @{-1}"
Kevin Daudt writes:
> When columns are set to automatic for git tag and the output is
> paginated by git, the output is a single column instead of multiple
> columns.
>
> Standard behaviour in git is to honor auto values when the pager is
> active, which happens for example with commands like git
David Glasser writes:
> From: David Glasser
>
> The docs claim that filters are applied in the listed order, so
> subdirectory-filter should come first.
> ---
> Documentation/git-filter-branch.txt | 10 +-
> 1 file changed, 5 insertions(+), 5 deletions(-)
Good. Could you sign it off?
On Tue, Oct 17, 2017 at 10:13:34AM +0900, Junio C Hamano wrote:
> Jeff King writes:
>
> > Alternatively, I suppose we could just always escape in
> > add--interactive. I'm trying to think of a case where somebody would
> > really want their diffFilter to see the raw bytes (or vice versa, to
> >
On Tue, Oct 17, 2017 at 10:22:31AM +0900, Junio C Hamano wrote:
> > I like the state this puts us in, but there's one catch: we're
> > completely changing the meaning of "check-ref-format --branch", aren't
> > we?
> >
> > It is going from "this is how you resolve @{-1}" to "this is how you
> > che
Kevin Daudt writes:
>> +setup_git_directory_gently(&nongit);
>> +
>> +if (!nongit)
>> +malformed = (strbuf_check_branch_ref(&sb, arg) ||
>> + !skip_prefix(sb.buf, "refs/heads/", &name));
>> +else
>> +malformed = check_branch_ref_format(a
Hi,
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's start new round of translation for Git 2.15.0.
You can get it from th
Heiko Voigt writes:
> The previous RFC iteration can be found here:
>
> https://public-inbox.org/git/20171006222544.GA26642@sandbox/
>
> This should now be in a state ready for review for inclusion.
>
> The main difference from last iteration is that we now also support
> unconfigured gitlinks fo
On Mon, Oct 16, 2017 at 03:54:56PM +0900, Junio C Hamano wrote:
> * bc/hash-algo (2017-10-04) 6 commits
> - fixup! hash-algo: integrate hash algorithm support with repo setup
> - hash-algo: switch empty tree and blob lookups to use hash abstraction
> - hash-algo: integrate hash algorithm support
On Mon, Oct 16, 2017 at 07:45:46PM +0900, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> [..]
>
> diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
> index 1e5f9835f0..4e62852089 100644
> --- a/builtin/check-ref-format.c
> +++ b/builtin/check-ref-format.c
> @@ -38,12 +38,2
Jeff King writes:
> On Mon, Oct 16, 2017 at 07:45:46PM +0900, Junio C Hamano wrote:
>
>> > So I think the right endgame in the longer term is:
>> > ...
>>
>> Here is to illustrate what I mean in a patch form. It resurrects
>> the gentle setup, and uses a purely textual format check when we are
"brian m. carlson" writes:
> On Mon, Oct 16, 2017 at 11:15:34AM +0900, Junio C Hamano wrote:
>> With a hope that this might help other reviewers, here is the
>> interdiff between "the previous one merged with v2.15-rc1" and "this
>> round applied on v2.15-rc1 directly".
>>
>> The changes all l
Jeff King writes:
> Alternatively, I suppose we could just always escape in
> add--interactive. I'm trying to think of a case where somebody would
> really want their diffFilter to see the raw bytes (or vice versa, to
> show raw bytes produced by their filter), but I'm having trouble coming
> up
Jeff King writes:
> On Sat, Oct 14, 2017 at 12:01:46PM +0900, Junio C Hamano wrote:
>
>> > That takes us back to the pre-regression state. The ancient bug from
>> > 4c7f1819 still exists, but that would be OK for v2.15. We'd probably
>> > want to bump the -rc cycle a bit to give more confidence t
On Mon, Oct 16, 2017 at 11:49:13PM +, brian m. carlson wrote:
> On Mon, Oct 16, 2017 at 11:15:34AM +0900, Junio C Hamano wrote:
> > With a hope that this might help other reviewers, here is the
> > interdiff between "the previous one merged with v2.15-rc1" and "this
> > round applied on v2.15-r
On Mon, Oct 16, 2017 at 11:15:34AM +0900, Junio C Hamano wrote:
> With a hope that this might help other reviewers, here is the
> interdiff between "the previous one merged with v2.15-rc1" and "this
> round applied on v2.15-rc1 directly".
>
> The changes all looked sensible to me. Thanks.
Is t
git filter-branch --subdirectory-filter is really useful and easy to
use. It's a commonly used step as part of moving a directory from one
repo to another. It lets you move a subdirectory to the root of the
repo.
I've found that, when moving directories between repos, I often want
to do a task t
From: David Glasser
The docs claim that filters are applied in the listed order, so
subdirectory-filter should come first.
---
Documentation/git-filter-branch.txt | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-filter-branch.txt
b/Documentation/g
> 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 somewhere else to me (and not to somebody else).
Jeff King wrote:
> On Mon, Oct 16, 2017 at 07:45:46PM +0900, Junio C Hamano wrote:
>> Here is to illustrate what I mean in a patch form. It resurrects
>> the gentle setup, and uses a purely textual format check when we are
>> outside the repository, while bypassing the @{magic} interpolation
>> c
On Tue, Oct 17, 2017 at 12:47:01AM +0200, Andreas Schwab wrote:
> On Okt 16 2017, Jeff King wrote:
>
> > I can't help but feel this is the tip of a larger iceberg, though. E.g.,
> > what about characters outside of the terminal's correct encoding? Or
> > broken UTF-8 characters?
>
> Or correctl
On Mon, Oct 16, 2017 at 07:16:49AM -0700, Lars Schneider wrote:
> Hi,
>
> I just noticed that a space between "-f" and "git" is missing in `man
> git-branch`.
> The space is present in "Documentation/git-branch.txt", though. I am using
> `man`
> version 1.6c on macOS.
>
> -f, --force
>
On Okt 16 2017, Jeff King wrote:
> I can't help but feel this is the tip of a larger iceberg, though. E.g.,
> what about characters outside of the terminal's correct encoding? Or
> broken UTF-8 characters?
Or correctly encoded UTF-8 characters that look confusing? Or blobs
with embedded escape
On Mon, Oct 16, 2017 at 07:45:46PM +0900, Junio C Hamano wrote:
> > So I think the right endgame in the longer term is:
> > ...
>
> Here is to illustrate what I mean in a patch form. It resurrects
> the gentle setup, and uses a purely textual format check when we are
> outside the repository, wh
On Mon, Oct 16, 2017 at 03:44:08PM +0900, Junio C Hamano wrote:
> I threw this topic in stalled category, hoping that one or the other
> opinion eventually turns out to be more prevalent, but it didn't
> seem to have happened X-<.
I think it's sufficiently obscure that nobody really cares.
I adm
On Sun, Oct 15, 2017 at 11:37:04PM +0200, Joris Valette wrote:
> 2017-10-15 22:06 GMT+02:00 Jeff King :
> > Git's diff generation will never do such escaping by default, because it
> > means creating a patch that cannot be applied to get back the original
> > content.
>
> Indeed this would be a p
On Sat, Oct 14, 2017 at 12:01:46PM +0900, Junio C Hamano wrote:
> > That takes us back to the pre-regression state. The ancient bug from
> > 4c7f1819 still exists, but that would be OK for v2.15. We'd probably
> > want to bump the -rc cycle a bit to give more confidence that (2) caught
> > everyth
On Sat, Oct 14, 2017 at 11:37:28AM +0900, Junio C Hamano wrote:
> Jeff King writes:
>
> > So there are two separate questions/tasks:
> >
> > 1. Should we remove the special handling of "-q" leftover from this
> > deprecation? I think the answer is yes.
> >
> > 2. Should we teach the dif
On Sat, Oct 14, 2017 at 11:20:11AM +0900, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> >> Should we test that:
> >>
> >> git update-ref refs/heads/HEAD HEAD^
> >>
> >> continues to work?
> >
> > Perhaps. Also we may want to make sure that "git branch -D HEAD"
> > still works as a way to
On Mon, Oct 16, 2017 at 10:55:24AM -0700, Brandon Williams wrote:
> Create protocol.{c,h} and provide functions which future servers and
> clients can use to determine which protocol to use or is being used.
>
> Also introduce the 'GIT_PROTOCOL' environment variable which will be
> used to communi
Johannes,
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 Schindelin
>> > wrote:
>> > >
>> > > It is my pleasure to announc
When columns are set to automatic for git tag and the output is
paginated by git, the output is a single column instead of multiple
columns.
Standard behaviour in git is to honor auto values when the pager is
active, which happens for example with commands like git log showing
colors when being pa
On 10/11, Robert P. J. Day wrote:
> On Wed, 11 Oct 2017, Thomas Gummerer wrote:
>
> > On 10/11, Robert P. J. Day wrote:
> > >
> > > was perusing thomas gummerer's proposed "git stash" patch here:
> > >
> > > https://www.spinics.net/lists/git/msg313993.html
> > >
> > > and i'd make one more chang
Hi,
I just noticed that a space between "-f" and "git" is missing in `man
git-branch`.
The space is present in "Documentation/git-branch.txt", though. I am using `man`
version 1.6c on macOS.
-f, --force
Reset to if exists already.
Without
-fgit branch refuses to change
On 10/12, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Thomas Gummerer writes:
> >
> >> git stash push is the newer interface for creating a stash. While we
> >> are still keeping git stash save around for the time being, it's better
> >> to point new users of git stash to the more mode
From: Jonathan Tan
Document the server support for Extra Parameters, additional information
that the client can send in its first message to the server during a
Git client-server interaction.
Signed-off-by: Jonathan Tan
Signed-off-by: Brandon Williams
---
Documentation/technical/http-protocol
When using the 'ssh' transport, the '-o' option is used to specify an
environment variable which should be set on the remote end. This allows
git to send additional information when contacting the server,
requesting the use of a different protocol version via the
'GIT_PROTOCOL' environment variabl
Changes in v4:
* Added more tests for the new handeling of ssh variants.
* Removed the 'default' case in upload_pack and receive_pack and instead
ensured that all enum values were accounted for. This way when a new
protocol version is introduced the compiler will throw an error if the new
Tell a server that protocol v1 can be used by sending the http header
'Git-Protocol' with 'version=1' indicating this.
Also teach the apache http server to pass through the 'Git-Protocol'
header as an environment variable 'GIT_PROTOCOL'.
Signed-off-by: Brandon Williams
---
cache.h
From: Jonathan Tan
Currently, get_remote_heads() parses the ref advertisement in one loop,
allowing refs and shallow lines to intersperse, despite this not being
allowed by the specification. Refactor get_remote_heads() to use two
loops instead, enforcing that refs come first, and then shallows.
Teach a client to recognize that a server understands protocol v1 by
looking at the first pkt-line the server sends in response. This is
done by looking for the response "version 1" send by upload-pack or
receive-pack.
Signed-off-by: Brandon Williams
---
connect.c | 30 +
Add a function which can be used to write the contents of an arbitrary
buffer. This makes it easy to build up data in a buffer before writing
the packet instead of formatting the entire contents of the packet using
'packet_write_fmt()'.
Signed-off-by: Brandon Williams
---
pkt-line.c | 6 ++
A normal request to git-daemon is structured as
"command path/to/repo\0host=..\0" and due to a bug introduced in
49ba83fb6 (Add virtualization support to git-daemon, 2006-09-19) we
aren't able to place any extra arguments (separated by NULs) besides the
host otherwise the parsing of those arguments
Signed-off-by: Brandon Williams
---
t/interop/i5700-protocol-transition.sh | 68 ++
1 file changed, 68 insertions(+)
create mode 100755 t/interop/i5700-protocol-transition.sh
diff --git a/t/interop/i5700-protocol-transition.sh
b/t/interop/i5700-protocol-transiti
Create protocol.{c,h} and provide functions which future servers and
clients can use to determine which protocol to use or is being used.
Also introduce the 'GIT_PROTOCOL' environment variable which will be
used to communicate a colon separated list of keys with optional values
to a server. Unkno
Teach upload-pack and receive-pack to understand and respond using
protocol version 1, if requested.
Protocol version 1 is simply the original and current protocol (what I'm
calling version 0) with the addition of a single packet line, which
precedes the ref advertisement, indicating the protocol
Teach the connection logic to tell a serve that it understands protocol
v1. This is done in 2 different ways for the builtin transports, both
of which ultimately set 'GIT_PROTOCOL' to 'version=1' on the server.
1. git://
A normal request to git-daemon is structured as
"command path/to/repo\
tbo...@web.de writes:
> From: Torsten Bögershausen
>
> Make it safer to normalize the line endings in a repository:
> Files that had been commited with CRLF will be commited with LF.
> (Unless core.autorclf and .gitattributes specify that Git
> should not do line ending conversions)
A few issue
On 10/03, Jonathan Nieder wrote:
> Hi,
>
> Brandon Williams wrote:
>
> > When using the 'ssh' transport, the '-o' option is used to specify an
> > environment variable which should be set on the remote end. This allows
> > git to send additional information when contacting the server,
> > reques
Am 16.10.2017 um 10:23 schrieb Junio C Hamano:
> Johannes Sixt writes:
>
>> Yes, running "sudo make install" is a nightmare. sudo clears the path,
>> and the git command is not found by the make invoked with root
>> permissions. This changes the version string that gets compiled into
>> the execu
From: Torsten Bögershausen
Make it safer to normalize the line endings in a repository:
Files that had been commited with CRLF will be commited with LF.
(Unless core.autorclf and .gitattributes specify that Git
should not do line ending conversions)
The old way to normalize a repo was like this
Greetings in the name of God
Dear Friend
Greetings in the name of God,please let this not sound strange to you
for my only surviving lawyer who would have done this died early this
year.I prayed and got your email id from your country guestbook. I am
Mrs Suran Yoda from London,I am 72 years old,
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 path in the current checkout, since they
just appeared in this
To make extending this logic later easier.
Signed-off-by: Heiko Voigt
---
submodule.c | 74 ++---
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/submodule.c b/submodule.c
index 71d1773e2e..82d206eb65 100644
--- a/submodule.
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 +-
1 file changed, 41 insertion
The previous RFC iteration can be found here:
https://public-inbox.org/git/20171006222544.GA26642@sandbox/
This should now be in a state ready for review for inclusion.
The main difference from last iteration is that we now also support
unconfigured gitlinks for push and fetch for backwards comp
"Philip Oakley" writes:
> Hi, 'Truncate' is real English, but it is not that common in normal usage.
>
> My dictionary suggests that it means 'cut off at the tip' such as a
> truncated cone. However the thesaurus is far more relaxed about the
> common idioms that truncate at the tail such as: cli
From: "Johannes Schindelin"
On Mon, 16 Oct 2017, Junio C Hamano wrote:
Ralf Thielow writes:
> When the write opertion fails, we write that we could
> not read. Change the error message to match the operation
> and remove the full stop at the end.
>
> When ftruncate() fails, we write that we
Hi Junio,
On Mon, 16 Oct 2017, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> >> -Also respects `:remotename` to state the name of the *remote* instead
> >> >> of
> >> >> -the ref.
> >> >> +Also respects `:remotename` to state the name of the *remote* instead
> >> >> +of the ref, a
Hi Junio,
On Mon, 16 Oct 2017, Junio C Hamano wrote:
> Ralf Thielow writes:
>
> > When the write opertion fails, we write that we could
> > not read. Change the error message to match the operation
> > and remove the full stop at the end.
> >
> > When ftruncate() fails, we write that we couldn'
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 Schindelin
> > wrote:
> > >
> > > It is my pleasure to announce that Git for Windows 2.14.2(3) is
> > > available from:
> > >
> > > https
Junio C Hamano writes:
> Having said that, there may still be a use case where a Porcelain
> script wants a way to see if a $name it has is appropriate as a
> branch name before it has a repository (e.g. a wrapper to "git
> clone" that wants to verify the name it is going to give to the "-b"
> op
Johannes Sixt writes:
> Yes, running "sudo make install" is a nightmare. sudo clears the path,
> and the git command is not found by the make invoked with root
> permissions. This changes the version string that gets compiled into
> the executable, which finally triggers a complete rebuild under
Dear Friend,
I am Mr.Nawfal Nagi the head of file department of Bank of
Africa(B.O.A) here in Burkina Faso / Ouagadougou. In my department we
discover an abandoned sum of (US$18 million US Dollars) in an account
that belongs to one of our foreign customer who died along with his
family in plane
81 matches
Mail list logo
