Hi Peff,
tl;dr let's keep an eye on adding only test cases that do not depend on
earlier test cases' output ('setup' excluded, of course).
On Sun, 14 Feb 2016, Jeff King wrote:
> In general, my opinion is that skipping arbitrary leading tests is a
> losing strategy. It's just too easy to introdu
On Tue, Feb 9, 2016 at 4:24 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> + cd shallow-since &&
>> + GIT_COMMITTER_DATE="1 +0700" git commit --allow-empty -m one &&
>> + GIT_COMMITTER_DATE="2 +0700" git commit --allow-empty -m two &&
>> + GIT_COMMI
On Mon, Feb 15, 2016 at 12:52 AM, Eric Sunshine wrote:
> On Sun, Feb 14, 2016 at 10:53 PM, Duy Nguyen wrote:
>> On Fri, Feb 5, 2016 at 12:26 PM, Eric Sunshine
>> wrote:
>>> Hmm, can't this be simplified to:
>>>
>>> if (skip_prefix(arg, "--shallow-exclude=", &value)) {
>>> if (!args.
On Sun, Feb 14, 2016 at 10:53 PM, Duy Nguyen wrote:
> On Fri, Feb 5, 2016 at 12:26 PM, Eric Sunshine
> wrote:
>> On Thu, Feb 4, 2016 at 4:03 AM, Nguyễn Thái Ngọc Duy
>> wrote:
>>> Signed-off-by: Nguyễn Thái Ngọc Duy
>>> ---
>>> diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
>>> @@ -
Felipe Gonçalves Assis writes:
> The usual workaround is using the resolve strategy, but apparently it
> ignores the custom merge driver.
Hmph.
Indeed, git-merge-file seems to call xdl_merge() directly, bypassing
the ll_merge(), which is understandable as the former predates the
latter. That n
Moritz Neeb writes:
>> You would also want to think about the necessity of strbuf_trim()
>> here. Now strbuf_getline() would trim the trailing CR, would we
>> still need to call strbuf_trim() here? The code will break if you
>> just remove the call, but on the other hand, you will realize that
Torsten Bögershausen writes:
>> * tb/conversion (2016-02-10) 6 commits
>> (merged to 'next' on 2016-02-12 at 6faf27b)
> Could we keep it in next for a while ?
>
> I found issues that needs to be fixed before going to master,
> updates follow soonish.
Hmph, I somehow thought that everything was
Bonjour
Vous aviez besoin de prêts d'argent entre particuliers pour faire face
aux difficultés financières pour enfin sortir de l'impasse que
provoquent les banques, par le rejet de vos dossiers de demande de
crédits ?
Je suis un un citoyen français a la retraite en mesure de vous faire
un prêt de
On Fri, Feb 5, 2016 at 12:26 PM, Eric Sunshine wrote:
> On Thu, Feb 4, 2016 at 4:03 AM, Nguyễn Thái Ngọc Duy
> wrote:
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>> diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
>> @@ -109,6 +109,16 @@ int cmd_fetch_pack(int argc, const char **argv,
On Fri, Feb 5, 2016 at 12:05 PM, Eric Sunshine wrote:
> On Thu, Feb 4, 2016 at 4:03 AM, Nguyễn Thái Ngọc Duy
> wrote:
>> @@ -732,7 +743,7 @@ static void receive_needs(void)
>> if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
>> return;
>> if (depth > 0 && d
On Fri, Feb 5, 2016 at 6:48 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> Signed-off-by: Nguyễn Thái Ngọc Duy
>> ---
>
> Hmm, so "deepen 10-by-the-way-let-me-tell-you-something-else" was an
> acceptable input that some (third-party) version of "git fetch"
> could have used, but
I've amended tests to both commits, but the URL encoding one
requires an HTTP server to test effectively.
I couldn't find a test prereq for httpd, but perhaps it's good
to test by default regardless in case a future SVN changes
file:// behavior. I've only tested this with SVN 1.6.17 under
Debian
Kazutoshi Satoda wrote:
> The conversion from "svn.pathnameencoding" to UTF-8 should be applied
> first, and then URL encoding should be applied on the resulting UTF-8
> path. The reversed order of these transforms (used before this fix)
> makes non-UTF-8 URL which causes error from Subversion suc
Kazutoshi Satoda wrote:
> Signed-off-by: Kazutoshi SATODA
Signed-off-by: Eric Wong
Thanks, it took me some time to figure out the test
case which I will amend:
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh
b/t/t9115-git-svn-dcommit-funky-renames.sh
index 6a48e40..8fd 100755
--- a
Hi there,
> On 15 Jan 2016, at 10:25, Johannes Schindelin
> wrote:
>
> Hi Mike,
>
> On Fri, 15 Jan 2016, Mike Hommey wrote:
>
>> Git-cinnabar is a git remote helper to interact with mercurial
>> repositories. It allows to clone, pull and push from/to mercurial remote
>> repositories, using gi
On 02/01/2016 10:30 PM, Junio C Hamano wrote:
> Moritz Neeb writes:
>
>> The lines read from BISECT_NAMES are trimmed with strbuf_trim()
>> immediately. There is thus no logic expecting CR, so
>> strbuf_getline_lf() can be replaced by its CRLF counterpart.
>
> We do not indent the wh
Hi,
I would like to set up a Git repository with a custom merge driver,
and then disable rename detection when merging.
Unfortunately, the recursive strategy has no "no-renames" option. Note
that I would like to avoid rename detection even when the file
contents perfectly match.
The usual workar
On Sun, Feb 14, 2016 at 8:50 AM, Jeff King wrote:
> On Sat, Feb 13, 2016 at 05:39:34PM -0800, Shawn Pearce wrote:
>
>> For curl error 35 (CURLE_SSL_CONNECT_ERROR) users need the
>> additional text stored in CURLOPT_ERRORBUFFER to debug why
>> the connection did not start. This is curl_errorstr ins
On Sun, Feb 14, 2016 at 9:05 AM, Jeff King wrote:
> On Sat, Feb 13, 2016 at 06:14:31PM -0800, Shawn Pearce wrote:
>
>> > And with "resumable=", the client does not have to hit the server
>> > to do a redirect; it can go straight to the final URL, saving a
>> > round-trip.
>>
>> It occurred to me t
On Sat, Feb 13, 2016 at 06:14:31PM -0800, Shawn Pearce wrote:
> > And with "resumable=", the client does not have to hit the server
> > to do a redirect; it can go straight to the final URL, saving a
> > round-trip.
>
> It occurred to me today that to make the above ("resumable=") as
> efficient
On Sat, Feb 13, 2016 at 05:39:34PM -0800, Shawn Pearce wrote:
> For curl error 35 (CURLE_SSL_CONNECT_ERROR) users need the
> additional text stored in CURLOPT_ERRORBUFFER to debug why
> the connection did not start. This is curl_errorstr inside
> of http.c, so include that in the message if it is
On Sun, Feb 14, 2016 at 01:48:59PM +0100, Lars Schneider wrote:
> > I see you split this up more, but there's still quite a bit going on in
> > this one block. IMHO, it would be more customary in our tests to put the
> > setup into one test_expect_success block, then each of these
> > expect-run-c
On Sun, Feb 14, 2016 at 01:24:55PM +0100, Lars Schneider wrote:
> > Should git_config_from_buf() take a "type" parameter, and
> > git_config_from_blob_sha1() pass in "blob"?
> Haha, fun fact: this was how I implemented it initially. Because of that
> I noticed that "submodule-config.c" also uses "
On Sun, Feb 14, 2016 at 01:17:43PM +0100, Lars Schneider wrote:
> Oh. Believe it or not but the similarity is coincidental. I referenced you
> ("Helped-by") because you explained the expected "includes" behavior to
> me in your v2 review of my series. If I would have found your patch, I
> would
On 13 Feb 2016, at 18:44, Jeff King wrote:
> On Sat, Feb 13, 2016 at 03:24:16PM +0100, larsxschnei...@gmail.com wrote:
>
>> From: Lars Schneider
>>
>> If config values are queried using 'git config' (e.g. via --get,
>> --get-all, --get-regexp, or --list flag) then it is sometimes hard to
>> f
On 13 Feb 2016, at 22:04, Junio C Hamano wrote:
> Jeff King writes:
>
>>> @@ -1104,6 +1106,7 @@ int git_config_from_buf(config_fn_t fn, const char
>>> *name, const char *buf,
>>> top.u.buf.buf = buf;
>>> top.u.buf.len = len;
>>> top.u.buf.pos = 0;
>>> + top.type = "blob";
>>>
On 13 Feb 2016, at 18:24, Jeff King wrote:
> On Sat, Feb 13, 2016 at 03:24:15PM +0100, larsxschnei...@gmail.com wrote:
>
>> From: Lars Schneider
>>
>> Use the config type to print more detailed error messages that inform
>> the user about the origin of a config error (file, stdin, blob).
>
>
> * tb/conversion (2016-02-10) 6 commits
> (merged to 'next' on 2016-02-12 at 6faf27b)
Could we keep it in next for a while ?
I found issues that needs to be fixed before going to master,
updates follow soonish.
Thanks
--
To unsubscribe from this list: send the line "unsubscribe git" in
the bod
On 13 Feb 2016, at 18:17, Jeff King wrote:
> On Sat, Feb 13, 2016 at 03:24:14PM +0100, larsxschnei...@gmail.com wrote:
>
>> From: Lars Schneider
>>
>> Helped-by: Jeff King
>> Signed-off-by: Lars Schneider
>> ---
>> Documentation/git-config.txt | 4 +++-
>> 1 file changed, 3 insertions(+), 1
On Sat, Feb 6, 2016 at 2:44 AM, David Turner wrote:
> +static char *get_refdb_path(const char *base)
> +{
> + static struct strbuf path_buf = STRBUF_INIT;
> + strbuf_reset(&path_buf);
> + strbuf_addf(&path_buf, "%s/refdb", base);
> + return path_buf.buf;
> +}
...
> +static
Signed-off-by: Nguyễn Thái Ngọc Duy
---
grep.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/grep.c b/grep.c
index 6e99b01..cb058a5 100644
--- a/grep.c
+++ b/grep.c
@@ -445,10 +445,7 @@ static void compile_regexp(struct grep_pat *p, struct
grep_opt *opt)
Similar to the "grep -F -i" case, we can't use kws on icase search
outside ascii range, so we quote the string and pass it to regcomp as
a basic regexp and let regex engine deal with case sensitivity.
The new test is put in t7812 instead of t4209-log-pickaxe because
lib-gettext.sh might cause prob
There's another regcomp code block coming in this function. By moving
the error handling code out of this block, we don't have to add the
same error handling code in the new block.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diffcore-pickaxe.c | 16
1 file changed, 8 insertions(+),
When we detect the pattern is just a literal string, we avoid heavy
regex engine and use fast substring search implemented in kwsset.c.
But kws uses git-ctype which is locale-independent so it does not know
how to fold case properly outside ascii range. Let regcomp or pcre
take care of this case in
The default tables are usually built with C locale and only suitable
for LANG=C or similar. This should make case insensitive search work
correctly for all single-byte charsets.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
grep.c | 8 ++--
grep.h
Similar to the previous commit, we can't use kws on icase search
outside ascii range. But we can't simply pass the pattern to
regcomp/pcre like the previous commit because it may contain regex
special characters, so we need to quote the regex first.
To avoid misquote traps that could lead to undef
This function returns true if git is running under an UTF-8
locale. pcre in the next patch will need this.
is_encoding_utf8() is used instead of strcmp() to catch both "utf-8"
and "utf8" suffixes.
When built with no gettext support, we peek in several env variables
to detect UTF-8. pcre library m
Signed-off-by: Nguyễn Thái Ngọc Duy
---
test-regex.c | 51 +--
1 file changed, 49 insertions(+), 2 deletions(-)
diff --git a/test-regex.c b/test-regex.c
index 67a1a65..eff26f5 100644
--- a/test-regex.c
+++ b/test-regex.c
@@ -1,4 +1,21 @@
#include
In the previous change in this function, we add locale support for
single-byte encodings only. It looks like pcre only supports utf-* as
multibyte encodings, the others are left in the cold (which is
fine).
We need to enable PCRE_UTF8 so pcre can find character boundary
correctly. It's needed for
Signed-off-by: Nguyễn Thái Ngọc Duy
---
grep.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/grep.c b/grep.c
index 7b2b96a..609f218 100644
--- a/grep.c
+++ b/grep.c
@@ -403,7 +403,9 @@ static void compile_regexp(struct grep_pat *p, struct
grep_opt *opt)
p->word_r
This is in preparation to turn test-regex into some generic regex
testing command.
Helped-by: Eric Sunshine
Helped-by: Ramsay Jones
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t0070-fundamental.sh | 2 +-
test-regex.c | 12 ++--
2 files changed, 11 insertions(+), 3 deletions(-
-F means "no regex", not "case sensitive" so it should not override -i
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/grep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 8c516a9..46c5ba1 100644
--- a/builtin/grep.c
+++ b/builtin/grep.
v7 addresses two comments from Junio and Eric in v6 and adds an extra
patch, 12/12, which reuses "icase" variable and avoids recalculating
the same thing (which can't be done before v6). Interdiff
diff --git a/grep.c b/grep.c
index aed4fe0..cb058a5 100644
--- a/grep.c
+++ b/grep.c
@@ -432,22 +432,
Now that git_connect is more information about connectivity
progress after: ("pass transport verbosity down to git_connect")
we should ensure it remains so for future users who need to
to diagnose networking problems.
Signed-off-by: Eric Wong
---
Thanks for the feedback, v2 changes as suggested
44 matches
Mail list logo
