On Tue, May 24, 2016 at 05:59:15PM -0700, Junio C Hamano wrote:
> On Wed, May 18, 2016 at 3:37 PM, Jeff King wrote:
> > I've often wanted to intercept the call from upload-pack to
> > pack-objects. The final patch in this series goes into more detail, but
> > basically it's good
On Thu, May 19, 2016 at 04:54:37PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > This is the "could we just set a bool" option I discussed in the commit
> > message. The problem is that it doesn't let the admin say "I don't trust
> > these repositories, but I _do_ want to run just this one hook when
On 05/26/2016 01:34 AM, Mike Hommey wrote:
On Tue, May 24, 2016 at 06:44:26AM +0200, Torsten Bögershausen wrote:
On 05/23/2016 11:30 PM, Junio C Hamano wrote:
Torsten Bögershausen writes:
get_host_and_port(_host, );
+ /*
On Sun, May 22, 2016 at 06:20:18PM +0700, Nguyễn Thái Ngọc Duy wrote:
> To make all "->" aligned, we may need to go through the ref list
> twice, or buffer the output and let column.c align it. Either way
> needs a lot more work than this.
I don't think a two-pass approach is _too_ bad. The
On Sun, May 22, 2016 at 01:00:55PM +0200, larsxschnei...@gmail.com wrote:
> From: Lars Schneider
>
> The verbose output clutters the Travis CI webview and is not really
> useful since test debugging usually happens on a local machine.
I have not really been using the
On Fri, May 20, 2016 at 01:39:06PM -0700, Junio C Hamano wrote:
> > +{
> > + size_t i;
> > + struct strbuf out = STRBUF_INIT;
> > + unsigned int width = 80;
>
> In a few places Git limits the width of the output, like using function
> name in hunk header lines and drawing diffstat in "diff
On Mon, May 23, 2016 at 07:57:43PM +0200, Matthieu Moy wrote:
> Samuel GROOT writes:
>
> > Since 2.8.3 was out recently, we could flip MAN_BOLD_LITERAL on by
> > default for this cycle to shake out problems as Jeff King suggested
> > [2].
>
> 2.8.3 was a
On Tue, May 24, 2016 at 12:44:24AM +, Green, Paul wrote:
> While examining (relatively) recent changes to git, my eye happened to
> notice the following inconsistency on line 184 of the current version
> of archive-tar.c.
>
> -sprintf(header->chksum, "%07o",
[sorry for duplicate]
Am 26.05.2016 um 01:06 schrieb Ramsay Jones:
While compiling on cygwin (x86_64), gcc complains thus:
CC xdiff/xemit.o
xdiff/xemit.c: In function ‘is_empty_rec’:
xdiff/xemit.c:163:2: warning: array subscript has type ‘char’
[-Wchar-subscripts]
while
On Wed, May 25, 2016 at 06:16:15PM -0500, Jeff King wrote:
> On Tue, May 24, 2016 at 09:45:25AM -0700, Junio C Hamano wrote:
>
> > On Tue, May 24, 2016 at 9:44 AM, Armin Kunaschik
> > wrote:
> > > t7610-mergetool.sh fails on systems without mktemp.
> > >
> > > mktemp
On Wed, May 25, 2016 at 1:18 PM, Mehul Jain wrote:
> Hi,
>
> On Wed, May 25, 2016 at 9:28 AM, Austin English
> wrote:
>> I'll try
>> to submit my own patch. In the meantime, it seems appropriate to file
>> a bug so that others can have the
On 26/05/16 00:30, Stefan Beller wrote:
> On Wed, May 25, 2016 at 4:12 PM, Ramsay Jones
> wrote:
>>
>> Signed-off-by: Ramsay Jones
>> ---
>>
>> Hi Stefan,
>>
>> If you need to re-roll your 'sb/submodule-default-paths' branch, could
>>
On 05/25/2016 08:31 PM, Matthieu Moy wrote:
So, a possible UI would be:
git send-email --in-reply-to= => just set In-Reply-To: field.
git send-email --in-reply-to= => set In-Reply-To, To and Cc.
git send-email --in-reply-to= --cite => in addition, add the
body of the message quoted
Sometimes the history of a submodule is not considered important by
the projects upstream. To make it easier for downstream users, allow
a boolean field 'submodule..shallow' in .gitmodules, which can
be used to recommend whether upstream considers the history important.
This field is honored in
The shallow field will be used in a later patch by `submodule update`.
To differentiate between the actual depth (which may be different),
we name it `recommend_shallow` as the field in the .gitmodules file
is only a recommendation by the project.
Signed-off-by: Stefan Beller
v2:
* Instead of storing the depth, we keep a boolean `shallow` field in the
`.gitmodules` file.
* slightly renamed options (--recommend-shallow instead of --recommended-depth)
* one more test
* I dropped [PATCH 1/3] submodule update: make use of the existing
fetch_in_submodule function
as
On Tue, May 24, 2016 at 06:44:26AM +0200, Torsten Bögershausen wrote:
> On 05/23/2016 11:30 PM, Junio C Hamano wrote:
> > Torsten Bögershausen writes:
> >
> > > > > > get_host_and_port(_host, );
> > > > > >+/* get_host_and_port may
On Wed, May 25, 2016 at 4:12 PM, Ramsay Jones
wrote:
>
> Signed-off-by: Ramsay Jones
> ---
>
> Hi Stefan,
>
> If you need to re-roll your 'sb/submodule-default-paths' branch, could
> you please squash this into the relevant patch. (commit
On Tue, May 24, 2016 at 09:45:25AM -0700, Junio C Hamano wrote:
> On Tue, May 24, 2016 at 9:44 AM, Armin Kunaschik
> wrote:
> > t7610-mergetool.sh fails on systems without mktemp.
> >
> > mktemp is used in git-mergetool.sh and throws an error when it's not
> >
While compiling on cygwin (x86_64), gcc complains thus:
CC xdiff/xemit.o
xdiff/xemit.c: In function ‘is_empty_rec’:
xdiff/xemit.c:163:2: warning: array subscript has type ‘char’
[-Wchar-subscripts]
while (len > 0 && isspace(*rec)) {
^
A comment in the header reads, in part,
Signed-off-by: Ramsay Jones
---
Hi Stefan,
If you need to re-roll your 'sb/submodule-default-paths' branch, could
you please squash this into the relevant patch. (commit 8efbe28b,
"clone: add --init-submodule= switch", 23-05-2016).
Thanks!
ATB,
Ramsay Jones
Junio C Hamano wrote:
> This makes sense as a follow-up to e47a8583 (enable SO_KEEPALIVE for
> connected TCP sockets, 2011-12-06), I think.
Yes, a15d069a19867 for http, too; hat trick :>
Anyways, it might've helped Savannah when they had networking
problems:
On Wed, May 25, 2016 at 10:54:02PM +, Eric Wong wrote:
> When loosening a pack, the current pack_id gets reused when
> checkpointing and the import does not terminate. This causes
> problems after checkpointing as the object table, branch, and
> tag lists still contains pre-checkpoint
Jeff King writes:
> I think messages to stderr are generally fair game for changing, even in
> plumbing. In many cases they are also translated (and I would argue that
> these messages probably should be translated, too).
I think I agree. My first reaction to this thread indeed
On Wed, May 25, 2016 at 10:49:07PM +, Eric Wong wrote:
> > Thanks for the analysis. I think this is definitely the problem. After
> > fast-import finalizes a packfile (either at the end of the program or
> > due to a checkpoint), it never discards its internal mapping of objects
> > to pack
When loosening a pack, the current pack_id gets reused when
checkpointing and the import does not terminate. This causes
problems after checkpointing as the object table, branch, and
tag lists still contains pre-checkpoint references to the
recycled pack_id.
Merely clearing the object_table as
On Tue, May 24, 2016 at 09:07:53AM -0700, Junio C Hamano wrote:
> On Tue, May 24, 2016 at 5:55 AM, Matthieu Moy
> wrote:
> > So, when trying a forbidden push, Git would deny it and the only way to
> > force the push would be to remove the blacklist from the config,
Jeff King wrote:
> On Tue, May 17, 2016 at 10:07:16AM +0200, Lars Schneider wrote:
>
> > I think that is pretty much the problem. Here is what is happening:
> >
> > 1. git-p4 imports all changelists for the "main" branch
> >
> > 2. git-p4 starts to import a second branch and
On Tue, May 24, 2016 at 02:21:00PM -0700, Stefan Beller wrote:
> On Tue, May 24, 2016 at 1:51 PM, Yong Bakos wrote:
> > Appending a period to "Everything up-to-date" makes the output message
> > consistent with similar output in builtin/merge.c.
> >
> > Signed-off-by:
On Wed, May 25, 2016 at 3:41 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Signed-off-by: Stefan Beller
>> ---
>> git-submodule.sh | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/git-submodule.sh
On Wed, May 25, 2016 at 3:38 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Sometimes the history of a submodule is not considered important by
>> the projects upstream. To make it easier for downstream users, allow
>> a field 'submodule..depth' in
Eric Wong writes:
> While --init-timeout and --timeout options exist and I've never
> run git-daemon without them, some users may forget to set them
> and encounter hung daemon processes when connections fail.
> Enable socket-level timeouts so the kernel can send keepalive
>
On Wed, May 25, 2016 at 03:15:05AM +, Eric Wong wrote:
> While --init-timeout and --timeout options exist and I've never
> run git-daemon without them, some users may forget to set them
> and encounter hung daemon processes when connections fail.
> Enable socket-level timeouts so the kernel
Stefan Beller writes:
> Signed-off-by: Stefan Beller
> ---
> git-submodule.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-submodule.sh b/git-submodule.sh
> index 5a4dec0..7698102 100755
> --- a/git-submodule.sh
> +++
On Tue, May 24, 2016 at 08:56:49PM -0500, Edward Thomson wrote:
> Check that we are configured to display colors in the given context when
> the user specifies a format string of `%C(auto)`. This brings that
> behavior in line with the behavior of `%C(auto,)`, which will
> display the given
Stefan Beller writes:
> Sometimes the history of a submodule is not considered important by
> the projects upstream. To make it easier for downstream users, allow
> a field 'submodule..depth' in .gitmodules, which can be used
> to indicate the recommended depth.
Hmph. I can
On Wed, May 25, 2016 at 10:33:32PM +0200, Jakub Narębski wrote:
> Richard, thanks for finding a problematic thing, but you
> need to search more for a true fix.
Noted, I'll get back to you soon (hopefully not too late).
--
Richard Braun
--
To unsubscribe from this list: send the line
Luke Madhanga writes:
>> A manual CLI call to git-http-backend doesn't include
>> 'application/x-git-receive-pack-advertisement'
>>
>> REQUEST_METHOD=GET GIT_PROJECT_ROOT=/path/to/core/
>> PATH_INFO=/repo.git/info/refs /usr/lib/git-core/git-http-backend
The request client
Sometimes the history of a submodule is not considered important by
the projects upstream. To make it easier for downstream users, allow
a field 'submodule..depth' in .gitmodules, which can be used
to indicate the recommended depth.
This field is honored in the initial clone by default, it can be
Signed-off-by: Stefan Beller
---
git-submodule.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 5a4dec0..7698102 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -640,7 +640,7 @@ cmd_update()
The depth field will be used in a later patch by `submodule update`.
To differentiate between the actual depth (which may be different),
we name it recommended depth as the field in the .gitmodules file
is only a recommendation by the project.
Signed-off-by: Stefan Beller
---
Sometimes the history of a submodule is not considered important by
the projects upstream. To make it easier for downstream users, allow
a field 'submodule..depth' in .gitmodules, which can be used
to indicate the recommended depth.
Stefan Beller (3):
submodule update: make use of the existing
H. Interesting.
When you look at the PHP code, you'll see the following
$res = self::proc_open("{$gitcoredir}/git-http-backend", [],
$gitdir, true, [...]);
...
$resbits = explode("\n", $res);
foreach ($resbits as $index => $header) {
if ($header && strpos($header,
Duy Nguyen writes:
> Maybe bring back [1] (cquoting paths) and optionally optionally with
> backslash escaping? The conclusion at the end of that thread seems to
> be "ok, we may break rare setups, we just need to be upfront about
> it". Another option is the pathspec way:
Thanks for the response btw
On 25 May 2016 at 22:54, Luke Madhanga wrote:
> H. Interesting.
>
> When you look at the PHP code, you'll see the following
>
> $res = self::proc_open("{$gitcoredir}/git-http-backend", [],
> $gitdir, true, [...]);
> ...
> $resbits
On Wed, May 25, 2016 at 09:28:21PM +0100, Luke Madhanga wrote:
> I've implemented a PHP wrapper for git http backend which works well.
> I've done this to give me advanced control of who has access to
> repositories on my server. You can see the implementation on
>
On Tue, May 24, 2016 at 06:46:48PM -0400, David Turner wrote:
> I tried to make libcurl do the receive-before-sending thing, but it
> doesn't seem to be designed for it (even if you prime things by sending
> a "hello" from the client first). My thought was to hook up
> CURLOPT_READFUNCTION and
On Tue, May 24, 2016 at 8:17 PM, Junio C Hamano wrote:
> Richard Braun writes:
>
>> Gitweb, when used with PATH_INFO, shows a link to parent diff
>> like http://somedomain/somerepo.git/commitdiff/somehash?hp=parenthash.
>> That link reports "400 - Invalid
I've implemented a PHP wrapper for git http backend which works well.
I've done this to give me advanced control of who has access to
repositories on my server. You can see the implementation on
On Wed, 2016-05-25 at 09:23 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > I was looking at this again today, and noticed that it doesn't
> > really
> > address the HTTP case.
> >
> > The central problem is that protocol v2 goes like this:
> > server: I have
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> This should work, but sounds like too much of overloading of
>> --in-reply-to IMHO: if given a message id, it would only add a reference
>> to this message-id, but if given a file, it would also
Hi,
On Wed, May 25, 2016 at 9:28 AM, Austin English wrote:
> I'll try
> to submit my own patch. In the meantime, it seems appropriate to file
> a bug so that others can have the opportunity to solve the problem if
> they're interested.
If you haven't started working on
Matthieu Moy writes:
> This should work, but sounds like too much of overloading of
> --in-reply-to IMHO: if given a message id, it would only add a reference
> to this message-id, but if given a file, it would also modify the To:
> and Cc: list.
>
> Not a strong
Erwan Mathoniere writes:
> Subject: Re: [RFC/PATCH] pull: set-upstream implementation
If this were multi-patch series and one of the other patches were
"pull: set-upstream design" or something, then it might have been
understandable, but otherwise the word
Junio C Hamano writes:
> I wonder if we can safely repurpose existing --in-reply-to option?
In theory, obviously no as there can be a file with this name _and_ it
can be a valid message-id. In practice, it is clearly unlikely. The only
use-case I can think of where both would
Hi Junio,
On Wed, 25 May 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Wed, 25 May 2016, Junio C Hamano wrote:
> >
> >> * I am not familiar with life on filesystems with core.filemode=0;
> >>do files people would want to be able to "add
On Wed, 2016-05-25 at 06:03 +0700, Duy Nguyen wrote:
> On Wed, May 25, 2016 at 5:46 AM, David Turner <
> dtur...@twopensource.com> wrote:
> > I was looking at this again today, and noticed that it doesn't
> > really
> > address the HTTP case.
> >
> > The central problem is that protocol v2 goes
David Turner writes:
> I was looking at this again today, and noticed that it doesn't really
> address the HTTP case.
>
> The central problem is that protocol v2 goes like this:
> server: I have capabilities w,x,y, and z
> client: I want capabilities x and z.
>
> But
Johannes Schindelin writes:
> On Wed, 25 May 2016, Junio C Hamano wrote:
>
>> * I am not familiar with life on filesystems with core.filemode=0;
>>do files people would want to be able to "add --chmod=+x" share
>>common trait that can be expressed with
Junio C Hamano writes:
>> @@ -661,6 +663,10 @@ int add_to_index(struct index_state *istate, const char
>> *path, struct stat *st,
>>
>> if (trust_executable_bit && has_symlinks)
>> ce->ce_mode = create_ce_mode(st_mode);
>> +else if (force_executable)
Matthieu Moy writes:
> Actually, I'm not sure what the ideal behavior should be. Perhaps it's
> better to distinguish 1) and 2) above, and have two options
> --reply-to-email= doing 1), and --quote doing 2), implying
> --compose and requiring --reply-to-email.
I
Implements pull [--set-upstream | -u] which sets the remote tracking
branch to the one the user just pulled from.
git pull [--set-upstream | -u]
After successfully fetched from , sets branch..remote to
and branch..merge to follow /
Signed-off-by: Erwan Mathoniere
Às 19:27 de 23-05-2016, Vasco Almeida escreveu:
> Add eval_ngettext dummy function to be called by tests when running
> under GETTEXT_POISON. Otherwise, tests would fail under gettext poison
> because that function could not be found.
>
> [...]
>
> diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
>
Hi Junio,
On Wed, 25 May 2016, Junio C Hamano wrote:
> * I am not familiar with life on filesystems with core.filemode=0;
>do files people would want to be able to "add --chmod=+x" share
>common trait that can be expressed with .gitattributes mechanism?
I think it is safe to say that
Hi Torsten,
On Wed, 25 May 2016, Torsten Bögershausen wrote:
> On 05/24/2016 01:57 PM, Johannes Schindelin wrote:
> >
> > On Tue, 24 May 2016, Torsten Bögershausen wrote:
> >
> > > if core.filemode is true, Git for Windows could:
> > > a) Behave as today, report changed files (filemode)
> > > b)
On Tue, May 24, 2016 at 7:36 PM, Junio C Hamano wrote:
> Armin Kunaschik writes:
>>
>> Ok, how can this be implemented within the test environment?
>
> I actually think an unconditional check like this is sufficient.
Ah, good. My thoughts were a bit
Hi Ed,
On Tue, 24 May 2016, Edward Thomson wrote:
> Users on deficient filesystems that lack an execute bit may still
> wish to add files to the repository with the appropriate execute
> bit set (or not). Although this can be done in two steps
> (`git add foo && git update-index --chmod=+x
Edward Thomson writes:
> if (trust_executable_bit && has_symlinks)
> ce->ce_mode = create_ce_mode(st_mode);
> + else if (force_executable)
> + ce->ce_mode = create_ce_mode(0777);
> + else if (force_notexecutable)
> +
Edward Thomson writes:
> Users on deficient filesystems that lack an execute bit may still
> wish to add files to the repository with the appropriate execute
> bit set (or not). Although this can be done in two steps
> (`git add foo && git update-index --chmod=+x
On Wed, Apr 13, 2016 at 8:54 AM, Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/upload-pack.c b/upload-pack.c
> @@ -451,7 +451,7 @@ static int is_our_ref(struct object *o)
> -static void check_non_tip(void)
> +static
On Wed, Apr 13, 2016 at 8:54 AM, Nguyễn Thái Ngọc Duy wrote:
> upload-pack: use skip_prefix() instead of starts_with()
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/upload-pack.c b/upload-pack.c
> @@ -403,8 +405,8 @@ static int
On Wed, Apr 13, 2016 at 8:54 AM, Nguyễn Thái Ngọc Duy wrote:
> For now we can handle two types, string and boolean, in
> set_helper_option(). Later on we'll add string_list support, which does
> not fit well. The new function strbuf_set_helper_option() can be reused
> for a
On Wed, Apr 13, 2016 at 8:54 AM, Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/remote-curl.c b/remote-curl.c
> @@ -726,37 +726,30 @@ static int fetch_git(struct discovery *heads,
> char *depth_arg = NULL;
> -
Samuel GROOT writes:
> On 05/23/2016 10:00 PM, Matthieu Moy wrote:
>
>> Your --quote-mail does two things:
>>
>> 1) Populate the To and Cc field
>>
>> 2) Include the original message body with quotation prefix.
>>
[...]
>> * If --compose is not given, don't send
74 matches
Mail list logo