From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Rappazzo Subject: [PATCH v5] git-rebase--interactive.sh: add config option for custom instruction format Date: Sat, 13 Jun 2015 12:26:58 -0400 Message-ID: <1434212818-94682-2-git-send-email-rappazzo@gmail.com> References: <1434212818-94682-1-git-send-email-rappazzo@gmail.com> Cc: git@vger.kernel.org, Michael Rappazzo To: gitster@pobox.com, johannes.schindelin@gmx.de X-From: git-owner@vger.kernel.org Sat Jun 13 18:27:24 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 1Z3oHE-0003dH-7W for gcvg-git-2@plane.gmane.org; Sat, 13 Jun 2015 18:27:24 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753829AbbFMQ1T (ORCPT ); Sat, 13 Jun 2015 12:27:19 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:36130 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753706AbbFMQ1R (ORCPT ); Sat, 13 Jun 2015 12:27:17 -0400 Received: by qcjl8 with SMTP id l8so17317104qcj.3 for ; Sat, 13 Jun 2015 09:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lgCrzpqSe6IsyG22cwsUFFzBjti1hwDppybjwsATlEE=; b=JaQrafhVUPB/JUJ29gf4WE9hz0khz7ewtTkCiHBWicAnI1dRxW8knPesyftA8kLwDn CTF5pDJD7FbJjy4gxQMa9n3j7cQMe12VyY8nT4ZqvEUsYPqs8HZPP/WLd1bEtuhKel0B rNNpGyseAkLCYd3lhmTHXZ8Luu3ICydwUq4FlJp1UZ7zDoNmHE3qariV98+XcdOKdkQ8 Wcc/90wZR/QGWN66TbFWAeQbUk9neocosdxvw7Kbn1YIu9/Vyh82fSZVI6curVtVsoAG fx39+9kF74x6faB/laAP4wn7FMmkB8Hy5wvGMgLVBm5myaIMmrgns45Miaw881WvI+lJ 53Dg== X-Received: by 10.140.194.199 with SMTP id p190mr26978188qha.76.1434212836544; Sat, 13 Jun 2015 09:27:16 -0700 (PDT) Received: from MRappazzo-2.local.info (ool-18e49664.dyn.optonline.net. [24.228.150.100]) by mx.google.com with ESMTPSA id 197sm3366478qhq.23.2015.06.13.09.27.15 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Jun 2015 09:27:16 -0700 (PDT) X-Mailer: git-send-email 2.4.2 In-Reply-To: <1434212818-94682-1-git-send-email-rappazzo@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: A config option 'rebase.instructionFormat' can override the default 'oneline' format of the rebase instruction list. Since the list is parsed using the left, right or boundary mark plus the sha1, they are prepended to the instruction format. Signed-off-by: Michael Rappazzo --- Documentation/config.txt | 5 +++++ Documentation/git-rebase.txt | 7 +++++++ git-rebase--interactive.sh | 20 +++++++++++++++++--- t/t3415-rebase-autosquash.sh | 21 +++++++++++++++++++++ 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 43bb53c..4c271c6 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2161,6 +2161,11 @@ rebase.autoStash:: successful rebase might result in non-trivial conflicts. Defaults to false. +rebase.instructionFormat + A format string, as specified in linkgit:git-log[1], to be used for + the instruction list during an interactive rebase. The format will automatically + have the long commit hash prepended to the format. + receive.advertiseAtomic:: By default, git-receive-pack will advertise the atomic push capability to its clients. If you don't want to this capability diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 1d01baa..8ddab77 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -213,6 +213,9 @@ rebase.autoSquash:: rebase.autoStash:: If set to true enable '--autostash' option by default. +rebase.instructionFormat:: + Custom commit list format to use during an '--interactive' rebase. + OPTIONS ------- --onto :: @@ -359,6 +362,10 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`. Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to split commits (see SPLITTING COMMITS below). ++ +The commit list format can be changed by setting the configuration option +rebase.instructionFormat. A customized instruction format will automatically +have the long commit hash prepended to the format. -p:: --preserve-merges:: diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index dc3133f..755f9c1 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -740,10 +740,15 @@ collapse_todo_ids() { # "pick sha1 fixup!/squash! msg" appears in it so that the latter # comes immediately after the former, and change "pick" to # "fixup"/"squash". +# +# Note that if the config has specified a custom instruction format +# each log message will be re-retrieved in order to normalize the +# autosquash arrangement rearrange_squash () { # extract fixup!/squash! lines and resolve any referenced sha1's while read -r pick sha1 message do + test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1}) case "$message" in "squash! "*|"fixup! "*) action="${message%%!*}" @@ -785,6 +790,7 @@ rearrange_squash () { *" $sha1 "*) continue ;; esac printf '%s\n' "$pick $sha1 $message" + test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1}) used="$used$sha1 " while read -r squash action msg_prefix msg_content do @@ -802,8 +808,13 @@ rearrange_squash () { case "$message" in "$msg_content"*) emit=1;; esac ;; esac if test $emit = 1; then - real_prefix=$(echo "$msg_prefix" | sed "s/,/! /g") - printf '%s\n' "$action $squash ${real_prefix}$msg_content" + if test -n "${format}" + then + msg_content=$(git log -n 1 --format="${format}" ${squash}) + else + msg_content="$(echo "$msg_prefix" | sed "s/,/! /g")$msg_content" + fi + printf '%s\n' "$action $squash $msg_content" used="$used$squash " fi done <"$1.sq" @@ -977,7 +988,10 @@ else revisions=$onto...$orig_head shortrevisions=$shorthead fi -git rev-list $merges_option --pretty=oneline --reverse --left-right --topo-order \ +format=$(git config --get rebase.instructionFormat) +# the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse +git rev-list $merges_option --format="%m%H ${format:-%s}" \ + --reverse --left-right --topo-order \ $revisions ${restrict_revision+^$restrict_revision} | \ sed -n "s/^>//p" | while read -r sha1 rest diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 41370ab..8f53e54 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -250,4 +250,25 @@ test_expect_success 'squash! fixup!' ' test_auto_fixup_fixup squash fixup ' +test_expect_success 'autosquash with custom inst format' ' + git reset --hard base && + git config --add rebase.instructionFormat "[%an @ %ar] %s" && + echo 2 >file1 && + git add -u && + test_tick && + git commit -m "squash! $(git rev-parse --short HEAD^)" && + echo 1 >file1 && + git add -u && + test_tick && + git commit -m "squash! $(git log -n 1 --format=%s HEAD~2)" && + git tag final-squash-instFmt && + test_tick && + git rebase --autosquash -i HEAD~4 && + git log --oneline >actual && + test_line_count = 3 actual && + git diff --exit-code final-squash-instFmt && + test 1 = "$(git cat-file blob HEAD^:file1)" && + test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l) +' + test_done -- 2.4.2