Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Miklos,
If you need to re-roll your 'mv/cherry-pick-s' branch, could you
please squash this into the relevant patch (commit 5ed75e2a3f,
"cherry-pick: don't forget -s on failure", 14-09-2017).
[noticed by sparse
ove errors, this may well
not be the culprit.
Just FYI.
ATB,
Ramsay Jones
On 17/11/17 19:49, Jeff Hostetler wrote:
>
>
> On 11/16/2017 2:57 PM, Ramsay Jones wrote:
>>
>>
>> On 16/11/17 18:12, Jeff Hostetler wrote:
>>> From: Jonathan Tan <jonathanta...@google.com>
>>>
>>> Introduce fetch-object, providin
(transport, TRANS_OPT_FROM_PROMISOR, "1");
> + transport_set_option(transport, TRANS_OPT_NO_HAVES, "1");
> + transport_fetch_refs(transport, ref);
> +}
> diff --git a/fetch-object.h b/fetch-object.h
> new file mode 100644
> index 000..f371300
> --- /dev/null
> +++ b/fetch-object.h
> @@ -0,0 +1,6 @@
> +#ifndef FETCH_OBJECT_H
> +#define FETCH_OBJECT_H
> +
> +extern void fetch_object(const char *remote_name, const unsigned char *sha1);
> +
> +#endif
ATB,
Ramsay Jones
han commit[.ch]?
Similar comments for other patches in the series which moves
code from builtin/commit.c to sequencer.[ch].
ATB,
Ramsay Jones
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Jeff,
If you need to re-roll your 'jh/fsck-promisors' branch, could you
please squash this into the relevant patch (commit 1a4b4ca4e9,
"introduce fetch-object: fetch one promisor object", 02-11-2017).
[This s
On 08/11/17 22:34, Ramsay Jones wrote:
>
>
> On 08/11/17 20:36, Stefan Beller wrote:
>> On Wed, Nov 8, 2017 at 12:28 PM, Ramsay Jones
>> <ram...@ramsayjones.plus.com> wrote:
>>
>>> t5300-pack-object.sh (Wstat: 256 Tests: 40
On 08/11/17 20:36, Stefan Beller wrote:
> On Wed, Nov 8, 2017 at 12:28 PM, Ramsay Jones
> <ram...@ramsayjones.plus.com> wrote:
>
>> t5300-pack-object.sh (Wstat: 256 Tests: 40
>> Failed: 2)
>
>> t5500-fetch-pack.sh
$
Looking at the first test failure in each file, the failures seems
to be related to the 'jh/partial-clone' branch.
Just FYI. Thanks.
ATB,
Ramsay Jones
else
Here, you want to check for the pairs "--term-{good,old}" and
"--term-{bad,new}", so maybe this instead:
+ if (one_of(argv[i], "--term-good", "--term-old", NULL))
+ printf("%s\n", terms->term_good);
+ else if (one_of(argv[i], "--term-bad", "--term-new", NULL))
+ printf("%s\n", terms->term_bad);
+ else
> + error(_("BUG: invalid argument %s for 'git bisect
> terms'.\n"
> + "Supported options are: "
> + "--term-good|--term-old and "
> + "--term-bad|--term-new."), argv[i]);
> + }
> +
> + return 0;
> +}
> +
ATB,
Ramsay Jones
t; + goto fail;
> +
> + goto finish;
> + }
> + if (!is_empty_or_missing_file(git_path_bisect_start())) {
> + error(_("You need to give me at least one %s and "
> + "%s revision. You can use \"git bisect %s\" "
> + "and \"git bisect %s\" for that.\n"),
> + voc[0], voc[1], voc[0], voc[1]);
... this is (arguably) easier to read:
+ vocab_bad, vocab_good, vocab_bad, vocab_good);
> + goto fail;
> + } else {
> + error(_("You need to start by \"git bisect start\". You "
> + "then need to give me at least one %s and %s "
> + "revision. You can use \"git bisect %s\" and "
> + "\"git bisect %s\" for that.\n"),
> + voc[1], voc[0], voc[1], voc[0]);
ditto
ATB,
Ramsay Jones
_bad,
> + terms->term_good);
> +
> + if (!has_term_file) {
> + if (one_of(cmd, "bad", "good", NULL)) {
> + free_terms(terms);
> + set_terms(terms, "bad", "good");
> + return write_terms(terms->term_bad, terms->term_good);
> + }
> + else if (one_of(cmd, "new", "old", NULL)) {
cuddle the else: '} else if (one_of()) {'
OR, simply remove the else.
ATB,
Ramsay Jones
parts of the code as
> well.
>
> Also introduce a function free_terms() to free the memory of `struct
> bisect_terms` and set_terms() to set the values of members in `struct
> bisect_terms`.
>
> Helped-by: Ramsay Jones <ram...@ramsayjones.plus.com>
> Mentored-by: Lar
+ if (!commit) {
> + if (strbuf_read_file(, git_path_bisect_start(), 0) < 1)
> + return !printf(_("We are not bisecting.\n"));
I've no idea what this is about! If printf encounters an error, then
this will be equivalent to !-1. If printf does not encounter an error,
then this will be ! (whatever that may be, given that
the string is marked for translation).
I would suggest that you don't want to do that. ;-)
ATB,
Ramsay Jones
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Jeff,
If you need to re-roll your 'jh/object-filtering' branch, could
you please squash this into the relevant commit (b87fd93d81,
"list-objects: filter objects in traverse_commit_list", 02-11-2017).
[This
splay which, naturally, puts focus on the
subject lines. ;-) ]
ATB,
Ramsay Jones
an
without problem this time. Hmm, I don't think I have time to chase
this down at the moment. I will keep your 'perl hypothesis' in mind
for next time, however.
Thanks.
ATB,
Ramsay Jones
On 11/10/17 23:15, Ramsay Jones wrote:
> Hi Adam,
>
> I had a test failure on the v2.15.0-rc1 build tonight.
> The test in question being t0021-conversion.sh #15
> ('required process filter should filter data'). I didn't
> have any test failures on v2.15.0-rc0, and I don'
by hand (well, in a shell loop) at
least 70 times tonight (after the test-suite run), without
any failures, so ... (unfortunately, I don't have a trash
directory to look at. :( )
I have just kicked off another full test-suite run.
Just a heads up! ;-)
ATB,
Ramsay Jones
On 03/10/17 04:51, Junio C Hamano wrote:
> Ramsay Jones <ram...@ramsayjones.plus.com> writes:
>
>> On 02/10/17 14:44, Pranit Bauva wrote:
>> [snip]
>>> ...
>> Yes, I also meant to tidy that up by removing some, now
>> redundant, initialisation la
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Derrick,
If you need to re-roll your 'ds/find-unique-abbrev-optim' branch,
could you please squash this into the relevant patch (commit 3792c78ba0,
"test-list-objects: list a subset of object ids", 01-10-2017
akAssignment: 100
And on cygwin, I have 'clang-format version 4.0.1
(tags/RELEASE_401/final)', which requires me to
comment out:
AlignEscapedNewlines: Left
PenaltyBreakAssignment: 100
So, I don't think I can play along! :(
[When playing with 3.8 on Linux, I noted that clang-format
seemed to ignore *all* settings in .clang-format, if it found
*any* config that it didn't know about! Not very friendly. :-P ]
ATB,
Ramsay Jones
it in your commit 682d0bff0. Although I would need to have
> a closer look at it. In original series, I did get a sigserv, and as
> you mention it in the commit that you have fixed it.
Yes, I also meant to tidy that up by removing some, now
redundant, initialisation later in that function.
Note, that wasn't the only bug! (I have probably forgotten
some of them, but look at 964f4e2b0, for example).
ATB,
Ramsay Jones
ve some unnecessary braces
c2b89c9b8 bisect--helper: add some vertical whitespace
8c883701c bisect--helper: fix up some coding style issues
$
Again IIRC, there are a couple of bug fixes in these commits ...
I have to go now, so I will leave it with you. ;-)
Hope that helps.
ATB,
Ramsay Jo
;
>
> + GIT_AUTHOR_DATE="2006-06-26 00:06:00 +" &&
> + GIT_COMMITTER_DATE="2006-06-26 00:06:00 +" &&
> + export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
> + git checkout -b mode initial &&
> + git update-index --chmod=+x file0 &&
would 'test_chmod +x file0 &&' work here?
ATB,
Ramsay Jones
{
> + if ! kill -0 "$(cat V.pid)"
> + then
> + echo >&2 "background fast-import terminated too early"
> + exit 1
> + fi
> +}
> +
... you need to set the PIPE prerequisite on all of your new tests.
> +test_expect_success 'V: checkpoint updates refs after reset' '
> + cat >input <<-\INPUT_END &&
> + reset refs/heads/V
> + from refs/heads/U
> +
> + checkpoint
> + progress checkpoint
> + INPUT_END
> +
> + background_import_until_checkpoint "" input &&
> + test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
> + background_import_still_running
> +'
[snip]
ATB,
Ramsay Jones
only two warnings!)
Hmm, I did consider splitting this patch up, so that this (and other
issues you mention below) could be called out separately, but well ... ;-)
>> Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
>> ---
>> builtin/pack-objects.c | 4 ++--
>>
On 22/09/17 17:11, Jeff King wrote:
> On Fri, Sep 22, 2017 at 05:05:03PM +0100, Ramsay Jones wrote:
>
>>> As an aside, I also see some uses of hexval() that don't appear to be
>>> quite as rigorous in checking for invalid characters. A few
>>> unconditionally
On 22/09/17 06:47, Jeff King wrote:
> On Thu, Sep 21, 2017 at 05:48:38PM +0100, Ramsay Jones wrote:
>
>> diff --git a/cache.h b/cache.h
>> index a916bc79e..a0e3e362c 100644
>> --- a/cache.h
>> +++ b/cache.h
>> @@ -1243,8 +1243,8 @@ static inline
On 22/09/17 06:29, Jeff King wrote:
> On Thu, Sep 21, 2017 at 05:47:36PM +0100, Ramsay Jones wrote:
>
>> diff --git a/commit-slab.h b/commit-slab.h
>> index 333d81e37..dcaab8ca0 100644
>> --- a/commit-slab.h
>> +++ b/commit-slab.h
>> @@ -78,7 +78,7 @@ stati
ferring to! ;-)
Yep, sorry, I don't know how I managed to add the extra space.
(I don't think I can blame vim - PEBKAC).
ATB,
Ramsay Jones
On 21/09/17 19:49, Torsten Bögershausen wrote:
> On 2017-09-21 18:46, Ramsay Jones wrote:
>>
>> Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
>> ---
>> git-compat-util.h | 6 --
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
&
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
builtin/pack-objects.c | 4 ++--
config.c | 2 +-
diff.c | 2 +-
line-log.c | 18 +-
line-log.h | 2 +-
revision.c | 2 +-
tree-
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
cache.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
index a916bc79e..a0e3e362c 100644
--- a/cache.h
+++ b/cache.h
@@ -1243,8 +1243,8 @@ static inline unsigned int hexval(unsigned
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
commit-slab.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/commit-slab.h b/commit-slab.h
index 333d81e37..dcaab8ca0 100644
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -78,7 +78,7 @@ static MAYBE_UNUSE
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
git-compat-util.h | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index 9bc15b036..cedad4d58 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -898,9 +
?
These patches reduce the error count quite a bit, without touching too many
files, but additional patches may have to be batched up and submitted over
several releases, viz:
$ grep warning out2 | cut -d: -f1 | sort | uniq | wc -l
264
$
Ramsay Jones (4):
git-compat-util.h: xsize_t() - avoid
prerequisite, performing the setup test, when the
PIPE preequisite is missing, is simply wasted effort. Use the skip-all
test facility to skip all tests when the PIPE prerequisite is missing.
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
t/t9010-svn-fe.s
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
t/test-lib.sh | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 32f9b2001..9b61f16f7 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1067,14 +1067,8 @@ test_i1
These patches were developed on top of 'pu', but should apply cleanly on top
of the 'rj/test-ulimit-on-windows' branch.
Ramsay Jones (2):
test-lib: use more compact expression in PIPE prerequisite
t9010-*.sh: skip all tests if the PIPE prereq is missing
t/t9010-svn-fe.sh | 55
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Brandon,
If you need to re-roll your 'bw/protocol-v1' branch, could you please
squash this into the relevant patch (commit 45954f179e, "protocol:
introduce protocol extention mechanisms", 13-09-2017).
This a
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Ben,
If you need to re-roll your 'bp/fsmonitor' branch, could you please
squash this into the relevant patch (commit c6b5a28941, "fsmonitor:
add a performance test", 15-09-2017).
Thanks!
ATB,
Ramsay Jones
t/
the cygwin
mailing list. (see commit 9443605b5d, "test-lib.sh - cygwin does
not have usable FIFOs", 04-07-2013) In fact, you can see that this
was disabled on cygwin before MinGW!
It is possible, of course, that fifos now work on cygwin. (I will
put it on my TODO list).
In any event, this is indeed a separate issue.
ATB,
Ramsay Jones
On 15/09/17 01:37, Jeff King wrote:
> On Thu, Sep 14, 2017 at 12:31:38AM +0100, Ramsay Jones wrote:
>
>> I just tried it again tonight; the current master branch has 3532
>> warnings when compiled with -Wextra, 1409 of which are -Wsign-compare
>> warnings. After applyin
e set correctly (to "not-have") on these systems.
>
> Reported-by: Ramsay Jones <ram...@ramsayjones.plus.com>
> Reported-by: Adam Dinwoodie <a...@dinwoodie.org>
> Reported-by: Johannes Schindelin <johannes.schinde...@gmx.de>
> Signed-off-by: Michael J Gruber
a check for cygwin and MinGW to the prerequisite expressions, using
a 'test_have_prereq !MINGW,!CYGWIN' clause, to guard against using ulimit.
This affects the prerequisite expressions for the ULIMIT_STACK_SIZE,
CMDLINE_LIMIT and ULIMIT_FILE_DESCRIPTORS prerequisites.
Signed-off-by: Ramsay Jones <
On 13/09/17 23:43, Ramsay Jones wrote:
>
>
> On 13/09/17 19:58, Jeff King wrote:
>> On Wed, Sep 13, 2017 at 11:24:31AM -0700, Jonathan Nieder wrote:
>>
>>> For what it's worth,
>>> Reviewed-by: Jonathan Nieder <jrnie...@gmail.com>
>>
>>
uld even consider applying it. Also, I only used
gcc and was anticipating having additional warnings on clang (but I
didn't get around to trying).
Maybe I should give it another go. :-D
ATB,
Ramsay Jones
a check for cygwin and MinGW to the prerequisite expressions, using
'uname -s', and return false instead of (indirectly) using 'ulimit'.
This affects the prerequisite expressions for the ULIMIT_STACK_SIZE,
CMDLINE_LIMIT and ULIMIT_FILE_DESCRIPTORS prerequisites.
Signed-off-by: Ramsay Jones <
On 11/09/17 11:31, Adam Dinwoodie wrote:
> On Sat, Sep 09, 2017 at 02:13:32PM +0100, Ramsay Jones wrote:
>> I ran the test-suite on the 'pu' branch last night (simply because
>> that was what I had built at the time!), which resulted in a PASS,
>> but t6120 was showing a
On 10/09/17 13:27, Michael J Gruber wrote:
> Ramsay Jones venit, vidit, dixit 09.09.2017 15:13:
[snip]
>> So, it looks like all ULIMIT_STACK_SIZE tests need to be disabled
>> on cygwin. I also wonder about the ULIMIT_FILE_DESCRIPTORS tests,
>> but haven't looked into it.
>
.
Unfortunately, I can't spend more time on git today, hence this
heads up! ;-)
ATB,
Ramsay Jones
-- >8 --
diff --git a/test.c b/test.c
new file mode 100644
index 000..bcbb805
--- /dev/null
+++ b/test.c
@@ -0,0 +1,21 @@
+#include
+#include
+#include
+
+void test(uint64_t co
On 27/08/17 16:47, Ramsay Jones wrote:
> On 27/08/17 12:33, Adam Dinwoodie wrote:
[snip]
>> Cygwin 2.8.3 hasn't been released yet,
>
> Heh, yes, I found that out myself this afternoon. ;-)
>
>> but I've just tested the latest
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Jeff,
If you need to re-roll your 'jk/leak-checkers' branch, could you
please squash this into the relevant patch (commit c57586d954,
"add UNLEAK annotation for reducing leak false positives", 05-09-2017).
On 27/08/17 12:33, Adam Dinwoodie wrote:
> On Sun, Aug 27, 2017 at 03:06:31AM +0100, Ramsay Jones wrote:
>> On 26/08/17 22:11, Adam Dinwoodie wrote:
>>> On Sat, Aug 26, 2017 at 11:53:37AM -0700, Jeff King wrote:
>>>> Interesting. I find it a little hard to be
On 26/08/17 22:11, Adam Dinwoodie wrote:
> On Sat, Aug 26, 2017 at 11:53:37AM -0700, Jeff King wrote:
>> On Sat, Aug 26, 2017 at 01:57:18AM +0100, Ramsay Jones wrote:
>>
>>>> diff --git a/run-command.c b/run-command.c
>>>> index 98621faca8..064ebd1995 100
a try ...
... oh, wow, that works! Ahem. (Hmm, so it's flushing stdin?!)
Also, t5526-fetch-submodules.sh still works as well (see commit
13af8cbd6a "start_command: flush buffers in the WIN32 code path
as well", 04-02-2011).
ATB,
Ramsay Jones
nce the '0' initializer for the 'ignore_env:1' bit-field is
interpreted as a NULL pointer (hence the warning), and the final field
(now with no initializer) receives a default '0'.
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Brian,
If you need to re-roll your 'bc/hash-algo' b
> rerere machinery. Perhaps config.c would be such a good neutral
> place, as it will allow git_parse_signed() to go back to static to
> the file.
You make git_parse_unsigned() external in this patch, in addition
to git_parse_signed(), but don't actually call it. Was t
(const unsigned char *, size_t, void *),
>void *cb_data)
> {
> off_t from = obj[0].idx.offset + obj[0].hdr_size;
> - off_t len = obj[1].idx.offset - from;
> + size_t len = obj[1].idx.offset - from;
off_t -> size_t.
ATB,
Ramsay Jones
s another
> story, which can be developped independent of the ulong->size_t conversion.
Oh, I absolutely agree.
> Thanks to Martin for working on this.
Indeed! Thanks Martin.
ATB,
Ramsay Jones
puts files of that
size into an SCM probably gets what they deserve. :-P ).
The two patches I commented on, however, changed the type of some
variables from off_t to size_t. In general, the patches did not
seem to make anything worse, but these type changes could potentially
do harm. Hence my comment. (I still haven't tried the patches on my
32-bit Linux system. I only boot it up about once a week, and I would
rather wait until the patches are in the 'pu' branch before testing).
ATB,
Ramsay Jones
On 13/08/17 19:30, Martin Koegler wrote:
> On Sat, Aug 12, 2017 at 02:47:25PM +0100, Ramsay Jones wrote:
>> On 32-bit Linux, off_t is 64-bit and size_t is 32-bit.
>
> --- t.c ---
> #include
> #include
>
> int main()
> {
> printf("
On 13/08/17 18:33, Junio C Hamano wrote:
> Ramsay Jones <ram...@ramsayjones.plus.com> writes:
>> Hmm, on reflection, it may be a bit too crude! :-D
>
> As you already saw in the output from this, I think this is a good
> illustration that shows why we want an inc
On 13/08/17 17:14, Ramsay Jones wrote:
>
>
> On 13/08/17 05:41, Jeff King wrote:
>> On Fri, Aug 11, 2017 at 09:39:11PM -0700, Junio C Hamano wrote:
>>
>>>> Yeah, I just dug in the archive. The script I ran way back when was
>>>> actua
NT
2 WARNING:UNNECESSARY_BREAK
56 WARNING:UNNECESSARY_ELSE
568 WARNING:UNSPECIFIED_INT
4 WARNING:USE_NEGATIVE_ERRNO
26 WARNING:VOLATILE
$
Hmm, on reflection, it may be a bit too crude! :-D
ATB,
Ramsay Jones
(const unsigned char *, size_t, void *),
>void *cb_data)
> {
> off_t from = obj[0].idx.offset + obj[0].hdr_size;
> - off_t len = obj[1].idx.offset - from;
> + size_t len = obj[1].idx.offset - from;
Similar comment to previous patch.
ATB,
Ramsay Jones
off_t is 64-bit and size_t is 32-bit.
Later in this function, datalen is set the the difference of
two (revidx) off_t offsets. I haven't applied and tried this
on my 32-bit Linux install yet (that installation only gets
booted about once a week), but I suspect a 'possible data-loss'
warning.
For other reasons, I don't think it is not possible for
a 32-bit system to create a packfile with an individual object
of size > 4GB anyway, so this may not be a problem in practice.
(a 32-bit system should be able to read such a packfile, presumably
created on a 64-bit system, and refuse to load such an object, of
course).
ATB,
Ramsay Jones
On 11/08/17 00:10, Jeff King wrote:
> On Fri, Aug 11, 2017 at 12:02:49AM +0100, Ramsay Jones wrote:
>
>>> But some of those things are not 1:1 mappings with normalization. For
>>> instance, --json presumably implies --only-trailers. Or are we proposing
>>>
mappings with normalization. For
> instance, --json presumably implies --only-trailers. Or are we proposing
> to break the whole commit message down into components and output it all
> as json?
Hmm, to me the operation wasn't so much a normalization, rather
it was an --unfold (or maybe --un-fold ;-D). I suppose going in
the other direction could be --fold=72, or some such.
[blue is my favourite colour ... :-P ]
ATB,
Ramsay Jones
In addition to adding the missing newline, add the x-ecutable bit
'mode change' character to the error message. This message now has
the same form as similar messages output by 'update-index'.
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Junio,
This is v2 of the e
On 08/08/17 22:45, René Scharfe wrote:
> Am 08.08.2017 um 23:36 schrieb Ramsay Jones:
>>
>> Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
>> ---
>>
>> Hi Junio,
>>
>> I noticed this while looking into the t3700 failure on
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Junio,
I noticed this while looking into the t3700 failure on cygwin tonight.
Also, I couldn't decide whether or not to add the i18n '_()' brackets
around the message. In the end I didn't, but will happily add them
if you t
On 08/08/17 20:32, Ramsay Jones wrote:
>
>
> On 08/08/17 20:21, René Scharfe wrote:
>> 76e368c378 (t3700: fix broken test under !SANITY) explains that the test
>> 'git add --chmod=[+-]x changes index with already added file' can fail
>> if xfoo3 is still present a
f SANITY that is the problem. The test would fail on Linux
as well, if it skipped the prior tests marked with SANITY (they get
rid of the xfoo3->xfoo2 symlinks, among others).
Ack, this fixes it for me.
ATB,
Ramsay Jones
>
> Helped-by: Adam Dinwoodie <a...@dinwoodie.org>
> Signed-off-
On 03/08/17 22:07, Junio C Hamano wrote:
> Sahil Dua <sahildua2...@gmail.com> writes:
>
>> Ah! I had skipped this reply from Ramsay earlier.
>>
>> On Tue, Aug 1, 2017 at 1:36 AM, Ramsay Jones
>> ...
>>>> I personally do not think &quo
to backup" branch. :-D
I didn't want you to think that the lack of comments on this was
because everybody agreed that it was a good idea.
ATB,
Ramsay Jones
Hi Junio,
I just noticed a typo in the subject line for this patch. It should
read '... ECONNRESET as _an_ EOF' not '... ECONNRESET as _on_ EOF'.
[complete patch snipped!]
Thanks!
ATB,
Ramsay Jones
On 27/07/17 15:17, Jeff King wrote:
> On Thu, Jul 27, 2017 at 02:08:40AM +0100, Ramsay Jones wrote:
>
>> In order to suppress the fatal exit in this case, check the read error
>> for an ECONNRESET and return as if no data was read from the daemon.
>> This effectivel
se, at least when not passing --debug to the
daemon, and the read following the "exit" gets an error with errno set
to ECONNRESET.
In order to suppress the fatal exit in this case, check the read error
for an ECONNRESET and return as if no data was read from the daemon.
This effectively converts
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Junio,
My 'make test' run for the v2.14.0-rc0 on cygwin turned up a new
test failure (over and above the v2.13.0 failures), namely t1308.23.
Running the test in the debugger showed that cygwin was fopen-ing
the 'a-dir
if (postimage->line && postimage->nr)
+ memcpy(img->line + applied_pos,
+ postimage->line,
+ postimage->nr * sizeof(*img->line));
... which I think I prefer (slightly).
ATB,
Ramsay Jones
> if (!state->allow_overlap)
> for (i = 0; i < postimage->nr; i++)
> img->line[applied_pos + i].flag |= LINE_PATCHED;
>
; 0)
My patch looked like:
- if (!prefix)
+ if (!prefix || !istate->cache || istate->cache_nr == 0)
... which is probably a bit 'belt-n-braces'. ;-)
ATB,
Ramsay Jones
lt;< 24) | \
> + ((uint32_t)*((unsigned char *)(p) + 1) << 16) | \
> + ((uint32_t)*((unsigned char *)(p) + 2) << 8) | \
> + ((uint32_t)*((unsigned char *)(p) + 3) << 0) )
> #define put_be32(p, v) do { \
> unsigned int __v = (v); \
> *((unsigned char *)(p) + 0) = __v >> 24; \
>
Heh, I have a patch that is pretty much identical. I suspect
you can guess why. ;-)
ATB,
Ramsay Jones
3baddc636 100644
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -118,6 +118,10 @@
#define SHA1DC_ALLOW_UNALIGNED_ACCESS
#endif /*UNALIGNMENT DETECTION*/
+#if defined(SHA1DC_ALLOW_UNALIGNED_ACCESS) &&
defined(SHA1DC_FORCE_ALIGNED_ACCESS)
+#undef SHA1DC_ALLOW_UNALIGNED_ACCESS
+#endif
+
#define rotate_right(x,n) (((x)>>(n))|((x)<<(32-(n
#define rotate_left(x,n) (((x)<<(n))|((x)>>(32-(n
Hmm, hopefully that is not whitespace damaged.
ATB,
Ramsay Jones
quot; without any arguments. In that case manually
> add a new line after the first line to ensure it's consistent
> with the output of "-s" option.
>
Again, s/signature/sign-off/g, or similar (including subject line).
ATB,
Ramsay Jones
> Signed-off-by: Kaartic Sivaraam
any sense. ;-) The missing information being that 'another'
was the name of the string variable that we were potentially
'running over the end of'.
ATB,
Ramsay Jones
>
> Signed-off-by: Rene Scharfe <l@web.de>
> ---
> apply.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Jeff,
When you re-roll your 'jk/reflog-walk' branch, could you please squash
this into the relevant patch (commit beafb2c629, "reflog-walk: stop using
fake parents", 05-07-2017).
Thanks!
ATB,
Ramsay Jones
r
e commit message,
including the subject, should be 'sign-off' (or Signed-off-by)
instead. Yes?
(when I hear 'signature', I think GPG signature).
ATB,
Ramsay Jones
the same tip commit, we only map back
> to one of them.
>
> Instead, we should show each reflog individually, in
> the order the user gave us on the command line.
>
> 2. If the tip of the reflog and the ref tip disagree on
^^
It seems hard to get off the second point! ;-)
ATB,
Ramsay Jones
>
> Good thinking, especially on the renaming.
Err, except for the commit message! :-D
Both the commit message subject and the commit message body
refer to _move_bits() rather than _mode_bits() etc.
(So, three instances of s/move/mode/).
ATB,
Ramsay Jones
upport for copying branch sections in the config file.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com>
> Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
Adding my SOB isn't really appropriate here - I only made a very
very minor contribution. At _most_ you mi
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Sahil,
If you need to re-roll your 'sd/branch-copy' branch, could you please
squash this into the relevant patch (commit 37af9c71b6, "config: create
a function to format section headers", 13-06-2017).
Also, I n
t7610-mergetool.sh
4 211.230s t6030-bisect-porcelain.sh
...
175 10.389s t4300-merge-tree.sh
176 10.324s t4213-log-tabexpand.sh
177 10.143s t3034-merge-recursive-rename-options.sh
178 10.108s t1410-reflog.sh
$
[On linux a complete run is about 400s and on cygwin about 3hours!]
ATB,
Ramsay Jones
On 06/06/17 00:20, Ramsay Jones wrote:
>
>
> On 05/06/17 22:05, Ævar Arnfjörð Bjarmason wrote:
>> On Mon, Jun 5, 2017 at 10:34 PM, Adam Dinwoodie <a...@dinwoodie.org> wrote:
>>> I'm trying to compile Git v2.13.1 to release for Cygwin, but it appears
>>>
t; In sha1dc/sha1.c and see if that helps, alternatively comment out the
> ifdefs guarded by "#ifdef _MSC_VER" calls in sha1dc/sha1.c
This can't possibly make a difference! ;-)
However, rebuilding with:
$ make OPENSSL_SHA1=YesPlease >out2 2>&1
... make t-basic.sh pass just fine, so ...
ATB,
Ramsay Jones
On 03/06/17 15:07, Ramsay Jones wrote:
[snip]
>> diff --git a/Documentation/git-submodule.txt
>> b/Documentation/git-submodule.txt
>> index 74bc6200d5..52e3ef1325 100644
>> --- a/Documentation/git-submodule.txt
>> +++ b/Documentation/git-submodule.txt
>> @
submodule.
>
> * The variable '$displaypath' was accessible but undocumented.
> Rename it '$displaypath' to '$dpath'. Document what it contains.
> Users that are broken by the behavior change of 'sm_path' introduced
> in this commit, can switch from '$path' to '$dpat
Signed-off-by: Ramsay Jones <ram...@ramsayjones.plus.com>
---
Hi Stefan,
If you need to re-roll your 'sb/submodule-blanket-recursive' branch,
could you please squash this into the relevant patch (commit 0e5bca302a
"Introduce 'submodule.recurse' option for worktree manipulators&q
On 31/05/17 01:13, Ramsay Jones wrote:
> On 31/05/17 00:29, Stefan Beller wrote:
>
>> In that test sm_path contains the relative path from $PWD to the
>> submodule. (It does NOT: "$[sm_]path is the name of the submodule
>> directory relative to the superproj
201 - 300 of 940 matches
Mail list logo
