From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Galan=20R=C3=A9mi?= Subject: [PATCHv7 3/3] git rebase -i: add static check for commands and SHA-1 Date: Mon, 29 Jun 2015 22:20:32 +0200 Message-ID: <1435609232-14232-4-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> References: <1435609232-14232-1-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Remi Lespinet , Guillaume Pages , Louis-Alexandre Stuber , Antoine Delaite , Matthieu Moy , Junio C Hamano , Eric Sunshine , =?UTF-8?q?Galan=20R=C3=A9mi?= To: Git List X-From: git-owner@vger.kernel.org Mon Jun 29 22:20:49 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 1Z9fXq-0007oD-KW for gcvg-git-2@plane.gmane.org; Mon, 29 Jun 2015 22:20:47 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753317AbbF2UUl convert rfc822-to-quoted-printable (ORCPT ); Mon, 29 Jun 2015 16:20:41 -0400 Received: from zm-etu-ensimag-1.grenet.fr ([130.190.244.117]:35739 "EHLO zm-etu-ensimag-1.grenet.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752913AbbF2UUh (ORCPT ); Mon, 29 Jun 2015 16:20:37 -0400 Received: from localhost (localhost [127.0.0.1]) by zm-smtpout-1.grenet.fr (Postfix) with ESMTP id 2E1983873; Mon, 29 Jun 2015 22:20:35 +0200 (CEST) Received: from zm-smtpout-1.grenet.fr ([127.0.0.1]) by localhost (zm-smtpout-1.grenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YDmyvdoFq67d; Mon, 29 Jun 2015 22:20:35 +0200 (CEST) Received: from zm-smtpauth-2.grenet.fr (zm-smtpauth-2.grenet.fr [130.190.244.123]) by zm-smtpout-1.grenet.fr (Postfix) with ESMTP id 1D32A2858; Mon, 29 Jun 2015 22:20:35 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zm-smtpauth-2.grenet.fr (Postfix) with ESMTP id 1770720D2; Mon, 29 Jun 2015 22:20:35 +0200 (CEST) Received: from zm-smtpauth-2.grenet.fr ([127.0.0.1]) by localhost (zm-smtpauth-2.grenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pb5vu5y8w6M1; Mon, 29 Jun 2015 22:20:35 +0200 (CEST) Received: from galanalr-Dell-System-Inspiron-N7110.univnautes.lan (eduspot-condillac.crous-grenoble.fr [193.52.241.183]) by zm-smtpauth-2.grenet.fr (Postfix) with ESMTPSA id E0E0120E6; Mon, 29 Jun 2015 22:20:34 +0200 (CEST) X-Mailer: git-send-email 2.4.3.532.gab13793 In-Reply-To: <1435609232-14232-1-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Check before the start of the rebasing if the commands exists, and for the commands expecting a SHA-1, check if the SHA-1 is present and corresponds to a commit. In case of error, print the error, stop git rebase and prompt the user to fix with 'git rebase --edit-todo' or to abort. This allows to avoid doing half of a rebase before finding an error and giving back what's left of the todo list to the user and prompt him to fix when it might be too late for him to do so (he might have to abort and restart the rebase). Signed-off-by: Galan R=C3=A9mi --- git-rebase--interactive.sh | 75 +++++++++++++++++++++++++++++++++++= ++++++++ t/lib-rebase.sh | 5 +++ t/t3404-rebase-interactive.sh | 39 ++++++++++++++++++++++ 3 files changed, 119 insertions(+) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 66daacf..ec4a068 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -834,6 +834,73 @@ add_exec_commands () { mv "$1.new" "$1" } =20 +# Check if the SHA-1 passed as an argument is a +# correct one, if not then print $2 in "$todo".badsha +# $1: the SHA-1 to test +# $2: the line to display if incorrect SHA-1 +check_commit_sha () { + badsha=3D0 + if test -z $1 + then + badsha=3D1 + else + sha1_verif=3D"$(git rev-parse --verify --quiet $1^{commit})" + if test -z $sha1_verif + then + badsha=3D1 + fi + fi + + if test $badsha -ne 0 + then + warn "Warning: the SHA-1 is missing or isn't" \ + "a commit in the following line:" + warn " - $2" + warn + fi + + return $badsha +} + +# prints the bad commits and bad commands +# from the todolist in stdin +check_bad_cmd_and_sha () { + retval=3D0 + git stripspace --strip-comments | + ( + while read -r line + do + IFS=3D' ' + set x $line + shift + command=3D$1 + sha1=3D$2 + + case $command in + ''|noop|x|"exec") + # Doesn't expect a SHA-1 + ;; + pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f) + check_commit_sha $sha1 "$line" + if test $? -ne 0 + then + retval=3D1 + fi + ;; + *) + warn "Warning: the command isn't recognized" \ + "in the following line:" + warn " - $line" + warn + retval=3D1 + ;; + esac + done + + return $retval + ) +} + # Print the list of the SHA-1 of the commits # from stdin to stdout todo_list_to_sha_list () { @@ -868,6 +935,8 @@ checkout_onto () { =20 # Check if the user dropped some commits by mistake # Behaviour determined by rebase.missingCommitsCheck. +# Check if there is an unrecognized command or a +# bad SHA-1 in a command. check_todo_list () { raise_error=3Df =20 @@ -919,6 +988,12 @@ check_todo_list () { ;; esac =20 + check_bad_cmd_and_sha <"$todo" + if test $? -ne 0 + then + raise_error=3Dt + fi + if test $raise_error =3D t then # Checkout before the first commit of the diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index fdbc900..9a96e15 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -54,6 +54,11 @@ set_fake_editor () { echo '# comment' >> "$1";; ">") echo >> "$1";; + bad) + action=3D"badcmd";; + fakesha) + echo "$action XXXXXXX False commit" >> "$1" + action=3Dpick;; *) sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1" action=3Dpick;; diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive= =2Esh index 904a2d0..9b2c51c 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1186,4 +1186,43 @@ test_expect_success 'rebase -i respects rebase.m= issingCommitsCheck =3D error' ' test B =3D $(git cat-file commit HEAD^ | sed -ne \$p) ' =20 +cat >expect <actual && + test_cmp expect actual && + FAKE_LINES=3D"1 2 3 drop 4 5" git rebase --edit-todo && + git rebase --continue && + test E =3D $(git cat-file commit HEAD | sed -ne \$p) && + test C =3D $(git cat-file commit HEAD^ | sed -ne \$p) +' + +cat >expect <actual && + test_cmp expect actual && + FAKE_LINES=3D"1 2 4 5 6" git rebase --edit-todo && + git rebase --continue && + test E =3D $(git cat-file commit HEAD | sed -ne \$p) +' + test_done --=20 2.4.3.532.gf6210e5.dirty