Has anyone else had recent issues with pulling in commits?
I had a copy of the github repo, checked out to the next branch. I had one
extra file, a build script that used /tmp instead of $PWD. The extra file
was the only change made to the repository. Today I did a git fetch.
[jhriv@chao:~/Projects/wmaker-crm-broken] (next↓55↑36|…)± git log -1 | head
-5
commit 84e0bdaaec210d1f78ca4edf321edc622c512141
Author: BALATON Zoltan <bala...@eik.bme.hu>
Date: Sun Oct 19 23:53:58 2014 +0200
wmaker: Restore multi screen functionality by reverting wrong commits
[jhriv@chao:~/Projects/wmaker-crm-broken] (next↓55↑36|…)± git status
On branch next
Your branch and 'origin/next' have diverged,
and have 36 and 55 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
Untracked files:
(use "git add <file>..." to include in what will be committed)
build.sh
nothing added to commit but untracked files present (use "git add" to track)
Git pull resulted in a merge conflict. Unsurprising, since I somehow
managed to get 36 commits that aren't on the remote repository.
Solution: do a fresh git clone, and checkout the next branch.
[jhriv@chao:~/Projects/wmaker-crm] (next|…)± git log -1 | head -5
commit 0acbec36acc2fe99a8a23fa056fc21642d715d49
Author: Doug Torrance <dtorra...@monmouthcollege.edu>
Date: Thu Oct 30 12:27:23 2014 -0500
WINGs: Link examples against Xlib.
[jhriv@chao:~/Projects/wmaker-crm] (next|…)± git status
On branch next
Your branch is up-to-date with 'origin/next'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
build.sh
nothing added to commit but untracked files present (use "git add" to track)
[jhriv@chao:~/Projects/wmaker-crm] (next|…)± git checkout
84e0bdaaec210d1f78ca4e
df321edc622c512141
fatal: reference is not a tree: 84e0bdaaec210d1f78ca4edf321edc622c512141
The commit that I was on is now gone. I'm assuming it, and 35 other
commits, was nuked from the repository somehow. My question is how that
happened, and if anyone else noticed it.
-john
