Web lists-archives.com

Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)




> * 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