From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johan Herland Subject: [PATCHv6 17/23] git notes merge: List conflicting notes in notes merge commit message Date: Tue, 09 Nov 2010 22:49:53 +0100 Message-ID: <1289339399-4733-18-git-send-email-johan@herland.net> References: <1289339399-4733-1-git-send-email-johan@herland.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: johan@herland.net, jrnieder@gmail.com, bebarino@gmail.com, avarab@gmail.com, gitster@pobox.com, srabbelier@gmail.com To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Nov 09 22:51:37 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PFw6G-0000yR-M8 for gcvg-git-2@lo.gmane.org; Tue, 09 Nov 2010 22:51:33 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755339Ab0KIVvT convert rfc822-to-quoted-printable (ORCPT ); Tue, 9 Nov 2010 16:51:19 -0500 Received: from smtp.getmail.no ([84.208.15.66]:61230 "EHLO smtp.getmail.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755413Ab0KIVu3 (ORCPT ); Tue, 9 Nov 2010 16:50:29 -0500 Received: from get-mta-scan01.get.basefarm.net ([10.5.16.4]) by get-mta-out02.get.basefarm.net (Sun Java(tm) System Messaging Server 7.0-0.04 64bit (built Jun 20 2008)) with ESMTP id <0LBN005XL0NOCV30@get-mta-out02.get.basefarm.net> for git@vger.kernel.org; Tue, 09 Nov 2010 22:50:18 +0100 (MET) Received: from get-mta-scan01.get.basefarm.net (localhost.localdomain [127.0.0.1]) by localhost (Email Security Appliance) with SMTP id CAAD11798F7F_CD9C219B for ; Tue, 09 Nov 2010 21:50:17 +0000 (GMT) Received: from smtp.getmail.no (unknown [10.5.16.4]) by get-mta-scan01.get.basefarm.net (Sophos Email Appliance) with ESMTP id 4AA141796F70_CD9C219F for ; Tue, 09 Nov 2010 21:50:16 +0000 (GMT) Received: from alpha.herland ([84.215.68.234]) by get-mta-in01.get.basefarm.net (Sun Java(tm) System Messaging Server 7.0-0.04 64bit (built Jun 20 2008)) with ESMTP id <0LBN00HVN0NLS730@get-mta-in01.get.basefarm.net> for git@vger.kernel.org; Tue, 09 Nov 2010 22:50:14 +0100 (MET) X-Mailer: git-send-email 1.7.3.2.173.gab1c9.dirty In-reply-to: <1289339399-4733-1-git-send-email-johan@herland.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This brings notes merge in line with regular merge's behaviour. This patch has been improved by the following contributions: - =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason: Don't use C99 comments. Thanks-to: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason Signed-off-by: Johan Herland --- builtin/notes.c | 2 +- notes-merge.c | 11 ++++++++++- notes-merge.h | 2 +- t/t3310-notes-merge-manual-resolve.sh | 12 ++++++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index db60ead..b440378 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -902,7 +902,7 @@ static int merge(int argc, const char **argv, const= char *prefix) =20 strbuf_addf(&msg, "notes: Merged notes from %s into %s", remote_ref.buf, default_notes_ref()); - o.commit_msg =3D msg.buf + 7; // skip "notes: " prefix + strbuf_add(&(o.commit_msg), msg.buf + 7, msg.len - 7); /* skip "notes= : " */ =20 result =3D notes_merge(&o, t, result_sha1); =20 diff --git a/notes-merge.c b/notes-merge.c index 511630f..f7759f7 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -8,6 +8,7 @@ #include "dir.h" #include "notes.h" #include "notes-merge.h" +#include "strbuf.h" =20 struct notes_merge_pair { unsigned char obj[20], base[20], local[20], remote[20]; @@ -16,6 +17,7 @@ struct notes_merge_pair { void init_notes_merge_options(struct notes_merge_options *o) { memset(o, 0, sizeof(struct notes_merge_options)); + strbuf_init(&(o->commit_msg), 0); o->verbosity =3D NOTES_MERGE_VERBOSITY_DEFAULT; } =20 @@ -384,6 +386,12 @@ static int merge_one_change_manual(struct notes_me= rge_options *o, sha1_to_hex(p->obj), sha1_to_hex(p->base), sha1_to_hex(p->local), sha1_to_hex(p->remote)); =20 + /* add "Conflicts:" section to commit message first time through */ + if (!o->has_worktree) + strbuf_addstr(&(o->commit_msg), "\n\nConflicts:\n"); + + strbuf_addf(&(o->commit_msg), "\t%s\n", sha1_to_hex(p->obj)); + OUTPUT(o, 2, "Auto-merging notes for %s", sha1_to_hex(p->obj)); check_notes_merge_worktree(o); if (is_null_sha1(p->local)) { @@ -639,12 +647,13 @@ int notes_merge(struct notes_merge_options *o, struct commit_list *parents =3D NULL; commit_list_insert(remote, &parents); /* LIFO order */ commit_list_insert(local, &parents); - create_notes_commit(local_tree, parents, o->commit_msg, + create_notes_commit(local_tree, parents, o->commit_msg.buf, result_sha1); } =20 found_result: free_commit_list(bases); + strbuf_release(&(o->commit_msg)); trace_printf("notes_merge(): result =3D %i, result_sha1 =3D %.7s\n", result, sha1_to_hex(result_sha1)); return result; diff --git a/notes-merge.h b/notes-merge.h index aa75693..195222f 100644 --- a/notes-merge.h +++ b/notes-merge.h @@ -11,7 +11,7 @@ enum notes_merge_verbosity { struct notes_merge_options { const char *local_ref; const char *remote_ref; - const char *commit_msg; + struct strbuf commit_msg; int verbosity; enum { NOTES_MERGE_RESOLVE_MANUAL =3D 0, diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merg= e-manual-resolve.sh index 0ec315a..287fab8 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -333,6 +333,12 @@ EOF git log -1 --format=3D%B refs/notes/m > merge_commit_msg && grep -q refs/notes/m merge_commit_msg && grep -q refs/notes/z merge_commit_msg && + # Merge commit mentions conflicting notes + grep -q "Conflicts" merge_commit_msg && + ( for sha1 in $(cat expect_conflicts); do + grep -q "$sha1" merge_commit_msg || + exit 1 + done ) && # Verify contents of merge result verify_notes m && # Verify that other notes refs has not changed (w, x, y and z) @@ -456,6 +462,12 @@ EOF git log -1 --format=3D%B refs/notes/m > merge_commit_msg && grep -q refs/notes/m merge_commit_msg && grep -q refs/notes/z merge_commit_msg && + # Merge commit mentions conflicting notes + grep -q "Conflicts" merge_commit_msg && + ( for sha1 in $(cat expect_conflicts); do + grep -q "$sha1" merge_commit_msg || + exit 1 + done ) && # Verify contents of merge result verify_notes m && # Verify that other notes refs has not changed (w, x, y and z) --=20 1.7.3.2.173.gab1c9.dirty