My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 95: Missorted tree during merge in git://android.git.kernel.org/platform/external/elfutils
  Back to list
Status:  Released
Owner:  code-rev...@gtempaccount.com
Closed:  Oct 2012


Sign in to add a comment
 
Reported by code-rev...@gtempaccount.com, Sep 24, 2009
Reported by Shawn Pearce <sop@google.com> on Thu Mar 05 12:57:24 PST 2009
Source: JIRA GERRIT-95

When Gerrit created the b87b11385a190ebde968791b0199e3c406e51135 merge commit
in git://android.git.kernel.org/platform/external/elfutils it sorted libelf
and libelf-po incorrectly:

  040000 tree 8730b5ade4591596c5ae7cd2392d6c6c7351b63f    libelf
  040000 tree fbf8e6374a7f7db596a989654cb01059d524eb82    libelf-po

these should be the other way around, due to the Linus caused "sort
directories as though their name ends with /" rule in Git.
Sep 24, 2009
#1 code-rev...@gtempaccount.com
Comment by Shawn Pearce <sop@google.com> on Thu Mar 05 17:06:27 PST 2009

2 patches posted to git mailing list:

  http://thread.gmane.org/gmane.comp.version-control.git/112362

The first resolves this exact case.
Sep 24, 2009
#2 code-rev...@gtempaccount.com
Update by Shawn Pearce <sop@google.com> on Thu Mar 05 17:06:28 PST 2009
Sep 24, 2009
#3 code-rev...@gtempaccount.com
Comment by Shawn Pearce <sop@google.com> on Sat Mar 07 15:00:18 PST 2009

Fixed by https://review.source.android.com/9093
Sep 24, 2009
#4 code-rev...@gtempaccount.com
Update by Shawn Pearce <sop@google.com> on Sat Mar 07 15:00:18 PST 2009

Fixed in version 2.0.6.
Status: Fixed
Sep 25, 2009
#5 code-rev...@gtempaccount.com
(No comment was entered for this change.)
Labels: FixedIn-2.0.6
Oct 25, 2012
#6 sop@google.com
(No comment was entered for this change.)
Status: Released
Blocking: -gerrit:76
Sign in to add a comment

Powered by Google Project Hosting