git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Confusing git log --- First time bug submission please advise on best practices

From
FSFrancis Stephens <francisstephens@gmail.com>
Date
Feb 6, 2014, 14:02 UTC
Message-ID
<CAJaBJzJeeEKpaTVXv+LnZd49xjnDjU25y9i_3kKNOrRPVbP-wg@mail.gmail.com>

My co-worker has an inconsistent git log output. Please see that attached files for output (I've made a best effort to remove confidential info from them).

Comparing the two log commands we can see that master and originssh/master have a shared common commit at

    <John Doe> (4 hours ago) d85832d
  More pom fixes
The top commit for originssh/master and the second to top for master.

I would expect that both logs would share an _identical_ history from that commit onward. But the log for master contains the following

  <Jeremy Doe> (27 hours ago) 239ea21  (my-work)
  renamed class
  <Jeremy Doe> (28 hours ago) 27750b2
  Merge branch 'master' of
http://githost.companyname-dev.local/trading-development/sports-container-framework
and
  <Jeremy Doe> (2 days ago) a933acb
  white space changes
  <Jeremy Doe> (2 days ago) b5e51e7
  Merge branch 'master' of
http://githost.companyname-dev.local/trading-development/sports-container-framework
  <Jeremy Doe> (2 days ago) 3a0f787
  removed public methods
  <Jeremy Doe> (2 days ago) 4e91130
  added the xml deserialisation

None of which appear in the originssh/master log. Is there a scenario in which this is expected. It was my understanding that any two commits with the same hash have exactly the same history.

Thanks for your time.
Technical details:

He is using the Windows git client version 1.8.5.2.msysgit.0 Running on Windows 7 Every command was run through git bash

Background:

He previously had tortoise-git installed, but I had him uninstall it to solve some ssh problems While uninstalling tortoise-git we also reinstalled git - I don't know what the previous version of git was.

Output of
    git branch -avv
    * master                   6833fd4 Completed merge
      my-work                  239ea21 renamed class
      remotes/origin/HEAD      -> origin/master
      remotes/origin/master    f269789 Cleaning up GIT step 1
      remotes/originssh/master d85832d More pom fixes

The background on the originssh remote branch is that his origin uses an HTTP url which wasn't allowing him to push a large commit. I helped him to create originssh to allow the push to be made.

Next: Vincent van Ravesteijn
Message 1 of 19 in “Confusing git log --- First time bug submission please advise on best practices”
  1. Francis StephensFeb 6, 2014
  2. Vincent van RavesteijnFeb 6, 2014
  3. David KastrupFeb 6, 2014
  4. Francis StephensFeb 7, 2014
  5. Duy NguyenFeb 7, 2014
  6. demerphqFeb 7, 2014
  7. log: add --show-linear-break to help see non-linear historyNguyễn Thái Ngọc Duy, Feb 8, 2014
  8. log: add --nonlinear-barrier to help see non-linear historyNguyễn Thái Ngọc Duy, Mar 17, 2014
  9. Eric SunshineMar 17, 2014
  10. Junio C HamanoMar 17, 2014
  11. Duy NguyenMar 18, 2014
  12. Junio C HamanoMar 18, 2014
  13. 1/2 object.h: centralize object flag allocationNguyễn Thái Ngọc Duy, Mar 20, 2014
  14. 2/2 log: add --show-linear-break to help see non-linear historyNguyễn Thái Ngọc Duy, Mar 20, 2014
  15. Junio C HamanoMar 20, 2014
  16. Duy NguyenMar 21, 2014
  17. 1/2 object.h: centralize object flag allocationNguyễn Thái Ngọc Duy, Mar 25, 2014
  18. 2/2 log: add --show-linear-break to help see non-linear historyNguyễn Thái Ngọc Duy, Mar 25, 2014
  19. Junio C HamanoMar 25, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.