Here is the log of a session.
First, unpacking the zip file I uploaded, it works.
Then, returning to the failing original situation, it fails again. Then 
after some renaming and moving, it suddenly works!
See my comments between the commands.
I would really appreciate if someone could help me solve this puzzle.
--------------------------------------------------------------------------------->8-------------------
Welcome to Git (version 1.9.0-preview20140217)


Run 'git help git' to display the help index.
Run 'git help <command>' to display help for specific commands.

joostadm@W701 ~
$ cd /c/proj/try/git

joostadm@W701 /c/proj/try/git
$ mkdir demo

joostadm@W701 /c/proj/try/git
$ cd demo

joostadm@W701 /c/proj/try/git/demo
$ # Now I unpack the zipfile I uploaded to the forum:

joostadm@W701 /c/proj/try/git/demo
$ unzip ../clonefault/DixiLink2gitwork.zip
Archive:  ../clonefault/DixiLink2gitwork.zip
   creating: .git/
  inflating: .git/COMMIT_EDITMSG
  inflating: .git/config
  inflating: .git/description
  inflating: .git/gitk.cache
  inflating: .git/HEAD
   creating: .git/hooks/
  inflating: .git/hooks/applypatch-msg.sample
  inflating: .git/hooks/commit-msg.sample
  inflating: .git/hooks/post-update.sample
  inflating: .git/hooks/pre-applypatch.sample
  inflating: .git/hooks/pre-commit.sample
  inflating: .git/hooks/pre-push.sample
  inflating: .git/hooks/pre-rebase.sample
  inflating: .git/hooks/prepare-commit-msg.sample
  inflating: .git/hooks/update.sample
  inflating: .git/index
   creating: .git/info/
  inflating: .git/info/exclude
   creating: .git/logs/
  inflating: .git/logs/HEAD
   creating: .git/logs/refs/
   creating: .git/logs/refs/heads/
  inflating: .git/logs/refs/heads/master
   creating: .git/objects/
   creating: .git/objects/29/
  inflating: .git/objects/29/c51bbb9ada43dbe98cbd5dbedbab56586b24c3
   creating: .git/objects/68/
  inflating: .git/objects/68/b1f129eb06b91fc6c9a3885fc0d24ad0cdaa50
   creating: .git/objects/7e/
  inflating: .git/objects/7e/8d94849a38370141b3ca2aab5c3cadc27934da
   creating: .git/objects/cf/
  inflating: .git/objects/cf/13dbb766d4aff04ad51d3cdac84fda67dc6f50
   creating: .git/objects/da/
  inflating: .git/objects/da/eca6b50a218a78e4cca5566965381e2d384b7f
   creating: .git/objects/de/
  inflating: .git/objects/de/3643596c73be4f6112d027616c8df31acd1b09
   creating: .git/objects/info/
   creating: .git/objects/pack/
   creating: .git/refs/
   creating: .git/refs/heads/
  inflating: .git/refs/heads/master
   creating: .git/refs/tags/
  inflating: dixilinkerr.h

joostadm@W701 /c/proj/try/git/demo (master)
$ git status
On branch master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   dixilinkerr.h

no changes added to commit (use "git add" and/or "git commit -a")

joostadm@W701 /c/proj/try/git/demo (master)
$ git diff
diff --git a/dixilinkerr.h b/dixilinkerr.h
index daeca6b..b5edf0e 100644
--- a/dixilinkerr.h
+++ b/dixilinkerr.h
@@ -2,8 +2,8 @@

 #pragma once

-#ifndef CAT_DIXILINK_ERR
-#define CAT_DIXILINK_ERR 2000
+#ifndef EXCPCAT_DIXILINK
+#define EXCPCAT_DIXILINK 2000
 #endif

 #ifndef __DixiLinkErr_H_INCLUDED__
