From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bill Lear Subject: Problem with git push over :/path protocol (ssh) Date: Wed, 24 Jan 2007 13:48:43 -0600 Message-ID: <17847.47131.694158.247941@lisa.zopyra.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Jan 24 20:49:26 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1H9o7H-0002eO-6m for gcvg-git@gmane.org; Wed, 24 Jan 2007 20:49:07 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751129AbXAXTs5 (ORCPT ); Wed, 24 Jan 2007 14:48:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751363AbXAXTs5 (ORCPT ); Wed, 24 Jan 2007 14:48:57 -0500 Received: from mail.zopyra.com ([65.68.225.25]:61461 "EHLO zopyra.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751129AbXAXTs4 (ORCPT ); Wed, 24 Jan 2007 14:48:56 -0500 Received: (from rael@localhost) by zopyra.com (8.11.6/8.11.6) id l0OJmuY20861; Wed, 24 Jan 2007 13:48:56 -0600 X-Mailer: VM 7.18 under Emacs 21.1.1 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: We are seeing very strange behavior with git (1.4.4.1, and 1.5.0-rc2) that results in a push to a remote repo leaving modified files in the remote repo. Here is the gist (slightly edited for clarity): On machine1: % mkdir git_it % git init-db % echo lksjdflksdf > foo % git add foo % git commit -a -m foo % git status [nothing, all clear] On machine2: % git clone machine1:/path/to/git_it Initialized empty Git repository in /home/blear/tst/git_it/.git/ remote: Generating pack... remote: Done counting 3 objects. remote: Deltifying 3 objects. remote: 100% (3/3) done remote: Total 3, written 3 (delta 0), reused 0 (delta 0) Indexing 3 objects. 100% (3/3) done % cd git_it % git co -b new_branch % echo -e "\nbar fig dongle\n" >> foo % git commit -a -m foo Created commit 082d40b1906eecc8a26f6e6e5500c476a8e4311f 1 files changed, 3 insertions(+), 0 deletions(-) % git co master % git pull . new_branch Updating f404614..082d40b Fast forward foo | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) % git push updating 'refs/heads/master' from f4046144d031a779c7127b01ce6241fd66eb9f54 to 082d40b1906eecc8a26f6e6e5500c476a8e4311f Generating pack... Done counting 5 objects. Result has 3 objects. Deltifying 3 objects. 100% (3/3) done Writing 3 objects. 100% (3/3) done Total 3 (delta 0), reused 0 (delta 0) Unpacking 3 objects refs/heads/master: f4046144d031a779c7127b01ce6241fd66eb9f54 -> 082d40b1906eecc8a26f6e6e5500c476a8e4311f On machine1: % cd git_it % git status # Updated but not checked in: # (will commit) # # modified: foo # % cat foo foo % git diff --cached diff --git a/foo b/foo index 5b9d7b1..0155b25 100644 --- a/foo +++ b/foo @@ -1,4 +1 @@ lksjdflksdf - -bar fig dongle - So, if the developer then commits on his branch on machine 1, all his changes get undone. This has happened to him consistently --- he is running git 1.4.4.1 throughout. I just reproduced it using the above, and I am using 1.5.0-rc2 on machine 2, and 1.4.4.1 on machine 1. Bill