Re: [PATCH 0/6] Miscellaneous merge fixes

[Elijah Newren]

Hi,

On Tue, Apr 12, 2016 at 6:23 PM, Junio C Hamano  wrote:
> Elijah Newren  writes:
>
>> Elijah Newren (6):
>>   Remove duplicate code
>>   Avoid checking working copy when creating a virtual merge base
>>   Add merge testcases for when index doesn't match HEAD
>>   merge-octopus: Abort if index does not match HEAD
>>   Add a testcase demonstrating a bug with trivial merges
>>   builtin/merge.c: Fix a bug with trivial merges
>
> Please be careful when giving titles to your patches.  They will be
> shown in a context that is much wider than the area your attention
> is currently concentrated on.  E.g. does "Remove duplicate code"
> tell readers of "git shortlog --no-merges v2.8.0..v2.9.0" what the
> change was about when it eventually appears in the upcoming release?

I will try to do better on that.  For the patch you mention, how about:
   merge-recursive: Remove a few lines of duplicate code
?

I can resubmit the series correcting both that subject and the subject
of the second patch using your suggestion elsewhere in this thread.
The other four already provide some context on their area; am I
correct to assume those provide enough?

Elijah
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/6] Miscellaneous merge fixes

[Junio C Hamano]

Elijah Newren  writes:

> Elijah Newren (6):
>   Remove duplicate code
>   Avoid checking working copy when creating a virtual merge base
>   Add merge testcases for when index doesn't match HEAD
>   merge-octopus: Abort if index does not match HEAD
>   Add a testcase demonstrating a bug with trivial merges
>   builtin/merge.c: Fix a bug with trivial merges

Please be careful when giving titles to your patches.  They will be
shown in a context that is much wider than the area your attention
is currently concentrated on.  E.g. does "Remove duplicate code"
tell readers of "git shortlog --no-merges v2.8.0..v2.9.0" what the
change was about when it eventually appears in the upcoming release?

>
>  builtin/merge.c  |   8 ++
>  git-merge-octopus.sh |   6 ++
>  merge-recursive.c|   8 +-
>  t/t6044-merge-unrelated-index-changes.sh | 153 
> +++
>  t/t7605-merge-resolve.sh |   6 +-
>  5 files changed, 175 insertions(+), 6 deletions(-)
>  create mode 100755 t/t6044-merge-unrelated-index-changes.sh
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html