ZheNing Hu [off-list ref] writes:
Junio C Hamano [off-list ref] 于2021年7月1日周四 上午6:04写道：
quoted
"ZheNing Hu via GitGitGadget" [off-list ref] writes:
quoted
This patch series make cat-file reuse ref-filter logic.
Unfortunately this seems to interact with your own
zh/cat-file-batch-fix rather badly.
Well, it's because I didn't base this patch on it.
That should be easy to achieve.
It is preferrable for contributors try merging their individual
topics with the rest of 'seen' to see if there are potential
conflicts (either textual or semantic) before sending their topics
out. Not all topics need to build on top of other topics (in fact,
the fewer inter-dependencies they have, the better), but in this
case, I think it makes sense to build one on top of the other.
Hi, Junio,
Junio C Hamano [off-list ref] 于2021年7月1日周四 下午10:17写道：
ZheNing Hu [off-list ref] writes:
quoted
Junio C Hamano [off-list ref] 于2021年7月1日周四 上午6:04写道：
quoted
"ZheNing Hu via GitGitGadget" [off-list ref] writes:
quoted
This patch series make cat-file reuse ref-filter logic.
Unfortunately this seems to interact with your own
zh/cat-file-batch-fix rather badly.
Well, it's because I didn't base this patch on it.
That should be easy to achieve.
It is preferrable for contributors try merging their individual
topics with the rest of 'seen' to see if there are potential
conflicts (either textual or semantic) before sending their topics
out. Not all topics need to build on top of other topics (in fact,
the fewer inter-dependencies they have, the better), but in this
case, I think it makes sense to build one on top of the other.
I have a "rebase" trouble:
My new feature branch "cat-file-batch-refactor-rebase-version" should base on
zh/cat-file-batch-fix and zh/ref-filter-atom-type, so last time I choice
(bb9a3a8f77 Merge branch 'zh/cat-file-batch-fix' into jch) as the patch base.
But github only allow me base the patch on a branch, so I choice
"gitgitgadget:seen"
as my github PR base. It causes that some merge commit include in it. [1]
So In order to prevent these "merge" commits from being sent, the GGG mechanism
is modified to reject their merge commits.
Now I can't choice a good branch as my patch base... Have any ideas?
Thanks.
[1]: https://github.com/gitgitgadget/git/pull/989
--
ZheNing Hu