On 29/04/17 10:16, Hannu Nyman wrote:
I think that I have stumbled upon a possible force-push that has been done on LEDE git master branch yesterday.I submitted yesterday two LEDE PRs in Github and got notified today that they contain extra commits.https://github.com/lede-project/source/pull/1076#issuecomment-298112905After investigation, it looks like I have pulled two commits from LEDE master and the two commits have since then been overwritten by a new commit in LEDE master. History has been changed :-(The two extra commits are not my commits, but I see them in my local clean "only do PRs for Github" repo as the current (as of yesterday) reference for LEDE master upstream HEAD. The two commits are authored and committed by Alexander Couzens on Friday 28 April. In upstream they have been now replaced by a new commit from Hans Dedecker.
initial thought would be that lynxsis pushed to the github tree. this is not the master and does get force pushed from the git.lede-project.org tree. all commits need to be pushed to that latter tree or they will get lost.
John
Currently those two commits do not exist any more in upstream.But they are visible e.g. in my Github fork that was updated yesterday when doing the PRs.https://github.com/hnyman/source @Alexander Couzens: are those two commits valid? Should they still be in the LEDE master? commit 01c411ae0e8d004867766e8edb2e11ca4f40dd8a Author: Alexander Couzens <lyn...@fe80.eu> AuthorDate: Fri Apr 28 14:34:46 2017 +0200 Commit: Alexander Couzens <lyn...@fe80.eu> CommitDate: Fri Apr 28 14:46:35 2017 +0200 uboot-omap: rename patch to 101-disable-thumb-omap3.patch commit 17837d02edb38d4da93df5a9c3545b5779a0a003 Author: Alexander Couzens <lyn...@fe80.eu> AuthorDate: Fri Apr 28 14:27:45 2017 +0200 Commit: Alexander Couzens <lyn...@fe80.eu> CommitDate: Fri Apr 28 14:45:44 2017 +0200 uboot-omap: enable thumb for overoCurrent upstream history for LEDE master, which has a new commit from Hans Dedecker after the previous one that is common to the history that I have:commit c45ef702ff3d4fd79b788823719cda356b9088c5 Author: Hans Dedecker <dedec...@gmail.com> odhcpd: update to git HEAD version (FS#656,FS#595) commit 9412fc294995ae2543fabf84d2ce39a80bfb3bd6 Author: Hans Dedecker <dedec...@gmail.com> dnsmasq: support dhcp_option config as a list History for LEDE master in my local repo and Github fork: commit 01c411ae0e8d004867766e8edb2e11ca4f40dd8a Author: Alexander Couzens <lyn...@fe80.eu> uboot-omap: rename patch to 101-disable-thumb-omap3.patch commit 17837d02edb38d4da93df5a9c3545b5779a0a003 Author: Alexander Couzens <lyn...@fe80.eu> uboot-omap: enable thumb for overo commit 9412fc294995ae2543fabf84d2ce39a80bfb3bd6 Author: Hans Dedecker <dedec...@gmail.com> dnsmasq: support dhcp_option config as a listIt would be great if LEDE master could be protected against force-push. Packages and LuCI feed repos have been protected against force-push by using the "protected branch" feature of Github, but I do not think that the same is easily possible for git.lede-project.org_______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
_______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
