On Mon, Dec 5, 2016 at 10:06 PM, Jean-Louis MONTEIRO [via TomEE & OpenEJB] < [email protected]> wrote:
> You mean locally or on the server? > This information is only kept in the local repository. It is not shared with others on pull/push. It is very useful for recovering from situations where rewriting the commit history, deleting branches, etc. didn't go as planned and there are no backup branches/tags. The file .git/logs/HEAD is always there and it is useful when the branch files are gone after deleting a branch. These files are just the implementation of the git "reflog" command. Here are few links that show how it might be used. http://stackoverflow.com/questions/17857723/whats-the-difference-between-git-reflog-and-log http://alblue.bandlem.com/2011/05/git-tip-of-week-reflogs.html https://git-scm.com/docs/git-reflog > I was wondering if Infra could help on this or not. > > Just out of curiosity, what is Infra. I'm not familiar with what it refers to. Best, Shahim > JLouis > > -- > Jean-Louis Monteiro > http://twitter.com/jlouismonteiro > http://www.tomitribe.com > > On Mon, Dec 5, 2016 at 7:39 PM, Shahim Essaid <[hidden email] > <http:///user/SendEmail.jtp?type=node&node=4680682&i=0>> wrote: > > > Is using the git log files under .git/logs/* not an option for finding > the > > needed SHAs? Git keeps all SHA changes for any branch in these files > for > > some time (I think 30 days by default) so that the objects are not > garbage > > collected. Any SHA in these files still counts as a reference to the git > > commits and they should be available on the machine where the changes > where > > made. > > > > Shahim > > > > On Mon, Dec 5, 2016 at 10:14 AM, Romain Manni-Bucau [via TomEE & > OpenEJB] < > > [hidden email] <http:///user/SendEmail.jtp?type=node&node=4680682&i=1>> > wrote: > > > > > if you have the old history you can cherry pick it but guess we want > to > > > enforce the consistency with master instead of ensure 1.7 and 7.x > forks - > > > was actually one of the goal of the initial commit. > > > > > > > > > Romain Manni-Bucau > > > @rmannibucau <https://twitter.com/rmannibucau> | Blog > > > <https://blog-rmannibucau.rhcloud.com> | Old Blog > > > <http://rmannibucau.wordpress.com> | Github <https://github.com/ > > > rmannibucau> | > > > LinkedIn <https://www.linkedin.com/in/rmannibucau> | JavaEE Factory > > > <https://javaeefactory-rmannibucau.rhcloud.com> > > > > > > 2016-12-05 19:26 GMT+01:00 David Blevins <[hidden email] > > > <http:///user/SendEmail.jtp?type=node&node=4680676&i=0>>: > > > > > > > Is there a way to get the commit back? > > > > > > > > > > > > -- > > > > David Blevins > > > > http://twitter.com/dblevins > > > > http://www.tomitribe.com > > > > > > > > > On Dec 5, 2016, at 5:13 AM, Romain Manni-Bucau <[hidden email] > > > <http:///user/SendEmail.jtp?type=node&node=4680676&i=1>> > > > > wrote: > > > > > > > > > > +1 > > > > > > > > > > note that if you have the history you can still get back the > commits > > > from > > > > > their hash (but for this one i lost them and JL didnt have them > but > > > > wanted > > > > > to fix 1.7.x branch asap) > > > > > > > > > > > > > > > Romain Manni-Bucau > > > > > @rmannibucau <https://twitter.com/rmannibucau> | Blog > > > > > <https://blog-rmannibucau.rhcloud.com> | Old Blog > > > > > <http://rmannibucau.wordpress.com> | Github <https://github.com/ > > > > rmannibucau> | > > > > > LinkedIn <https://www.linkedin.com/in/rmannibucau> | JavaEE > Factory > > > > > <https://javaeefactory-rmannibucau.rhcloud.com> > > > > > > > > > > 2016-12-05 14:06 GMT+01:00 Jonathan Gallimore < > > > > [hidden email] <http:///user/SendEmail.jtp? > > type=node&node=4680676&i=2>> > > > > > : > > > > > > > > > >> Raising this to the top level, as opposed to being inside another > > > > thread... > > > > >> > > > > >> We had have a git reset --hard HEAD^X issued against the > tomee-1.7.x > > > > >> branch. The upshot is that although the commits in question are > in > > > the > > > > >> repository somewhere, they no longer show up in the history for > that > > > > >> branch. > > > > >> > > > > >> This appears to be a fix for a completely unintentional merge > from > > > > master, > > > > >> but I think we should avoid resetting heads or deleting commits > > > through > > > > any > > > > >> other means in the future. > > > > >> > > > > >> For reference, the discussion about this is here: > > > > >> http://tomee-openejb.979440.n4.nabble.com/today-s-git- > > > > >> commits-noise-td4680661.html > > > > >> > > > > >> Jon > > > > >> > > > > > > > > > > > > > > > > > ------------------------------ > > > If you reply to this email, your message will be added to the > discussion > > > below: > > > http://tomee-openejb.979440.n4.nabble.com/Commit-deletion- > > > tp4680672p4680676.html > > > To start a new topic under TomEE Dev, email > ml-node+s979440n982480h66@n4. > > > nabble.com > > > To unsubscribe from TomEE Dev, click here > > > <http://tomee-openejb.979440.n4.nabble.com/template/ > > NamlServlet.jtp?macro=unsubscribe_by_code&node=982480&code= > > c2hhaGltQGVzc2FpZC5jb218OTgyNDgwfDg2MDQwMTM5NA==> > > > . > > > NAML > > > <http://tomee-openejb.979440.n4.nabble.com/template/ > > NamlServlet.jtp?macro=macro_viewer&id=instant_html% > > 21nabble%3Aemail.naml&base=nabble.naml.namespaces. > > BasicNamespace-nabble.view.web.template.NabbleNamespace- > > nabble.view.web.template.NodeNamespace&breadcrumbs= > > notify_subscribers%21nabble%3Aemail.naml-instant_emails% > > 21nabble%3Aemail.naml-send_instant_email%21nabble%3Aemail.naml> > > > > > > > > > > > > > -- > > View this message in context: http://tomee-openejb.979440. > > n4.nabble.com/Commit-deletion-tp4680672p4680678.html > > Sent from the TomEE Dev mailing list archive at Nabble.com. > -- > Jean-Louis Monteiro > http://twitter.com/jlouismonteiro > http://www.tomitribe.com > > > ------------------------------ > If you reply to this email, your message will be added to the discussion > below: > http://tomee-openejb.979440.n4.nabble.com/Commit-deletion- > tp4680672p4680682.html > To start a new topic under TomEE Dev, email ml-node+s979440n982480h66@n4. > nabble.com > To unsubscribe from TomEE Dev, click here > <http://tomee-openejb.979440.n4.nabble.com/template/NamlServlet.jtp?macro=unsubscribe_by_code&node=982480&code=c2hhaGltQGVzc2FpZC5jb218OTgyNDgwfDg2MDQwMTM5NA==> > . > NAML > <http://tomee-openejb.979440.n4.nabble.com/template/NamlServlet.jtp?macro=macro_viewer&id=instant_html%21nabble%3Aemail.naml&base=nabble.naml.namespaces.BasicNamespace-nabble.view.web.template.NabbleNamespace-nabble.view.web.template.NodeNamespace&breadcrumbs=notify_subscribers%21nabble%3Aemail.naml-instant_emails%21nabble%3Aemail.naml-send_instant_email%21nabble%3Aemail.naml> > -- View this message in context: http://tomee-openejb.979440.n4.nabble.com/Commit-deletion-tp4680672p4680684.html Sent from the TomEE Dev mailing list archive at Nabble.com.
