From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jacob Keller Subject: [PATCH v6 0/4] notes.mergestrategy config option Date: Fri, 14 Aug 2015 13:48:45 -0700 Message-ID: <1439585329-10542-1-git-send-email-jacob.e.keller@intel.com> Cc: Johan Herland , Michael Haggerty , Eric Sunshine , Junio C Hamano , Jacob Keller To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Aug 14 22:49:18 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 1ZQLuf-0006YN-80 for gcvg-git-2@plane.gmane.org; Fri, 14 Aug 2015 22:49:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752455AbbHNUtP (ORCPT ); Fri, 14 Aug 2015 16:49:15 -0400 Received: from mga03.intel.com ([134.134.136.65]:55062 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803AbbHNUtL (ORCPT ); Fri, 14 Aug 2015 16:49:11 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 14 Aug 2015 13:48:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,680,1432623600"; d="scan'208";a="542112489" Received: from jekeller-desk.amr.corp.intel.com ([134.134.3.85]) by FMSMGA003.fm.intel.com with ESMTP; 14 Aug 2015 13:48:50 -0700 X-Mailer: git-send-email 2.5.0.280.g4aaba03 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Jacob Keller Changes since v6: * use a static git_config_get_notes_strategy function * use git_die_config to display useful information about which configuration failed. This should address Eric's concern. It also makes it so that we don't even read the configuration at all unless we need to. Jacob Keller (4): notes: document cat_sort_uniq rewriteMode notes: add tests for --commit/--abort/--strategy exclusivity notes: add notes.mergestrategy option to select default strategy notes: teach git-notes about notes..mergestrategy option Documentation/config.txt | 18 ++++++++-- Documentation/git-notes.txt | 23 ++++++++++-- builtin/notes.c | 60 ++++++++++++++++++++++++------- notes-merge.h | 16 +++++---- t/t3309-notes-merge-auto-resolve.sh | 68 +++++++++++++++++++++++++++++++++++ t/t3310-notes-merge-manual-resolve.sh | 12 +++++++ 6 files changed, 173 insertions(+), 24 deletions(-) -- 2.5.0.280.g4aaba03