From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Andrew Arnott" Subject: Re: Repo corrupted somehow? Date: Mon, 3 Nov 2008 23:34:12 -0800 Message-ID: <216e54900811032334y35ada7daw753c0ad3073c0317@mail.gmail.com> References: <216e54900811032309s51c8cb1fr64054ff18c450b1d@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Nov 04 08:35:28 2008 connect(): Connection refused 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 1KxGRk-0002WE-5Q for gcvg-git-2@gmane.org; Tue, 04 Nov 2008 08:35:28 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752435AbYKDHeO (ORCPT ); Tue, 4 Nov 2008 02:34:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752157AbYKDHeO (ORCPT ); Tue, 4 Nov 2008 02:34:14 -0500 Received: from yx-out-2324.google.com ([74.125.44.29]:39841 "EHLO yx-out-2324.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751776AbYKDHeN (ORCPT ); Tue, 4 Nov 2008 02:34:13 -0500 Received: by yx-out-2324.google.com with SMTP id 8so1125035yxm.1 for ; Mon, 03 Nov 2008 23:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=EjiOxh4RQJ5aA2xzjOOvbykhbfxQDkX4pBuXffwEXeA=; b=tjz1laKoQG5SUiQ43NtSIiBuN8iqgycVAzjOgyvasEDc1UoIJ6I+5G3wMihs66jZlJ Z9MdJXly2ox/t0GjgL8+MGafEnIGIv+Q1SDYNbOjJcznLMvcSKhQABX8fLMmrEk/EOo6 plAaefrSsInqn79HpCd2VzZClsUFh2bTWDexg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=LepXRrK7MRK/mggWWQLL4npaiRQXngS+4alB5ZKgBHSafKSCjOq8okIflYBqikBgRl HoZc3CSWCEYRAPqwuu0FcP3SOe4RIv7vRalnwO8aJLEOZiVSq8GoQ03+spOSGSGXwfJK NAyHe2A3MbDfwP9L7c3iOYLWn+eC0rB4bUXI0= Received: by 10.150.158.8 with SMTP id g8mr1918522ybe.96.1225784052477; Mon, 03 Nov 2008 23:34:12 -0800 (PST) Received: by 10.151.142.12 with HTTP; Mon, 3 Nov 2008 23:34:12 -0800 (PST) In-Reply-To: <216e54900811032309s51c8cb1fr64054ff18c450b1d@mail.gmail.com> Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: I guess I was still in the middle of a rebase. git rebase --abort sort of ultimately fixed it. On Mon, Nov 3, 2008 at 11:09 PM, Andrew Arnott wrote: > I was just git commit'ing, and then I was doing a git rebase to squash > several commits into one when the rebase failed. I then did a > git checkout -f master > git reset --hard > but no matter what I do, git thinks that several files have changed. > The diff shows all the lines in these several files removed and then > added, yet without any changes made to them. git reset --hard doesn't > revert the change. When I jump around history with git checkout these > files remain in their "changed" state. I even tried "git clone" to > create a whole new repo, but one of these several files STILL > registered as changed before I made any changes. > > Any idea what's wrong and how to recover? > > Observe the below command buffer: (I can upload my repo so you can > clone it and perhaps repro it if you want). > > Andrew@LACKY /c/git/dotnetoauth > $ git status > # On branch master > # Changed but not updated: > # (use "git add ..." to update what will be committed) > # > # modified: tools/Documentation.targets > # modified: tools/DotNetOpenAuth.Common.Settings.targets > # modified: tools/DotNetOpenAuth.Versioning.targets > # modified: > tools/Sandcastle/Presentation/vs2005/Content/reference_content.xml > # modified: tools/libcheck.ps1 > # modified: tools/sandcastle.targets > # > no changes added to commit (use "git add" and/or "git commit -a") > > Andrew@LACKY /c/git/dotnetoauth > $ git reset --hard > HEAD is now at 13d37b8 Patching up the bad merges in the phases. > > Andrew@LACKY /c/git/dotnetoauth > $ git status > # On branch master > # Changed but not updated: > # (use "git add ..." to update what will be committed) > # > # modified: tools/Documentation.targets > # modified: tools/DotNetOpenAuth.Common.Settings.targets > # modified: tools/DotNetOpenAuth.Versioning.targets > # modified: > tools/Sandcastle/Presentation/vs2005/Content/reference_content.xml > # modified: tools/libcheck.ps1 > # modified: tools/sandcastle.targets > # > no changes added to commit (use "git add" and/or "git commit -a") >