Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
Jeff King writes: > On Mon, Jun 11, 2018 at 03:08:42PM -0700, Junio C Hamano wrote: > >> Jeff King writes: >> >> > On Mon, Jun 04, 2018 at 10:57:30PM +0900, Junio C Hamano 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'. >> > >> > This second patch fixes a regression in v2.18.0-rc1 and in v2.17.1. I >> > don't know if we'd want to consider it for v2.18 or not (it should be >> > able to be applied independently from the first). >> >> I gave the topic -maint suffix, but I'd need a little fix-up patch >> on top to actually make it mergeable to the maintenance track. With >> that, let's merge it to 'master' before v2.18 final happens and then >> also to 'maint'. > > Thanks, your fixup looks good. > > -Peff Thanks; I just noticed that an identical fixup was sent by you about a week ago ;-)
Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
On Mon, Jun 11, 2018 at 03:08:42PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > On Mon, Jun 04, 2018 at 10:57:30PM +0900, Junio C Hamano 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'. > > > > This second patch fixes a regression in v2.18.0-rc1 and in v2.17.1. I > > don't know if we'd want to consider it for v2.18 or not (it should be > > able to be applied independently from the first). > > I gave the topic -maint suffix, but I'd need a little fix-up patch > on top to actually make it mergeable to the maintenance track. With > that, let's merge it to 'master' before v2.18 final happens and then > also to 'maint'. Thanks, your fixup looks good. -Peff
Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
Jeff King writes:
> On Mon, Jun 04, 2018 at 10:57:30PM +0900, Junio C Hamano 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'.
>
> This second patch fixes a regression in v2.18.0-rc1 and in v2.17.1. I
> don't know if we'd want to consider it for v2.18 or not (it should be
> able to be applied independently from the first).
I gave the topic -maint suffix, but I'd need a little fix-up patch
on top to actually make it mergeable to the maintenance track. With
that, let's merge it to 'master' before v2.18 final happens and then
also to 'maint'.
builtin/index-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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) {
Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
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
Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
On 4 June 2018 at 14:57, Junio C Hamano wrote: > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration branches, but I am still holding onto them. > > Generally I try to avoid sending issues of "What's cooking" report > in close succession, but as I plan to go offline for most of the > remainder of the week, here is how the tree looks like as of > tonight, just after tagging 2.18-rc1. Hopefully we'll have another > rc next week and then the real thing a week after that. > > You can find the changes described here in the integration branches > of the repositories listed at > > http://git-blame.blogspot.com/p/git-public-repositories.html > > > * rm/p4-submit-with-commit-option (2018-05-21) 1 commit > - git-p4: add options --commit and --disable-rebase > > Needs sign-off. I think the signed-off version was sent in just last week: http://lists-archives.com/git/925692-git-p4-add-options-commit-and-disable-rebase.html Thanks, Luke
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
Re: What's cooking in git.git (Jun 2018, #02; Mon, 4)
On Mon, Jun 04, 2018 at 10:57:30PM +0900, Junio C Hamano 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'. This second patch fixes a regression in v2.18.0-rc1 and in v2.17.1. I don't know if we'd want to consider it for v2.18 or not (it should be able to be applied independently from the first). > * jk/branch-l-0-deprecation (2018-05-25) 5 commits > (merged to 'next' on 2018-05-30 at a94574dfd5) > + branch: customize "-l" warning in list mode > + branch: issue "-l" deprecation warning after pager starts > (merged to 'next' on 2018-04-11 at 9b2b0305dd) > + branch: deprecate "-l" option > + t: switch "branch -l" to "branch --create-reflog" > + t3200: unset core.logallrefupdates when testing reflog creation > (this branch is used by jk/branch-l-1-removal and > jk/branch-l-2-reincarnation.) > > The "-l" option in "git branch -l" is an unfortunate short-hand for > "--create-reflog", but many users, both old and new, somehow expect > it to be something else, perhaps "--list". This step deprecates > the short-hand and warns about the future removal of the it when it > is used. > > Will cook in 'next'. > Perhaps merge to 'master' immediately after 2.18 release? FWIW, I plan to re-roll this according to the discussion (with the intent that this would just get ejected when 'next' is rewound). But there is no rush, since that is all post-release. So you can see if I get around to it or not by then. ;) -Peff
