On 22.05.16 01:17, Mike Hommey wrote:
> Signed-off-by: Mike Hommey
> ---
> connect.c | 6 ++
> 1 file changed, 6 insertions(+)
>
> diff --git a/connect.c b/connect.c
> index c53f3f1..caa2a3c 100644
> --- a/connect.c
> +++ b/connect.c
> @@ -742,6 +742,12 @@ struct child_process *git_connect(i
On Sat, May 21, 2016 at 7:17 PM, Mike Hommey wrote:
> Signed-off-by: Mike Hommey
> ---
> diff --git a/connect.c b/connect.c
> @@ -742,6 +742,12 @@ struct child_process *git_connect(int fd[2], const char
> *url,
> transport_check_allowed("ssh");
> g
Thanks for the response.
I began to wonder if indeed I was using the correct paradigm, since
the split operation would leave the subtree prefix as `/` which is an
impossible prefix when creating a subtree. Attempting to add a new
subtree with prefix `/` results in an error because the prefix
direc
On Fri, May 20, 2016 at 09:03:31AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > ... However,
> > the double-quote character ( '"' ) shall not be treated specially
> > within a here-document, except when the double-quote appears within
> > "$()", "``", or "${}".
> >
> > So OK, t
On Fri, May 20, 2016 at 08:16:43AM -0700, Junio C Hamano wrote:
> > Acked-by: Jeff King
>
> I didn't see him acking this exact version, so if you didn't include
> this line here, I would have missed it. Thanks.
I don't think I ever saw an actual patch to ack until now; I just said
the idea see
Mathias Nyman writes:
> For recalling where a subtree came from; git-subtree operations 'add'
> and 'pull', when called with the parameter add this to the
> commit message:
> git-subtree-repo:
I am sorry it tooks a couple of months to respond. I am finally coming
up for air at work.
What
Joseph Musser writes:
> I ran `git subtree split -P=subdir/subdir/ -b newbranch` and the
> outcome seems to be perfect except that each squash merge has turned
> into a full merge, bringing along all history from the other repo. Why
> does it do this and how can I preserve my repo history, includ
Previous changes made both branches handling CONNECT_DIAG_URL identical.
We can now remove one of those branches and have CONNECT_DIAG_URL be
handled in one place.
Signed-off-by: Mike Hommey
---
connect.c | 16 +---
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/connec
The last uses of the hostandport variable, besides being strdup'ed
before being split into host and port, is to fill the host header in the
git protocol and to test whether to proxy the request.
Instead of relying on parse_connect_url() to return a host:port string
that makes sense there, re-deriv
Signed-off-by: Mike Hommey
---
connect.c | 6 ++
t/t5500-fetch-pack.sh | 14 --
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/connect.c b/connect.c
index 48d9cd2..52d34c7 100644
--- a/connect.c
+++ b/connect.c
@@ -710,10 +710,8 @@ struct child_proces
Currently, get_host_and_port() is called in git_connect() for the ssh
protocol, and in git_tcp_connect_sock() for the git protocol. Instead
of doing this, just call it from a single place, right after
parse_connect_url(), and pass the host and port separately to
git_*_connect() functions.
We howev
Now that nothing besides CONNECT_DIAG_URL is using hostandport, we can
have parse_connect_url() itself do the host and port splitting.
This still leaves "user@" part of the host, if there is one, which will
be addressed in a subsequent change. This however does add /some/
handling of the "user@" p
Signed-off-by: Mike Hommey
---
connect.c | 108 +-
1 file changed, 58 insertions(+), 50 deletions(-)
diff --git a/connect.c b/connect.c
index 04ce210..ddfda4e 100644
--- a/connect.c
+++ b/connect.c
@@ -680,6 +680,61 @@ static enum proto
Currently, urls of the for git://user@host don't work because user@host
is not resolving at the DNS level, but we shouldn't be relying on it
being an invalid host name, and actively reject it for containing a
username in the first place.
Signed-off-by: Mike Hommey
---
connect.c | 3 +++
1 file c
Signed-off-by: Mike Hommey
---
connect.c | 51 ++-
1 file changed, 34 insertions(+), 17 deletions(-)
diff --git a/connect.c b/connect.c
index c0fad4f..48d9cd2 100644
--- a/connect.c
+++ b/connect.c
@@ -588,11 +588,13 @@ static char *get_port(char *
Difference with v6:
- Dropped the core.gitProxy change as per discussion.
- Added a comment about the extra get_port.
Note that after this series, parse_connect_url can be further refactored to
avoid the kind of back-and-forth with host_end, get_host_and_port and
get_port.
Mike Hommey (9):
conn
Signed-off-by: Mike Hommey
---
connect.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/connect.c b/connect.c
index c53f3f1..caa2a3c 100644
--- a/connect.c
+++ b/connect.c
@@ -742,6 +742,12 @@ struct child_process *git_connect(int fd[2], const char
*url,
transp
ELI writes:
> I then reviewed the commit history of contrib/subtree/git-subtree.sh
> and determined that the last successful subtree push was performed
> prior to the integration of this change:
> https://git.kernel.org/cgit/git/git.git/commit/contrib/subtree/git-subtree.sh?id=933cfeb90b5d03b4096
Gregor Jasny writes:
> Hello,
>
> On 10/03/16 16:51, Gregor Jasny wrote:
>> today I discovered that it's a bad idea to "git subtree pull" from an
>> annotated tag. This issue got discussed in those two threads:
>>
>> http://comments.gmane.org/gmane.comp.version-control.git/247503>
>> http://comm
Nicola Paolucci writes:
> To my knowledge 'git subtree' currently lacks a way to
> track where injected repositories come from originally.
> Adding this information allows for useful extensions to
> the command and makes it easier to use subtrees to track
> external dependencies.
Thanks for wor
Empty lines between functions are shown by diff -W, as it considers them
to be part of the function preceding them. They are not interesting in
most languages. The previous patch stopped showing them in the special
case of a function added at the end of a file.
Stop extending context to those em
Empty lines between functions are shown by grep -W, as it considers them
to be part of the function preceding them. They are not interesting in
most languages. The previous patches stopped showing them for diff -W.
Stop showing empty lines trailing a function with grep -W. Grep scans
the lines
If a new function and a preceding empty line is appended, diff -W shows
the previous function in full in order to provide context for that empty
line. In most languages empty lines between sections are not
interesting in and off themselves and showing a whole extra function for
them is not what w
If lines are added at the end of a file, diff -W shows the whole file.
That's because get_func_line() only considers the pre-image and gives up
if it sees a record index beyond its end.
Consider the post-image as well to see if the added lines already make
up a full function. If it doesn't then s
Add match_func_rec(), a helper that wraps accessing a record and calling
the appropriate function for checking if it contains a function line.
Signed-off-by: Rene Scharfe
---
We'll use it in the next patch. A follow-up patch could inline def_ff()
into it.
xdiff/xemit.c | 15 +++
1
Am 11.05.2016 um 00:51 schrieb Junio C Hamano:
> The helper function get_func_line() however gets confused when a
> hunk adds a new function at the very end, and returns -1 to signal
> that it did not find a suitable "function header line", i.e. the
> beginning of previous function. The caller the
I recently had a problem with SmartGIt that I think is related to the Mac
version of the Git install, or perhaps git itself. Its hard for me to tell.
Here is the recreation steps:
- Install a clean El Capitan
- Install the latest SmartGit
- Install the latest Mac OS Git from the Git website
- en
Às 12:57 de 21-05-2016, Ævar Arnfjörð Bjarmason escreveu:
> On Wed, May 18, 2016 at 5:27 PM, Vasco Almeida wrote:
>> > Mark strings in git-rebase--interactive.sh for translation. There is no
>> > need to source git-sh-i18n since git-rebase.sh already does so.
> Cool, thanks for working on this.
>
On Wed, May 18, 2016 at 11:02 PM, Vasco Almeida wrote:
> Às 19:28 de 18-05-2016, Eric Sunshine escreveu:
>> On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida
>> wrote:
>>> Mark entire sentences of error message rather than assembling one using
>>> placeholders (e.g. "Cannot %s during a %s"). That
On Wed, May 18, 2016 at 5:27 PM, Vasco Almeida wrote:
> Mark strings in git-rebase--interactive.sh for translation. There is no
> need to source git-sh-i18n since git-rebase.sh already does so.
Cool, thanks for working on this.
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.s
From: Torsten Bögershausen
To compare a file in working tree with the index, convert_to_git() is used,
the result is hashed and the hash value compared with ce->sha1.
Deep down would_convert_crlf_at_commit() is invoked, to check if CRLF
are converted or not.
The "new safer autocrlf handling" che
From: Torsten Bögershausen
Factor out the retrieval of the sha1 for a given path in
read_blob_data_from_index() into the function get_sha1_from_index().
This will be used in the next commit, when convert.c can do the
analyze for "text=auto" without slurping the whole blob into memory
at once.
A
32 matches
Mail list logo
