Git/gitk shows me unknown/invalid sha1 id for a folder but not from its parent folder. -

i have following folder

views/shared/base/ 

where have been developing parts of layout

header.cshtml footer.cshtml mainnav.cshtml 

so @ point start creating 'base' folder initial commit files (in branch devivated master). initial commit goes our master because in earlier stage, no problem @ all. let's call commit, commit a.

then, continue developing files , creating more, more commits them , taking them our master rest of team benefit of changes. @ least idea. let created commit b, c, d.

but last week, our team should sync our master, mandatory. continue developing, , create commit e. didn't take e master yet, today sync branch (i'm use branch developed 'base') master have changes team , see if okay.

but despite merge fast forward, see surprise folder 'base' seems stay on commit a, not e, recent commit.

at first though really, bad merge on team. didn't find nothing that. comments , tree (i checked through gitk) didn't show nothing that.

and weird thing following:

one powerful feature of git, can check history of folder or single file, right?

well, @ this. using gitk checked 'views' , commit d , e. of course, gitk found them , show me commits of header.html, footer.html inside 'views/shared/base'.

cool, happened when did same base.. once did gitk 'views/shared/base', , commits d & e, gitk show me error: "la id sha1 d/e es desconocida" in english believe error translated "the id sha1 d/e unknown" or that.

so don't understan why can find commit in parent folder not in inner one.

i don't know going on, or how solve it. our repo corrupted?

is our repo corrupted?

first, clone again repo , see if master (and base/ content) ok.

today sync branch (i'm use branch developed 'base')

if 1 working on branch, should rebase on top of master in order benefit latest master content.

git checkout mybranch git fetch git rebase origin/master 

this should show base/ latest content.