On Tue, Jun 28, 2016 at 02:13:49PM -0700, Junio C Hamano wrote:
> Matthieu Moy writes:
>
> > It is "interesting" if you mean "matches real-life use-case", as it
> > corresponds to the case where the user killed the editor (as reported by
> > Daniel Hahler indeed, "Abort with ":cq", which will mak
When we abort an interactive rebase we do so by calling
`die_abort`, which cleans up after us by removing the rebase
state directory. If the user has requested to use the autostash
feature, though, the state directory may also contain a reference
to the autostash, which will now be deleted.
Fix th
Hi,
first I want to thank all involved in developing git.
It is really one of the - no! - it is the greatest tool I ever worked with!
So I want to help improving it at least with this bug report.
Since git version 2.9.0 git git-gui messes up my author name
- which contains UTF-8 characters: Silv
Am 29.06.2016 um 03:43 schrieb Jeff King:
Another is to just put the posix/ksh schemes into the helper function,
and let Windows people sort it out later if they want to.
Let's do this.
-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to maj
> On Jun 27, 2016, at 5:11 PM, Eric Sunshine wrote:
>
> [snip]
>
> My knee-jerk reaction is that the directory name under .git/worktrees
> is an implementation detail (and could easily have been an arbitrary
> ID, such as .git/worktrees/7ba84ec0) and rather than exposing it
> further and encour
On Tue, Jun 28, 2016 at 10:28 PM, Jeff King wrote:
> On Tue, Jun 28, 2016 at 07:26:39PM +0200, Nguyễn Thái Ngọc Duy wrote:
>
>> There's a surprise about core.ignorecase. We are matching paths, so we
>> should match case-insensitively if core.ignorecase tells us so. And it
>> gets a bit tricky if c
On Tue, Jun 28, 2016 at 10:49 PM, Jeff King wrote:
>> +static int prepare_include_condition_pattern(struct strbuf *pat)
>> +{
>> + struct strbuf path = STRBUF_INIT;
>> + int prefix = 0;
>> +
>> + /* TODO: maybe support ~user/ too */
>> + if (pat->buf[0] == '~' && is_dir_sep(pat->bu
On Tue, 28 Jun 2016, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > It's just that if you take the latter, then the conditional after
> > the loop exits (i.e. the last transmission was an incomplete line)
> > cannot be "is outbuf empty?", as your base state is "has PREFIX and
> > can never
Junio C Hamano writes:
> It's just that if you take the latter, then the conditional after
> the loop exits (i.e. the last transmission was an incomplete line)
> cannot be "is outbuf empty?", as your base state is "has PREFIX and
> can never be empty". I was working back from that if statement.
On Tue, 28 Jun 2016, Junio C Hamano wrote:
> Nicolas Pitre writes:
>
> >> The basic structure of the code (without the "SQUASH" we discussed)
> >> looks like this:
> >>
> >>strbuf_addf(&outbuf, "%s", PREFIX);
> >>while (retval == 0) {
> >>len = packet_read(in_stream, NULL, N
Jeff King writes:
> Johannes pointed out that matching "3" for Windows is overly broad (it
> only happens due to raise(), not regular signal death).
>
> What do we want to do there?
>
> I _think_ matching "3" just makes us slightly less careful, and will not
> cause false positives (it may cause
On Tue, Jun 28, 2016 at 04:36:25PM -0700, Junio C Hamano wrote:
> * jk/test-match-signal (2016-06-24) 4 commits
> - t/lib-git-daemon: use test_match_signal
> - test_must_fail: use test_match_signal
> - t0005: use test_match_signal as appropriate
> - tests: factor portable signal check out of t
Quite a few topics that have been in 'pu' are now in 'next',
following yesterday's batch of topics that were merged to 'master'.
I'll do the real #10th issue tomorrow, but here is a snapshot for
today.
--
[New Topics]
* cc/apply-am (2016-06-28) 41
On Tue, Jun 28, 2016 at 1:26 PM, Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/config.c b/config.c
> @@ -140,9 +141,89 @@ static int handle_path_include(const char *path, struct
> config_include_data *inc
> +static int include_condition_is_true(const char
Junio C Hamano writes:
> But then my observation still holds, no?
>
> ...
> if (outbuf.len) {
> /* we still have something to say */
> strbuf_splice(&outbuf, 0, 0, PREFIX,
> strlen(PREFIX));
> fwrite(...);
> }
I guess thes
On 06/28/2016 09:17 AM, Matthieu Moy wrote:
> "Andy Falanga (afalanga)" writes:
>
>> After the line calling increlnum is executed, I often have issues with
>> make unable to spawn the next command because it can't read the current
>> directory info.
> This may happen if you delete the current dire
Nicolas Pitre writes:
>> The basic structure of the code (without the "SQUASH" we discussed)
>> looks like this:
>>
>> strbuf_addf(&outbuf, "%s", PREFIX);
>> while (retval == 0) {
>> len = packet_read(in_stream, NULL, NULL, buf, LARGE_PACKET_MAX,
>> 0);
>> ..
Honestly, I'd really prefer to see those with topics in 'pu' that
has seen reviews but not yet updated to go back to and polish them
to help move things forward, with the goal to have them in 'next'
sooner so that we can have fixes and features that are sufficiently
vetted and tested in the next re
On Tue, 28 Jun 2016, Junio C Hamano wrote:
> Nicolas Pitre writes:
>
> >> There is something else going on. I cannot quite explain why I am
> >> getting this failure from t5401-update-hooks.sh, for example:
> >>
> >> --- expect 2016-06-28 19:46:24.564937075 +
> >> +++ actual
Christian Couder writes:
> diff --git a/write_or_die.c b/write_or_die.c
> index 49e80aa..c29f677 100644
> --- a/write_or_die.c
> +++ b/write_or_die.c
> @@ -87,8 +87,7 @@ int write_or_whine_pipe(int fd, const void *buf, size_t
> count, const char *msg)
> {
> if (write_in_full(fd, buf, coun
Hi,
Today I realized that when you add a subtree with `git subtree add`,
then remove it with `git rm -r`, then re-add it again, pushing to the
subtree behaves weirdly: it adds the whole history of the main
repository to the sub repository.
Below is a list of commands to reproduce the issue:
```
Matthieu Moy writes:
> It is "interesting" if you mean "matches real-life use-case", as it
> corresponds to the case where the user killed the editor (as reported by
> Daniel Hahler indeed, "Abort with ":cq", which will make Vim exit
> non-zero").
Yes. It is an interesting failure mode in that
Nicolas Pitre writes:
>> There is something else going on. I cannot quite explain why I am
>> getting this failure from t5401-update-hooks.sh, for example:
>>
>> --- expect 2016-06-28 19:46:24.564937075 +
>> +++ actual 2016-06-28 19:46:24.564937075 +
>> @@ -9,3 +9,
On Tue, Jun 28, 2016 at 10:51:15PM +0200, Matthieu Moy wrote:
> Jeff King writes:
>
> > On Tue, Jun 28, 2016 at 07:26:39PM +0200, Nguyễn Thái Ngọc Duy wrote:
> >
> >> There's a surprise about core.ignorecase. We are matching paths, so we
> >> should match case-insensitively if core.ignorecase te
On Tue, 28 Jun 2016, Junio C Hamano wrote:
> Nicolas Pitre writes:
>
> > Without this, the error and remaining buffer would be reversed as
> > mentioned previously. With this, the order is restored, but a newline
> > is added to unterminated lines whereas the error was simply appended to
> >
Jeff King writes:
> On Tue, Jun 28, 2016 at 07:26:39PM +0200, Nguyễn Thái Ngọc Duy wrote:
>
>> There's a surprise about core.ignorecase. We are matching paths, so we
>> should match case-insensitively if core.ignorecase tells us so. And it
>> gets a bit tricky if core.ignorecase is defined in the
On Tue, Jun 28, 2016 at 07:26:41PM +0200, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 58673cf..c8ad0bf 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -91,6 +91,46 @@ found at the location of the include direc
Junio C Hamano writes:
> Patrick Steinhardt writes:
>
>> +test_expect_success 'restore autostash on editor failure' '
>> +test_when_finished "git reset --hard" &&
>> +echo uncommited-content >file0 &&
>> +(
>> +test_set_editor "false" &&
>> +test_must_fail git
On Tue, Jun 28, 2016 at 07:26:39PM +0200, Nguyễn Thái Ngọc Duy wrote:
> There's a surprise about core.ignorecase. We are matching paths, so we
> should match case-insensitively if core.ignorecase tells us so. And it
> gets a bit tricky if core.ignorecase is defined in the same config
> file. I don
On Tue, Jun 28, 2016 at 12:08 PM, Martin von Gagern
wrote:
> Hi Stefan,
>
> On 28.06.2016 19:20, Stefan Beller wrote:
>>> I have the feeling that “git submodule update --depth 1” is less clever
>>> than it could be. Here is one example I observed with git 2.0.0:
>>
>> 2.9.0 (as "Direct fetching of
ioannis.kap...@rbs.com wrote:
> Fortunately, a patch has already been submitted to subversion
> with (github) revision
> a074af86c8764404b28ce99d0bedcb668a321408 (at
> https://github.com/apache/subversion/commit/a074af86c8764404b28ce99d0bedcb668a321408
> ) on the trunk to handle this and a couple o
Nicolas Pitre writes:
> Without this, the error and remaining buffer would be reversed as
> mentioned previously. With this, the order is restored, but a newline
> is added to unterminated lines whereas the error was simply appended to
> the output before Lukas' patch.
>
> In any case the new
Hi Stefan,
On 28.06.2016 19:20, Stefan Beller wrote:
>> I have the feeling that “git submodule update --depth 1” is less clever
>> than it could be. Here is one example I observed with git 2.0.0:
>
> 2.9.0 (as "Direct fetching of " is not part of 2.0.0 IIRC) ?
Yes, sorry. I had this tested with
Patrick Steinhardt writes:
> When we abort an interactive rebase we do so by calling
> `die_abort`, which cleans up after us by removing the rebase
> state directory. If the user has requested to use the autostash
> feature, though, the state directory may also contain a reference
> to the autost
On Tue, Jun 28, 2016 at 1:58 PM, Junio C Hamano wrote:
> Let's then squash this in.
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> @@ -444,11 +444,11 @@ This is useful for excluding servers inside a firewall
> from
> core.sshCommand::
> - If this variable is set the
Johannes Sixt writes:
> Am 27.06.2016 um 09:26 schrieb larsxschnei...@gmail.com:
>> --- a/git-p4.py
>> +++ b/git-p4.py
>> @@ -2274,7 +2274,7 @@ class P4Sync(Command, P4UserMap):
>> self.useClientSpec_from_options = False
>> self.clientSpecDirs = None
>> self.tempBran
On Tue, 28 Jun 2016, Junio C Hamano wrote:
> Nicolas Pitre writes:
>
> >> When we exit the loop because we set retval to a non-zero value,
> >> should we still drain the outbuf?
> >
> > I would think so. Anything that the remote sent before any error should
> > be printed nevertheless. The cl
This reproduces the error as pointed out in [1], but the fix is not easy,
so punt on it for now and just document what needs to be done.
[1]
http://stackoverflow.com/questions/32782382/git-moving-submodules-recursively-nested-submodules
Signed-off-by: Stefan Beller
---
Bart,
I don't hav
Am 27.06.2016 um 09:26 schrieb larsxschnei...@gmail.com:
--- a/git-p4.py
+++ b/git-p4.py
@@ -2274,7 +2274,7 @@ class P4Sync(Command, P4UserMap):
self.useClientSpec_from_options = False
self.clientSpecDirs = None
self.tempBranches = []
-self.tempBranchLocation
Signed-off-by: Christian Couder
---
t/t0410-transfer-e-odb.sh | 136 ++
1 file changed, 136 insertions(+)
create mode 100755 t/t0410-transfer-e-odb.sh
diff --git a/t/t0410-transfer-e-odb.sh b/t/t0410-transfer-e-odb.sh
new file mode 100755
index 00
Signed-off-by: Christian Couder
---
t/t0400-external-odb.sh | 9 +
1 file changed, 9 insertions(+)
diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh
index 0f1bb97..6c6da5c 100755
--- a/t/t0400-external-odb.sh
+++ b/t/t0400-external-odb.sh
@@ -57,4 +57,13 @@ test_expect_succe
Signed-off-by: Christian Couder
---
t/t0400-external-odb.sh | 14 ++
1 file changed, 14 insertions(+)
diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh
index fe85413..0f1bb97 100755
--- a/t/t0400-external-odb.sh
+++ b/t/t0400-external-odb.sh
@@ -7,6 +7,10 @@ test_descrip
Signed-off-by: Christian Couder
---
external-odb.c | 15 +++
external-odb.h | 2 ++
odb-helper.c | 41 +
odb-helper.h | 3 +++
sha1_file.c| 2 ++
5 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/external-odb.c b/externa
Signed-off-by: Christian Couder
---
cache.h| 9 +
environment.c | 4
external-odb.c | 6 ++
sha1_file.c| 3 +++
4 files changed, 22 insertions(+)
diff --git a/cache.h b/cache.h
index cc0a934..b0fe2bc 100644
--- a/cache.h
+++ b/cache.h
@@ -420,6 +420,7 @@ static inli
Goal
Git can store its objects only in the form of loose objects in
separate files or packed objects in a pack file.
To be able to better handle some kind of objects, for example big
blobs, it would be nice if Git could store its objects in other object
databases (ODB).
To do that, this pat
From: Jeff King
---
external-odb.c | 14 ++
external-odb.h | 6 ++
odb-helper.c | 15 +++
odb-helper.h | 4
4 files changed, 39 insertions(+)
diff --git a/external-odb.c b/external-odb.c
index 1ccfa99..42978a3 100644
--- a/external-odb.c
+++ b/external-odb
Nicolas Pitre writes:
>> When we exit the loop because we set retval to a non-zero value,
>> should we still drain the outbuf?
>
> I would think so. Anything that the remote sent before any error should
> be printed nevertheless. The clue for the error might be in the pending
> buffer.
>
> Ho
Signed-off-by: Christian Couder
---
external-odb.c | 4
1 file changed, 4 insertions(+)
diff --git a/external-odb.c b/external-odb.c
index bb70fe3..6dd7b25 100644
--- a/external-odb.c
+++ b/external-odb.c
@@ -133,6 +133,10 @@ int external_odb_write_object(const void *buf, unsigned
long len
Signed-off-by: Christian Couder
---
t/t0400-external-odb.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh
index 2b01617..fe85413 100755
--- a/t/t0400-external-odb.sh
+++ b/t/t0400-external-odb.sh
@@ -10,9 +10,7 @@ write_sc
From: Jeff King
Signed-off-by: Christian Couder
---
Makefile| 2 +
cache.h | 9 ++
external-odb.c | 115 +++
external-odb.h | 8 ++
odb-helper.c| 239
odb-hel
Signed-off-by: Christian Couder
---
t/t0400-external-odb.sh | 8
1 file changed, 8 insertions(+)
diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh
index 6c6da5c..3c868ca 100755
--- a/t/t0400-external-odb.sh
+++ b/t/t0400-external-odb.sh
@@ -66,4 +66,12 @@ test_expect_succes
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> On Wed, Jun 22, 2016 at 12:00 PM, Eric Wong wrote:
>>>
>>> Just wondering, who updates
>>> https://kernel.org/pub/software/scm/git/docs/
>>> and why hasn't it been updated in a while?
>>> (currently it says Last updated 2015-06-06 at the bottom
Matthieu Moy writes:
> Jeff King writes:
>
>> On Sun, Jun 26, 2016 at 01:16:35PM +0200, Nguyễn Thái Ngọc Duy wrote:
>>
>>> + use the specified command instead of 'ssh' when they need to
>>> + connect to a remote system. The command is in the same form as
>>> + 'GIT_SSH_COMMAND' environment
When we abort an interactive rebase we do so by calling
`die_abort`, which cleans up after us by removing the rebase
state directory. If the user has requested to use the autostash
feature, though, the state directory may also contain a reference
to the autostash, which will now be deleted.
Fix th
Bringing this up again after I've seen another person accidentally
create a refs/heads/origin/some-branch and get really confused because
"git push" reports up-to-date but the remote branch is not updated. I
don't know how he got into that situation, but I hope we should be
able to catch it and sug
On Mon, Jun 27, 2016 at 11:28 PM, Bart Bogaerts wrote:
> I dit some more testing.
>
> It is important for the bug to occur that all submodules are initialised.
> So my suggestion is not yet complete, you need to add the line
Oh right. I was completely oblivious to that.
>
> git submodule update
On Tue, 28 Jun 2016, Junio C Hamano wrote:
> And then that made me stare at the patch even more. We still write
> some error messages to stderr in the updated code (without my crap
> SQUASH) inside "while (!retval)" loop:
>
> while (retval == 0) {
> int band, len;
>
From: Jeff King
The skip_prefix function has been very useful for
simplifying pointer arithmetic and avoiding repeated magic
numbers, but we have no equivalent for length-limited
buffers. So we're stuck with:
if (3 <= len && skip_prefix(buf, "foo", &buf))
len -= 3;
That's not that c
Michael Haggerty writes:
> (I suppose that `REFNAME_ALLOW_ONELEVEL` was
> meant for checking partial reference names, for example to vet "foo"
> that the caller wants to pass to `git branch`, which automatically turns
> it into `refs/heads/foo`.)
Correct.
> In summary, `check_refname_format()`
Main description is already in config.txt. Here is a dev-only note
about Windows support.
While prepare_include_condition_pattern() is Windows-friendly (because
it does not hard code '/'). The reality could be uglier because
internally get_git_dir() may return a path with '/' only or worse, a
mix
Second try. The anchoring rules now look a lot better. I cherry picked
Jeff's skip_prefix_mem() for now to avoid dependency.
There's a surprise about core.ignorecase. We are matching paths, so we
should match case-insensitively if core.ignorecase tells us so. And it
gets a bit tricky if core.ignor
Junio C Hamano writes:
> With input from Dscho that recent Git-for-Windows does the right
> thing without limiting us to use only a subset of stdio, perhaps we
> would want to squash something like this in.
>
> diff --git a/sideband.c b/sideband.c
> index 226a8c2..72e2c5c 100644
> --- a/sideband.
On Mon, Jun 27, 2016 at 10:39 PM, Martin von Gagern
wrote:
> Hi!
>
> I have the feeling that “git submodule update --depth 1” is less clever
> than it could be. Here is one example I observed with git 2.0.0:
2.9.0 (as "Direct fetching of " is not part of 2.0.0 IIRC) ?
>
> git init foo
> cd f
Lukas Fleischer writes:
> Before this patch, we used character buffer manipulations to split
> messages from the sideband at line breaks and insert "remote: " at the
> beginning of each line, using the packet size to determine the end of a
> message. However, since it is safe to assume that diagn
On Tue, Jun 28, 2016 at 06:24:05PM +0200, Johannes Schindelin wrote:
> Essentially, the caveat in color.h that one should use fprintf() and
> printf() when outputting color sequences to a terminal no longer holds
> true. fwrite() or write() work just as well.
Cool. One less thing to worry about.
On Tue, Jun 28, 2016 at 9:24 AM, Johannes Schindelin
wrote:
>
> On Tue, 28 Jun 2016, Junio C Hamano wrote:
>>
>> So as long as we write via stdio to stdout/stderr, you can show
>> colors? Or is it now stronger, in that as long as we do anything
>> that ends up writing to file descriptors 1 or 2,
Дилян Палаузов writes:
> The API of libcurl does not mention Curl_ssl_init() and when curl is built
> with -flto, the Curl_ssl_init symbol is not exported.
>
> https://curl.haxx.se/libcurl/using/ suggests calling
> curl-config --feature | grep SSL
> to see, if the installed curl has SSL suppor
Hi Yannis,
On Tue, 28 Jun 2016, Ioannis Kappas wrote:
> Hi Johanes,
Almost ;-)
> Johannes Schindelin gmx.de> writes:
>
> > Would you mind giving them a whirl?
>
> The patch in "source code (zip)" seems to be missing the line in the prepare
> () section of PKGBUILD to actually apply the fix:
Hi Junio,
On Tue, 28 Jun 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Originally, ANSI color sequences were supported on Windows only by
> > overriding the printf() and fprintf() functions, as mentioned in e7821d7
> > (Add a notice that only certain functions can print color
Hi Junio,
On Tue, 28 Jun 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Erm, sorry...
> >
> > On Tue, 28 Jun 2016, Johannes Schindelin wrote:
> >
> >> [...] we actually do not override fprintf() at all anymore [*1*] [...]
> >
> > ... forgot the
> >
> > Footnote *1*: In Git for
Hi Johanes,
Johannes Schindelin gmx.de> writes:
>
> Hi Ioannis,
>
> On Tue, 28 Jun 2016, Johannes Schindelin wrote:
>
> > On Tue, 28 Jun 2016, Ioannis.Kappas rbs.com wrote:
> >
> > > Git can fail with a "malformed index nnn" error or cause a
segmentation
> > > fault when executing the "git
On Tue, Jun 28, 2016 at 3:43 PM, Lars Schneider
wrote:
>
>> On 28 Jun 2016, at 15:14, Johannes Schindelin
>> wrote:
>>
>> Hi Duy,
>>
>> On Tue, 28 Jun 2016, Duy Nguyen wrote:
>>
>>> On Tue, Jun 28, 2016 at 11:40 AM, Johannes Schindelin
>>> wrote:
On Mon, 27 Jun 2016, Duy Nguyen wrote:
On Tue, Jun 28, 2016 at 3:14 PM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Tue, 28 Jun 2016, Duy Nguyen wrote:
>
>> On Tue, Jun 28, 2016 at 11:40 AM, Johannes Schindelin
>> wrote:
>> >
>> > On Mon, 27 Jun 2016, Duy Nguyen wrote:
>> >
>> >> On Mon, Jun 27, 2016 at 7:38 AM, wrote:
>> >> > ## Pr
Johannes Schindelin writes:
> Originally, ANSI color sequences were supported on Windows only by
> overriding the printf() and fprintf() functions, as mentioned in e7821d7
> (Add a notice that only certain functions can print color escape codes,
> 2009-11-27).
>
> As of eac14f8 (Win32: Thread-saf
Matthieu Moy writes:
> Sorry, I forgot to mention when sending the series: this is to be
> applied on top of tr/doc-tt (in next, marked "will merge to master").
Yup, I figured it out and these are queued there. tr/doc-tt is part
of 'master' now.
--
To unsubscribe from this list: send the line "
"Andy Falanga (afalanga)" writes:
> After the line calling increlnum is executed, I often have issues with
> make unable to spawn the next command because it can't read the current
> directory info.
This may happen if you delete the current directory, even if your
re-create it afterwards. For
Johannes Schindelin writes:
> Erm, sorry...
>
> On Tue, 28 Jun 2016, Johannes Schindelin wrote:
>
>> [...] we actually do not override fprintf() at all anymore [*1*] [...]
>
> ... forgot the
>
> Footnote *1*: In Git for Windows, we actually *do* override fprintf(),
> thanks to using gettext, but
Hi,
I'm using git version 1.8.3.1. I have a process for building RPMs in my
repository. The RPMs are versioned using a "build number". In order to
maintain uniqueness for this build number, I have stored this number to
a file which exists on only a unique branch.
The build process, for an ac
On Tue, Jun 28, 2016 at 3:22 PM, Lars Schneider
wrote:
>
> @Christian/Peff:
> Is there a place to look for more info about your remote-object-store idea?
You may want to take a look at:
https://github.com/chriscool/git/commits/external-odb
I just updated it and I may send an updated RFC series
> On 28 Jun 2016, at 15:14, Johannes Schindelin
> wrote:
>
> Hi Duy,
>
> On Tue, 28 Jun 2016, Duy Nguyen wrote:
>
>> On Tue, Jun 28, 2016 at 11:40 AM, Johannes Schindelin
>> wrote:
>>>
>>> On Mon, 27 Jun 2016, Duy Nguyen wrote:
>>>
On Mon, Jun 27, 2016 at 7:38 AM, wrote:
> ## Pr
Hi Ioannis,
On Tue, 28 Jun 2016, Johannes Schindelin wrote:
> On Tue, 28 Jun 2016, ioannis.kap...@rbs.com wrote:
>
> > Git can fail with a "malformed index nnn" error or cause a segmentation
> > fault when executing the "git svn clone" command.
> >
> > [...]
> >
> > Fortunately, a patch has alr
> On 27 Jun 2016, at 18:09, Junio C Hamano wrote:
>
> larsxschnei...@gmail.com writes:
>
>> Unfortunately that fix helps only with cloning. Any local Git operation
>> that invokes the clean/smudge filter (e.g. switching branches) is still
>> slow.
>
> Do you know where the slowness comes from?
Hi Duy,
On Tue, 28 Jun 2016, Duy Nguyen wrote:
> On Tue, Jun 28, 2016 at 11:40 AM, Johannes Schindelin
> wrote:
> >
> > On Mon, 27 Jun 2016, Duy Nguyen wrote:
> >
> >> On Mon, Jun 27, 2016 at 7:38 AM, wrote:
> >> > ## Proposed solution
> >> > Git LFS caches its objects under .git/lfs/objects.
On Tue, Jun 28, 2016 at 11:40 AM, Johannes Schindelin
wrote:
> Hi Duy,
>
> On Mon, 27 Jun 2016, Duy Nguyen wrote:
>
>> On Mon, Jun 27, 2016 at 7:38 AM, wrote:
>> > ## Proposed solution
>> > Git LFS caches its objects under .git/lfs/objects. Most of the time
>> > Git LFS objects are already avail
The API of libcurl does not mention Curl_ssl_init() and when curl is built
with -flto, the Curl_ssl_init symbol is not exported.
https://curl.haxx.se/libcurl/using/ suggests calling
curl-config --feature | grep SSL
to see, if the installed curl has SSL support. Another approach would
be calling
Hi Ioannis,
On Tue, 28 Jun 2016, ioannis.kap...@rbs.com wrote:
> Git can fail with a "malformed index nnn" error or cause a segmentation
> fault when executing the "git svn clone" command.
>
> [...]
>
> Fortunately, a patch has already been submitted to subversion with
> (github) revision a074af
This should address all comments from Peff.
The series is now based on master (which now contains tr/doc-tt).
Content changes since v1:
* First patch (fix indentation prior to actual change to avoid 'git
am' warning) is new.
* One buggy replacement (`grep.patternType` -> 'grep.patternType')
The current practice is:
git/Documentation$ git grep "'HEAD'" | wc -l
24
git/Documentation$ git grep "\`HEAD\`" | wc -l
66
Let's adopt the majority as a guideline.
Signed-off-by: Matthieu Moy
---
Documentation/CodingGuidelines | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --
Similarly to the previous commit, use backquotes instead of
forward-quotes, for long options.
This was obtained with:
perl -pi -e "s/'(--[a-z][a-z=<>-]*)'/\`\$1\`/g" *.txt
and manual tweak to remove false positive in ascii-art (o'--o'--o' to
describe rewritten history).
Signed-off-by: Matthie
It was common in our documentation to surround short option names with
forward quotes, which renders as italic in HTML. Instead, use backquotes
which renders as monospace. This is one more step toward conformance to
Documentation/CodingGuidelines.
This was obtained with:
perl -pi -e "s/'(-[a-z]
This was obtained with:
perl -pi -e "s/'--'/\`--\`/g" *.txt
Signed-off-by: Matthieu Moy
---
Documentation/git-fast-import.txt | 4 ++--
Documentation/git-filter-branch.txt | 2 +-
Documentation/rev-list-options.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Docu
We previously reformatted '--option' to `--option`. This patch reformats
'--option ' to `--option `. Obtained with:
perl -pi -e "s/'(--[a-z][a-z=<>-]* <[^>]*>)'/\`\$1\`/g" *.txt
Signed-off-by: Matthieu Moy
---
Documentation/git-config.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions
This is an application of the newly added CodingGuidelines to HEAD and
variants like FETCH_HEAD. It was obtained with:
perl -pi -e "s/'([A-Z_]*HEAD)'/\`\$1\`/g" *.txt
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.txt| 2 +-
Documentation/git-branch.txt| 4 ++--
Do
Replace spaces with tabs to avoid a warning when further patches change
these lines.
Signed-off-by: Matthieu Moy
---
Documentation/git-mv.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt
index e453132..6dcb8b2 100644
From: David A. Greene
This test merges an external tree in as a subtree, makes some commits
on top of it and splits it back out. In the process the added commits
are lost or the rebase aborts with an internal error. The tests are
marked to expect failure so that we don't forget to fix it.
Sign
Junio C Hamano writes:
> gree...@obbligato.org (David A. Greene) writes:
>
>>> I also notice that files_subtree/master4 does not appear in any of
>>> the verification in the three tests that use the history being
>>> prepared here, i.e. if master4 is silently dropped while master5 is
>>> kept, su
Junio C Hamano writes:
> gree...@obbligato.org (David A. Greene) writes:
>
>> Just to clarify, what is the expectation of things in contrib?
>> Basically the same as other code?
>
> That heavily depends on your exit strategy.
>
> If the aspiration is to move up to exit, then the quality and
> sta
On 06/27/2016 09:26 AM, larsxschnei...@gmail.com wrote:
> Git-P4 used to place temporary refs under "git-p4-tmp". Since 3da1f37
> Git checks that all refs are placed under "ref". Instruct Git-P4 to
> place temporary refs under "ref/git-p4-tmp". There are no backwards
> compatibility considerations
Hi Duym
On Mon, 27 Jun 2016, Duy Nguyen wrote:
> On Mon, Jun 27, 2016 at 2:14 PM, Johannes Schindelin
> wrote:
> >
> > On Sun, 26 Jun 2016, Nguyễn Thái Ngọc Duy wrote:
> >
> >> This keeps #ifdef at the callee instead of caller, it's less messier.
> >>
> >> The caller in question is in read-cache
Erm, sorry...
On Tue, 28 Jun 2016, Johannes Schindelin wrote:
> [...] we actually do not override fprintf() at all anymore [*1*] [...]
... forgot the
Footnote *1*: In Git for Windows, we actually *do* override fprintf(),
thanks to using gettext, but it is *gettext* that is doing the overriding
1 - 100 of 118 matches
Mail list logo
