From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
git@vger.kernel.org, "Jeff King" <peff@peff.net>
Subject: Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
Date: Mon, 4 Jun 2018 16:18:17 +0200 [thread overview]
Message-ID: <20180604141817.22916-1-szeder.dev@gmail.com> (raw)
In-Reply-To: <xmqqr2lm4pth.fsf@gitster-ct.c.googlers.com>
> * jk/index-pack-maint (2018-06-01) 2 commits
> (merged to 'next' on 2018-06-04 at c553a485e8)
> + index-pack: handle --strict checks of non-repo packs
> + prepare_commit_graft: treat non-repository as a noop
>
> "index-pack --strict" has been taught to make sure that it runs the
> final object integrity checks after making the freshly indexed
> packfile available to itself.
>
> Will cook in 'next'.
These patches can't be applied directly on top of v2.17.1, or there
was a wrong merge conflict resolution, or I don't know. Anyway,
building 368b4e5906 (index-pack: handle --strict checks of non-repo
packs, 2018-05-31) results in:
CC builtin/index-pack.o
builtin/index-pack.c: In function ‘final’:
builtin/index-pack.c:1487:23: warning: passing argument 1 of
‘install_packed_git’ from incompatible pointer type
[-Wincompatible-pointer-types]
install_packed_git(the_repository, p);
^
In file included from builtin/index-pack.c:15:0:
./packfile.h:39:13: note: expected ‘struct packed_git *’ but argument
is of type ‘struct repository *’
extern void install_packed_git(struct packed_git *pack);
^
builtin/index-pack.c:1487:4: error: too many arguments to function
‘install_packed_git’
install_packed_git(the_repository, p);
^
In file included from builtin/index-pack.c:15:0:
./packfile.h:39:13: note: declared here
extern void install_packed_git(struct packed_git *pack);
^
Makefile:2121: recipe for target 'builtin/index-pack.o' failed
make: *** [builtin/index-pack.o] Error 1
next prev parent reply other threads:[~2018-06-04 14:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-04 13:57 What's cooking in git.git (Jun 2018, #02; Mon, 4) Junio C Hamano
2018-06-04 14:12 ` Jeff King
2018-06-11 22:08 ` Junio C Hamano
2018-06-11 22:30 ` Jeff King
2018-06-11 22:35 ` Junio C Hamano
2018-06-04 14:18 ` SZEDER Gábor [this message]
2018-06-04 14:50 ` Jeff King
2018-06-04 14:26 ` Luke Diamand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180604141817.22916-1-szeder.dev@gmail.com \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.