From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petr Baudis Subject: [PATCH] git-filter-branch.sh: Allow running in bare repositories Date: Wed, 23 Jul 2008 00:37:41 +0200 Message-ID: <20080722223710.29084.61373.stgit@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org, Johannes Schindelin To: gitster@pobox.com X-From: git-owner@vger.kernel.org Wed Jul 23 00:38:54 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KLQVP-0002P1-TB for gcvg-git-2@gmane.org; Wed, 23 Jul 2008 00:38:52 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753166AbYGVWhv (ORCPT ); Tue, 22 Jul 2008 18:37:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752000AbYGVWhv (ORCPT ); Tue, 22 Jul 2008 18:37:51 -0400 Received: from 159-162.104-92.cust.bluewin.ch ([92.104.162.159]:62543 "EHLO pixie.suse.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751782AbYGVWhv (ORCPT ); Tue, 22 Jul 2008 18:37:51 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by pixie.suse.cz (Postfix) with ESMTP id 7CE4C2ACC76; Wed, 23 Jul 2008 00:37:41 +0200 (CEST) User-Agent: StGIT/0.14.2 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Commit 46eb449c restricted git-filter-branch to non-bare repositories unnecessarily; git-filter-branch can work on bare repositories just fine. This also fixes suspicious shell boolean expression during a check for dirty working tree. Cc: Johannes Schindelin Signed-off-by: Petr Baudis --- git-filter-branch.sh | 36 ++++++++++++++++++++---------------- t/t7003-filter-branch.sh | 8 ++++++++ 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index d04c346..dcfc6be 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -97,9 +97,11 @@ USAGE="[--env-filter ] [--tree-filter ] \ OPTIONS_SPEC= . git-sh-setup -git diff-files --quiet && - git diff-index --cached --quiet HEAD -- || - die "Cannot rewrite branch(es) with a dirty working directory." +if [ "$(is_bare_repository)" = false ]; then + (git diff-files --quiet && + git diff-index --cached --quiet HEAD --) || + die "Cannot rewrite branch(es) with a dirty working directory." +fi tempdir=.git-rewrite filter_env= @@ -434,18 +436,20 @@ rm -rf "$tempdir" trap - 0 -unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE -test -z "$ORIG_GIT_DIR" || { - GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR -} -test -z "$ORIG_GIT_WORK_TREE" || { - GIT_WORK_TREE="$ORIG_GIT_WORK_TREE" && - export GIT_WORK_TREE -} -test -z "$ORIG_GIT_INDEX_FILE" || { - GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" && - export GIT_INDEX_FILE -} -git read-tree -u -m HEAD +if [ "$(is_bare_repository)" = false ]; then + unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE + test -z "$ORIG_GIT_DIR" || { + GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR + } + test -z "$ORIG_GIT_WORK_TREE" || { + GIT_WORK_TREE="$ORIG_GIT_WORK_TREE" && + export GIT_WORK_TREE + } + test -z "$ORIG_GIT_INDEX_FILE" || { + GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" && + export GIT_INDEX_FILE + } + git read-tree -u -m HEAD +fi exit $ret diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index e26f726..a0ab096 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -38,6 +38,14 @@ test_expect_success 'result is really identical' ' test $H = $(git rev-parse HEAD) ' +test_expect_success 'rewrite bare repository identically' ' + (git config core.bare true && cd .git && git-filter-branch branch) +' +git config core.bare false +test_expect_success 'result is really identical' ' + test $H = $(git rev-parse HEAD) +' + test_expect_success 'rewrite, renaming a specific file' ' git-filter-branch -f --tree-filter "mv d doh || :" HEAD '