From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Theodore Ts'o" Subject: [PATCH 1/2] must_commit_first: Make sure the index is up to date Date: Mon, 7 Jul 2008 20:03:11 -0400 Message-ID: <1215475392-26221-2-git-send-email-tytso@mit.edu> References: <1215475392-26221-1-git-send-email-tytso@mit.edu> Cc: git@vger.kernel.org, "Theodore Ts'o" To: jeffpc@josefsipek.net X-From: git-owner@vger.kernel.org Tue Jul 08 02:04:46 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 1KG0hJ-0007SQ-IR for gcvg-git-2@gmane.org; Tue, 08 Jul 2008 02:04:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756703AbYGHADa (ORCPT ); Mon, 7 Jul 2008 20:03:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754351AbYGHADa (ORCPT ); Mon, 7 Jul 2008 20:03:30 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:53460 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754003AbYGHAD3 (ORCPT ); Mon, 7 Jul 2008 20:03:29 -0400 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by biscayne-one-station.mit.edu (8.13.6/8.9.2) with ESMTP id m6803Jt4023856; Mon, 7 Jul 2008 20:03:19 -0400 (EDT) Received: from closure.thunk.org (c-98-216-98-217.hsd1.ma.comcast.net [98.216.98.217]) (authenticated bits=0) (User authenticated as tytso@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id m6803CgU018879 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 7 Jul 2008 20:03:16 -0400 (EDT) Received: from tytso by closure.thunk.org with local (Exim 4.69) (envelope-from ) id 1KG0fo-0007fI-6z; Mon, 07 Jul 2008 20:03:12 -0400 X-Mailer: git-send-email 1.5.6.1.205.ge2c7.dirty In-Reply-To: <1215475392-26221-1-git-send-email-tytso@mit.edu> X-Scanned-By: MIMEDefang 2.42 X-Spam-Flag: NO X-Spam-Score: 0.00 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: git diff-files can be confused if the index is not up to date, so make sure it is updated first. Signed-off-by: "Theodore Ts'o" --- guilt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/guilt b/guilt index 50414a4..cdf4e9b 100755 --- a/guilt +++ b/guilt @@ -495,6 +495,7 @@ s/^\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\) \([0-9]\{2\}\):\([0-9]\{2\}\):\( # usage: must_commit_first must_commit_first() { + git update-index --refresh --unmerged -q > /dev/null [ `git diff-files | wc -l` -eq 0 ] return $? } -- 1.5.6.1.205.ge2c7.dirty