davetron5000 <davetron5000@xxxxxxxxx> writes: > Following up this: > > http://groups.google.com/group/git-version-control/browse_thread/thread/aa34d04120d0c361# > > I'm trying to learn/examine the .git directory to see what Git thinks. > > What I'm trying to determine is how Git knows the parent of a > particular commit, how I can change it, and how that affects merging. The parent (or parents in the case of merge commit) are stored in the commit object itself. You cannot change them short of rewriting history, or telling git locally via .git/info/grafts file how it should modify history (see "Repository Layout" documentation for more info about grafts). > My problem is that I have two branches, and a merge between the two > produces conflicts in files that are unchanged on one branch. Since > my branches are linked to SVN branches, I'm thinking that Git is not > properly clear on their shared history. > > Any ideas where to look? Use some kind of history viewer, be it gitk, qgit, giggle, tig, git-show-branch (a bit cryptic), git log --graph (not yet released), or similar tool. > .git/info/refs has some strange data in it: > > 5a3e01a8327c6139e9311b01548baf4a8876b5e3 refs/heads/local-FOO > 71560b15ad6a2a7542556dfdf2d6c763625d5db4 refs/heads/local-trunk > efb2ff2ac363600a2aaae60718bc76b6c3db4228 refs/remotes/FOO > > The SHA-1 for refs/heads/local-FOO (branch created via git checkout -b > local-FOO FOO) doesn't show in gitk --all, but a git log of that shows > it to be a somewhat old commit (not the head, nor the branch point). .git/info/refs is auxiliary information for "dumb" protocols, i.e. for fetching via HTTP etc. It is updated using git-update-server-info, usually in the bare public repositories run from post-update hook (in non-bare you would want to add it also to post-commit). What you should look at is "git show-refs" or "git ls-remote ." output, or "git for-each-ref" output. > The SHA-1 for local-trunk is a similarly old commit > > The SHA-1 for refs/remotes/FOO is the commit right before the SHA-1 > for refs/heads/local-FOO in my git log. That said, if you have two divergent branches 'FOO' and 'trunk', for example with the following history a<---b<---c<---d<---e <--- trunk ^ \---1<---2 <--- FOO you can derive from parent info where history diverged. You can ask git to find branch point using "git merge-base trunk FOO", which should return 'c' (actually, sha-1 of this commit). HTH. -- Jakub Narebski Poland ShadeHawk on #git -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
