From: Jeff King <peff@peff.net>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
Date: Mon, 4 Jun 2018 10:50:47 -0400 [thread overview]
Message-ID: <20180604145046.GB27655@sigill.intra.peff.net> (raw)
In-Reply-To: <20180604141817.22916-1-szeder.dev@gmail.com>
On Mon, Jun 04, 2018 at 04:18:17PM +0200, SZEDER Gábor wrote:
>
> > * 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);
Oh, right, I did have to adapt for the "the_repository" bits added on
master.
The diff to apply it on maint is just:
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 7b399478dd..3030c88d38 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1484,7 +1484,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
struct packed_git *p;
p = add_packed_git(final_index_name, strlen(final_index_name), 0);
if (p)
- install_packed_git(the_repository, p);
+ install_packed_git(p);
}
if (!from_stdin) {
-Peff
next prev parent reply other threads:[~2018-06-04 14:50 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
2018-06-04 14:50 ` Jeff King [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180604145046.GB27655@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).