From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Turner Subject: [PATCH v3 2/2] notes: handle multiple worktrees Date: Fri, 31 Jul 2015 15:01:37 -0400 Message-ID: <1438369297-4838-2-git-send-email-dturner@twopensource.com> References: <1438369297-4838-1-git-send-email-dturner@twopensource.com> Cc: David Turner To: git@vger.kernel.org, sunshine@sunshineco.com X-From: git-owner@vger.kernel.org Fri Jul 31 21:02:01 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZLFZ8-00021T-CF for gcvg-git-2@plane.gmane.org; Fri, 31 Jul 2015 21:01:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751288AbbGaTBy (ORCPT ); Fri, 31 Jul 2015 15:01:54 -0400 Received: from mail-qg0-f41.google.com ([209.85.192.41]:33111 "EHLO mail-qg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbbGaTBx (ORCPT ); Fri, 31 Jul 2015 15:01:53 -0400 Received: by qged69 with SMTP id d69so52271816qge.0 for ; Fri, 31 Jul 2015 12:01:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iFQIxlhqpXOGsTamrfWLN5DofdCj32c/BjioqcNrIVA=; b=OMO2s/+LZoGq+KzYOt4b4Xy6QMI90OeQ61myujMFnc4bx2WcW06OE8/EWF9I9zRCoI tebbWBesaGVGVYtiiZeCzYo47XCmDnDenQyhI9N54g2W02m51kpA1DxWOeqStaCFqw6n 1hC1IweUXEEaweb6qe5QQ1IhLoSE64jBn6TnLAW2VDjkxvmvnz+Li/N+/Co5HBlA2R/j Y1byuCjxq8itnyVj3LZspIyKnMQFI6Xl8LCtdV/8h5v0f1ZKFtgF61GU3aEH+naovsib qYmzWBEmiKKnqPz9Oj+qG2u0oZEskAtamxvfDltHSF0FC5ZPKXe86vijU+qu1Pu42jiu HdRg== X-Gm-Message-State: ALoCoQk/AjXt8f0tTTLDdhzDHwYD9ld85XKFwljRT4eQr1mWfH8s89OJiC3sPIsjJK2U1kay0jY7 X-Received: by 10.140.84.163 with SMTP id l32mr6927991qgd.94.1438369312561; Fri, 31 Jul 2015 12:01:52 -0700 (PDT) Received: from ubuntu.jfk4.office.twttr.net ([192.133.79.147]) by smtp.gmail.com with ESMTPSA id a1sm2657952qgf.33.2015.07.31.12.01.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Jul 2015 12:01:51 -0700 (PDT) X-Mailer: git-send-email 2.0.4.315.gad8727a-twtrsrc In-Reply-To: <1438369297-4838-1-git-send-email-dturner@twopensource.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using die_if_shared_symref. This prevents simultaneous merges to the same notes branch from different worktrees. Signed-off-by: David Turner --- builtin/notes.c | 2 ++ t/t3320-notes-merge-worktrees.sh | 71 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100755 t/t3320-notes-merge-worktrees.sh diff --git a/builtin/notes.c b/builtin/notes.c index 63f95fc..78a264e 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -19,6 +19,7 @@ #include "string-list.h" #include "notes-merge.h" #include "notes-utils.h" +#include "branch.h" static const char * const git_notes_usage[] = { N_("git notes [--ref ] [list []]"), @@ -829,6 +830,7 @@ static int merge(int argc, const char **argv, const char *prefix) update_ref(msg.buf, "NOTES_MERGE_PARTIAL", result_sha1, NULL, 0, UPDATE_REFS_DIE_ON_ERR); /* Store ref-to-be-updated into .git/NOTES_MERGE_REF */ + die_if_shared_symref("NOTES_MERGE_REF", default_notes_ref()); if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL)) die("Failed to store link to current notes ref (%s)", default_notes_ref()); diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh new file mode 100755 index 0000000..b102c23 --- /dev/null +++ b/t/t3320-notes-merge-worktrees.sh @@ -0,0 +1,71 @@ +#!/bin/sh +# +# Copyright (c) 2015 Twitter, Inc +# + +test_description='Test merging of notes trees in multiple worktrees' + +. ./test-lib.sh + +test_expect_success 'setup commit' ' + test_commit tantrum +' + +commit_tantrum=$(git rev-parse tantrum^{commit}) + +test_expect_success 'setup notes ref (x)' ' + git config core.notesRef refs/notes/x && + git notes add -m "x notes on tantrum" tantrum +' + +test_expect_success 'setup local branch (y)' ' + git update-ref refs/notes/y refs/notes/x && + git config core.notesRef refs/notes/y && + git notes remove tantrum +' + +test_expect_success 'setup remote branch (z)' ' + git update-ref refs/notes/z refs/notes/x && + git config core.notesRef refs/notes/z && + git notes add -f -m "conflicting notes on tantrum" tantrum +' + +test_expect_success 'modify notes ref ourselves (x)' ' + git config core.notesRef refs/notes/x && + git notes add -f -m "more conflicting notes on tantrum" tantrum +' + +test_expect_success 'create some new worktrees' ' + git worktree add -b newbranch worktree master && + git worktree add -b newbranch2 worktree2 master +' + +test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' ' + git config core.notesRef refs/notes/y && + test_must_fail git notes merge z && + echo "ref: refs/notes/y" > expect && + test_cmp .git/NOTES_MERGE_REF expect +' + +test_expect_success 'merge z into y while mid-merge in another workdir fails' ' + ( + cd worktree && + git config core.notesRef refs/notes/y && + test_must_fail git notes merge z 2>err && + grep "is already checked out" err + ) && + test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF +' + +test_expect_success 'merge z into x while mid-merge on y succeeds' ' + ( + cd worktree2 && + git config core.notesRef refs/notes/x && + test_must_fail git notes merge z 2>&1 >out && + grep -v "is already checked out" out + ) && + echo "ref: refs/notes/x" > expect && + test_cmp .git/worktrees/worktree2/NOTES_MERGE_REF expect +' + +test_done -- 2.0.4.315.gad8727a-twtrsrc