All of lore.kernel.org
 help / color / mirror / Atom feed
From: Zeeshan Qureshi <zeeshan@zqureshi.in>
To: git@vger.kernel.org
Subject: Git commit behaving strangely
Date: Tue, 20 Jul 2010 22:28:04 -0400	[thread overview]
Message-ID: <4C465B34.2040407@zqureshi.in> (raw)

Hello,

I am new to git and was going through gittutorial-2 when i noticed 
something weird.

1. I first create a file file.txt with some text and committed it.
2. I create a file called closing.txt with some text and committed it.
3. then i added 1 new line to both closing.txt and file.txt
4. i added the file closing.txt to the staging are by running 'git add 
closing.txt'
5. now i ran 'git checkout' (by mistake)
6. Now i run 'git diff --cached' (which should show the changes i have 
in the index), the output is this

diff --git a/closing.txt b/closing.txt
index da55920..953ec3a 100644
--- a/closing.txt
+++ b/closing.txt
@@ -1 +1,2 @@
  closing
+again?

7. Now when i run 'git commit -m "closing again"', the change is not 
committed even though i get a new commit id.

The output of 'git log -p' is this (as you can clearly see, there are 
new commits but no change has been recorded)

commit 7dbe9a272c58decc08f9fd5ce07efd5bf28d89f8
Author: Zeeshan Qureshi <{email}>
Date:   Tue Jul 20 15:36:05 2010 -0400

     closing again

commit 1bfda310eb82e62925b28d62e98097d6fbd61620
Author: Zeeshan Qureshi <{email}>
Date:   Tue Jul 20 15:34:46 2010 -0400

     closing again

commit 3d0e35717bea56adbc7c578b3b17db3657e30040
Author: Zeeshan Qureshi <{email}>
Date:   Tue Jul 20 15:33:40 2010 -0400

     closing

diff --git a/closing.txt b/closing.txt
new file mode 100644
index 0000000..da55920
--- /dev/null
+++ b/closing.txt
@@ -0,0 +1 @@
+closing

commit 2a0a0e4edb1810b6e31b0739bd7736d1360e6d13
Author: Zeeshan Qureshi <{email}>
Date:   Tue Jul 20 15:32:13 2010 -0400

     initial commit

diff --git a/file.txt b/file.txt
new file mode 100644
index 0000000..3b18e51
--- /dev/null
+++ b/file.txt
@@ -0,0 +1 @@
+hello world


-- 
Zeeshan Qureshi
zeeshan@zqureshi.in

             reply	other threads:[~2010-07-21  2:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-21  2:28 Zeeshan Qureshi [this message]
2010-07-21  3:06 ` Git commit behaving strangely Jonathan Nieder
2010-07-21  4:01   ` Zeeshan Qureshi
     [not found]   ` <AANLkTikYoNEQpotpfdVci4WSUc1GMNnM9y0OqXJb7Fzu@mail.gmail.com>
     [not found]     ` <20100721050558.GA15273@burratino>
2010-07-22 13:48       ` Zeeshan Qureshi
2010-07-22 16:28         ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C465B34.2040407@zqureshi.in \
    --to=zeeshan@zqureshi.in \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.