old folders returning

old folders returning

[David Coombes]

Issue:
--------
I renamed a deprecated folder that i needed the code for, added ".old"
to name. I then pushed to the repository and the original folder and
the newly renamed are now in the repository and on my local branch.

I renamed 'autoflow' to 'autoflow.old' and worked away ok. But after
the push I now have both of the folders with duplicate files.

The 'autoflow' folder that has appeared is also from an earlier push
this morning 1038 its now 1727

Re-Create:
----------------
No idea how to as its the first time I've seen this. But the output
from the push is:
 git push origin autoflow
Counting objects: 267, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (132/132), done.
Writing objects: 100% (146/146), 140.69 KiB, done.
Total 146 (delta 76), reused 1 (delta 0)
To git@github.com:cityindex/labs.cityindex.com.git
   8ea3cd9..7e6ff4f  autoflow -> autoflow

Cause:
----------
The only suggestion I can think of is that the name wasn't cleared
after the "git add *" and then git went looking for an earlier copy.
But seems the issue is with the git client as well because of the
modified time. If it were pulled then the modified time would've
changed, so it must have been taken from an earlier commit on my local
branch.

System:
------------
$ git --version
git version 1.7.9.5

$ cat /etc/*release*
DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=12.04
DISTRIB_CODENAME=precise
DISTRIB_DESCRIPTION="Ubuntu 12.04.1 LTS"

$ uname -a
Linux daithi-laptop 3.2.0-32-generic #51-Ubuntu SMP Wed Sep 26
21:33:09 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux

--
"Any society that would give up a little liberty to gain a little security,
               will deserve neither and lose both." - Benjamin Franklin

Re: old folders returning

[Andy Hawkins]

Hi,

In article <CAN4PrMavggqn3ZM1atde5CADjszzLOvPoQasjRZfUvRKrqS-uA@mail.gmail.com>,
           David Coombes<webeire@gmail.com> wrote:
> The only suggestion I can think of is that the name wasn't cleared
> after the "git add *" and then git went looking for an earlier copy.
> But seems the issue is with the git client as well because of the
> modified time. If it were pulled then the modified time would've
> changed, so it must have been taken from an earlier commit on my local
> branch.

Did you git rm the 'old' name of the folder?

Andy