From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramkumar Ramachandra Subject: [PATCH 14/18] reset: Make reset remove the sequencer state Date: Thu, 4 Aug 2011 16:09:12 +0530 Message-ID: <1312454356-3070-15-git-send-email-artagnon@gmail.com> References: <1312454356-3070-1-git-send-email-artagnon@gmail.com> Cc: Git List , Jonathan Nieder , Christian Couder , Daniel Barkalow , Jeff King To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Aug 04 12:43:40 2011 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 1QovOt-0007Nc-AJ for gcvg-git-2@lo.gmane.org; Thu, 04 Aug 2011 12:43:39 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754126Ab1HDKnf (ORCPT ); Thu, 4 Aug 2011 06:43:35 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:34039 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753971Ab1HDKnd (ORCPT ); Thu, 4 Aug 2011 06:43:33 -0400 Received: by gwaa12 with SMTP id a12so958360gwa.19 for ; Thu, 04 Aug 2011 03:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=6Fhos3ZA58ZWJceCmtsiTG2ovvS7tg0F5dMwXnEJCiQ=; b=R5q9ub8ZlCD/tNsyff94oQgXNqSj7ZRREXrYvfFEhzlNFc6scSrf8Fi+o/TcroA4Pd j5AoJvPp0KV3Ri29/3AkAiMpfTYjDxrF1rB+JSmSI5p7ELLNufsURBuEQbWauzeJy6/y GQ9Xk6VcBAnzAPnlzx58m/LEsDjXxZfwCby9w= Received: by 10.142.136.18 with SMTP id j18mr667927wfd.284.1312454612286; Thu, 04 Aug 2011 03:43:32 -0700 (PDT) Received: from localhost.localdomain ([203.110.240.41]) by mx.google.com with ESMTPS id m7sm2090440pbk.6.2011.08.04.03.43.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Aug 2011 03:43:31 -0700 (PDT) X-Mailer: git-send-email 1.7.6.351.gb35ac.dirty In-Reply-To: <1312454356-3070-1-git-send-email-artagnon@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Years of muscle memory have trained users to use "git reset --hard" to remove the branch state after any sort operation. Make it also remove the sequencer state to facilitate this established workflow: $ git cherry-pick foo..bar ... conflict encountered ... $ git reset --hard # Oops, I didn't mean that $ git cherry-pick quux..bar ... cherry-pick succeeded ... Guard against accidental removal of the sequencer state by providing one level of "undo". In the first "reset" invocation, ".git/sequencer" is moved to ".git/sequencer-old"; it is completely removed only in the second invocation. Signed-off-by: Ramkumar Ramachandra Signed-off-by: Jonathan Nieder --- branch.c | 2 ++ t/7106-reset-sequence.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) create mode 100755 t/7106-reset-sequence.sh diff --git a/branch.c b/branch.c index c0c865a..d06aec4 100644 --- a/branch.c +++ b/branch.c @@ -3,6 +3,7 @@ #include "refs.h" #include "remote.h" #include "commit.h" +#include "sequencer.h" struct tracking { struct refspec spec; @@ -228,4 +229,5 @@ void remove_branch_state(void) unlink(git_path("MERGE_MSG")); unlink(git_path("MERGE_MODE")); unlink(git_path("SQUASH_MSG")); + remove_sequencer_state(0); } diff --git a/t/7106-reset-sequence.sh b/t/7106-reset-sequence.sh new file mode 100755 index 0000000..4956caa --- /dev/null +++ b/t/7106-reset-sequence.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +test_description='Test interaction of reset --hard with sequencer + + + anotherpick: rewrites foo to d + + picked: rewrites foo to c + + unrelatedpick: rewrites unrelated to reallyunrelated + + base: rewrites foo to b + + initial: writes foo as a, unrelated as unrelated +' + +. ./test-lib.sh + +pristine_detach () { + git cherry-pick --reset && + git checkout -f "$1^0" && + git read-tree -u --reset HEAD && + git clean -d -f -f -q -x +} + +test_expect_success setup ' + echo unrelated >unrelated && + git add unrelated && + test_commit initial foo a && + test_commit base foo b && + test_commit unrelatedpick unrelated reallyunrelated && + test_commit picked foo c && + test_commit anotherpick foo d && + git config advice.detachedhead false + +' + +test_expect_success 'reset --hard cleans up sequencer state, providing one-level undo' ' + pristine_detach initial && + test_must_fail git cherry-pick base..anotherpick && + test_path_is_dir .git/sequencer && + git reset --hard && + test_path_is_missing .git/sequencer && + test_path_is_dir .git/sequencer-old && + git reset --hard && + test_path_is_missing .git/sequencer-old +' + +test_done -- 1.7.6.351.gb35ac.dirty