@@ -16,7 +16,7 @@
 #ifndef BASE_DIXILINK_ERR
        #define BASE_DIXILINK_ERR 0
        #ifdef USE_DEFAULT_CAT
-               #define BASE_DIXILINK_ERR CAT_DIXILINK_ERR
+               #define BASE_DIXILINK_ERR EXCPCAT_DIXILINK
        #endif
 #endif


joostadm@W701 /c/proj/try/git/demo (master)
$ git add dixilinkerr.h

joostadm@W701 /c/proj/try/git/demo (master)
$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   dixilinkerr.h


joostadm@W701 /c/proj/try/git/demo (master)
$ git commit -m "Darn! Does it work now??"
[master cf4e53f] Darn! Does it work now??
 1 file changed, 3 insertions(+), 3 deletions(-)

joostadm@W701 /c/proj/try/git/demo (master)
$ git log
commit cf4e53f00c720cea7e870e882b0b1071a153d64a
Author: (((censored)))
Date:   Wed Feb 4 22:55:01 2015 +0100

    Darn! Does it work now??

commit cf13dbb766d4aff04ad51d3cdac84fda67dc6f50
Author: Joost <joost@localhost>
Date:   Tue Sep 11 09:57:32 2007 +0000

    @VSS 11-09-2007 11:08:35 [Edit] dixilinkerr.h

commit de3643596c73be4f6112d027616c8df31acd1b09
Author: Joost <joost@localhost>
Date:   Fri Jul 6 12:27:57 2007 +0000

    @VSS 01-06-2007 01:54:53 [Create] dixilinkerr.h

joostadm@W701 /c/proj/try/git/demo (master)
$ #############################################

joostadm@W701 /c/proj/try/git/demo (master)
$ ### Hmm, this works!?!

joostadm@W701 /c/proj/try/git/demo (master)
$ ### Now going back to my other directory where it failed.

joostadm@W701 /c/proj/try/git/demo (master)
$ cd ../clonefault/DixiLink

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ ls -la
total 7
drwxr-xr-x    4 joostadm Administ        0 Jan 23 13:03 .
drwxr-xr-x    1 joostadm Administ     4096 Jan 23 15:12 ..
drwxr-xr-x   13 joostadm Administ     4096 Feb  2 18:07 .git
-rw-r--r--    1 joostadm Administ     5986 Sep 17  2009 dixilinkerr.h

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git status
On branch master
nothing to commit, working directory clean

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ ### Ah! You see?

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git log
commit cf13dbb766d4aff04ad51d3cdac84fda67dc6f50
Author: Joost <joost@localhost>
Date:   Tue Sep 11 09:57:32 2007 +0000

    @VSS 11-09-2007 11:08:35 [Edit] dixilinkerr.h

commit de3643596c73be4f6112d027616c8df31acd1b09
Author: Joost <joost@localhost>
Date:   Fri Jul 6 12:27:57 2007 +0000

    @VSS 01-06-2007 01:54:53 [Create] dixilinkerr.h

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git diff

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ head dixilinkerr.h
// DixiLinkErr.h

#pragma once

#ifndef EXCPCAT_DIXILINK
#define EXCPCAT_DIXILINK 2000
#endif

#ifndef __DixiLinkErr_H_INCLUDED__
#define __DixiLinkErr_H_INCLUDED__

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ ### OK, now look:

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git show HEAD:dixilinkerr.h | head
// DixiLinkErr.h

#pragma once

#ifndef CAT_DIXILINK_ERR
#define CAT_DIXILINK_ERR 2000
#endif

#ifndef __DixiLinkErr_H_INCLUDED__
#define __DixiLinkErr_H_INCLUDED__

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ head dixilinkerr.h
// DixiLinkErr.h

#pragma once

#ifndef EXCPCAT_DIXILINK
#define EXCPCAT_DIXILINK 2000
#endif

