On Fri, Nov 12, 2021 at 2:08 AM Rob Landley <r...@landley.net> wrote:
> Also, Android.bp says to run ./regenerate.sh which isn't there when I "git > clone > https://android.googlesource.com/platform/external/toybox" but _is_ there > in the > aosp full repo checkout I haven't updated since july, and I thought "maybe > it > got renamed to post_update.sh?" but when I do a "git log post_update.sh" > it only > shows 2 commits and when I do a "git log --follow post_update.sh" it shows > NOTHING...? (I did a fresh checkout to make sure my android toybox dir > hadn't > gone weird and yes: git is being strange, and I am REALLY confused now.) > It looks like regenerate.sh was renamed to post_update.sh in this Gerrit change: https://android-review.googlesource.com/c/platform/external/toybox/+/1835530/ This change is commit 7cc7771c12. It's a merge commit, which seems to be affecting git somehow. I found the CL by hand using gitk. "git log -- regenerate.sh" shows nothing, but "git log -- post_update.sh" finds this merge commit. "git show 7cc7771c12" reports this for the rename: diff --cc post_update.sh index 689a482a,00000000..689a482a mode 100755,000000..100755 --- a/post_update.sh +++ b/post_update.sh "git log 7cc7771c12 -- regenerate.sh" shows nothing. "git log 7cc7771c12 --follow -- regenerate.sh" shows 3 old commits. "git log 7cc7771c12~1 -- regenerate.sh" shows the same 3 old commits. -Ryan
_______________________________________________ Toybox mailing list Toybox@lists.landley.net http://lists.landley.net/listinfo.cgi/toybox-landley.net