| Message ID | 9d6c51b2118b24cd94f3e2951ff0e9ee82afbd98.1555911520.git.liu.denton@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | cache.h: fix mismerge of 'dl/no-extern-in-func-decl' | expand |
Denton Liu <liu.denton@gmail.com> writes: > After merging 'dl/no-extern-in-func-decl' into 'pu', it seems like the > conflict resolution mostly went well except for one spot, which this > patch should fix. I do not think this is a mismerge per-se. That line is not touched since this February at 7589e636 ("Merge branch 'nd/the-index-final'", 2019-02-06). It is just that large scale churning on a common and busy file like cache.h is bound to cause painful conflicts with other topics, both textual and non-textual. As these "extern" in *.h that explicitly marks that they are merely decls and not defunitions do not hurt anybody, I think it is better to leave it to a cleanup pass at the end of the tunnel after things gradulate to 'master' and start to calm down. Thanks.
Junio C Hamano <gitster@pobox.com> writes: > Denton Liu <liu.denton@gmail.com> writes: > >> After merging 'dl/no-extern-in-func-decl' into 'pu', it seems like the >> conflict resolution mostly went well except for one spot, which this >> patch should fix. > > I do not think this is a mismerge per-se. I looked at the merge again, and I agree that it was a simple mismerge. THe function was already there in the common ancestor, and was not changed on the mainline until the "remove extern" topic was merged, so the result should have been a clean 3-way "the mainline did not touch and kept extern, the side branch removed the extern, so the result is to remove it" merge. It was just the change was dwarfed by nearby noise conflicting the "remove extern" which pretty much touches the entire file, with different topics touching different part of the same file. The merge (and more importantly, the rerere database) has been fixed up. Thanks for helping.
diff --git a/cache.h b/cache.h index 5f8607d4f4..bb53660f45 100644 --- a/cache.h +++ b/cache.h @@ -1393,7 +1393,7 @@ int repo_get_oid_mb(struct repository *r, const char *str, struct object_id *oid void maybe_die_on_misspelt_object_name(struct repository *repo, const char *name, const char *prefix); -extern enum get_oid_result get_oid_with_context(struct repository *repo, const char *str, +enum get_oid_result get_oid_with_context(struct repository *repo, const char *str, unsigned flags, struct object_id *oid, struct object_context *oc);
After merging 'dl/no-extern-in-func-decl' into 'pu', it seems like the conflict resolution mostly went well except for one spot, which this patch should fix. Although this is only currently only a problem in 'pu', we should fix the entry rerere cache for if this branch ends up merged in 'next' in the future. Signed-off-by: Denton Liu <liu.denton@gmail.com> --- I guess while we're at it, I noticed that these commits are all missing signoffs from you. We should probably attach those while we're fixing this up. Thanks, Denton cache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)