#ifndef __DixiLinkErr_H_INCLUDED__
#define __DixiLinkErr_H_INCLUDED__

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ ### You see? They ARE different.

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git status
On branch master
nothing to commit, working directory clean

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ # Maybe diff fails?

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ ### let's check it out

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ mv dixilinkerr.h dixilinkerr.h.v3

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git st
On branch master
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    dixilinkerr.h

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        dixilinkerr.h.v3

no changes added to commit (use "git add" and/or "git commit -a")

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git checkout HEAD dixilinkerr.h

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ ls -l
total 6
-rw-r--r--    1 joostadm Administ     5986 Feb  4 23:11 dixilinkerr.h
-rw-r--r--    1 joostadm Administ     5986 Sep 17  2009 dixilinkerr.h.v3

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ diff *
5,6c5,6
< #ifndef CAT_DIXILINK_ERR
< #define CAT_DIXILINK_ERR 2000
---
> #ifndef EXCPCAT_DIXILINK
> #define EXCPCAT_DIXILINK 2000
19c19
<               #define BASE_DIXILINK_ERR CAT_DIXILINK_ERR
---
>               #define BASE_DIXILINK_ERR EXCPCAT_DIXILINK

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git hash-object dixilinkerr.h
daeca6b50a218a78e4cca5566965381e2d384b7f

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git hash-object dixilinkerr.h.v3
b5edf0e4bdfee70e0810f1c0723bd1a74bebbdc3

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git st
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        dixilinkerr.h.v3

nothing added to commit but untracked files present (use "git add" to track)

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ rm dixilinkerr.h

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ mv dixilinkerr.h.v3 dixilinkerr.h

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ ls -l
total 3
-rw-r--r--    1 joostadm Administ     5986 Sep 17  2009 dixilinkerr.h

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git diff
diff --git a/dixilinkerr.h b/dixilinkerr.h
index daeca6b..b5edf0e 100644
--- a/dixilinkerr.h
+++ b/dixilinkerr.h
@@ -2,8 +2,8 @@

 #pragma once

-#ifndef CAT_DIXILINK_ERR
-#define CAT_DIXILINK_ERR 2000
+#ifndef EXCPCAT_DIXILINK
+#define EXCPCAT_DIXILINK 2000
 #endif

 #ifndef __DixiLinkErr_H_INCLUDED__
@@ -16,7 +16,7 @@
 #ifndef BASE_DIXILINK_ERR
        #define BASE_DIXILINK_ERR 0
        #ifdef USE_DEFAULT_CAT
-               #define BASE_DIXILINK_ERR CAT_DIXILINK_ERR
+               #define BASE_DIXILINK_ERR EXCPCAT_DIXILINK
        #endif
 #endif


joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ ### Hmmm, surprise: Now we can add it!

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git st
On branch master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   dixilinkerr.h

no changes added to commit (use "git add" and/or "git commit -a")

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git hash-object dixilinkerr.h
b5edf0e4bdfee70e0810f1c0723bd1a74bebbdc3

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git commit -am "NOW it works"
[master 7e6f549] NOW it works
 1 file changed, 3 insertions(+), 3 deletions(-)

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$ git log
commit 7e6f5491f5236a35bfcb1504ef283954992e795c
Author: Joost <joost@localhost>
Date:   Wed Feb 4 23:37:25 2015 +0100

    NOW it works

commit cf13dbb766d4aff04ad51d3cdac84fda67dc6f50
Author: Joost <joost@localhost>
Date:   Tue Sep 11 09:57:32 2007 +0000

    @VSS 11-09-2007 11:08:35 [Edit] dixilinkerr.h

commit de3643596c73be4f6112d027616c8df31acd1b09
Author: Joost <joost@localhost>
Date:   Fri Jul 6 12:27:57 2007 +0000

    @VSS 01-06-2007 01:54:53 [Create] dixilinkerr.h

joostadm@W701 /c/proj/try/git/clonefault/DixiLink (master)
$

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to