Re: [sqlite] Please help me fix the SQLite Git mirror

> On Apr 23, 2019, at 9:17 AM, Wout Mertens wrote: > > Note that many git clients (https://git-scm.com/downloads/guis/ > ) do allow > you to see the entire DAG, just not GitHub. If you use a Mac, a > particularly great one is https://gitup.co

Re: [sqlite] Please help me fix the SQLite Git mirror

On Tue, Apr 23, 2019 at 1:22 PM Richard Hipp wrote: > The inability to see the entire DAG on a single screen in GitHub is a > persistent source of annoyance > to users like me who are accustomed to Fossil. > Note that many git clients (https://git-scm.com/downloads/guis/) do allow you to see

Re: [sqlite] Please help me fix the SQLite Git mirror

On 4/23/19, Rowan Worth wrote: > > How can you justify the claim that history was unchanged on trunk between > time (1) and time (2)? Short answer: I look at the entire DAG, not individual branches. Long answer: From prior discussion and feedback on this thread, I've come to realize that

Re: [sqlite] Please help me fix the SQLite Git mirror

Richard Hipp wrote (quoting from several emails): > The problem is that Git now thinks that 9b888fcc is the HEAD of master > and that the true continuation of master (check-in 4f35b3b7 and > beyond) are disconnected check-ins > Because from the git perspective it _is_ still the HEAD -- there's

Re: [sqlite] Please help me fix the SQLite Git mirror

I would like to better understand how rewiring the refs this way constitutes "changing history". The refs/heads entries are all ephemeral - they are constantly changing on their own, and no historical record of their past values is retained. The key bit here is that in git, every commit

Re: [sqlite] Please help me fix the SQLite Git mirror

Hi Richard, As Jonathan mentioned, in git land, if you have already published a "mistake" commit publicly, the proper way to revert it is to make another commit to reverse/undo the change. By removing a commit from the public history of the published 'master' branch, it forces everyone

Re: [sqlite] Please help me fix the SQLite Git mirror

On Mon, Apr 22, 2019 at 12:22 PM Richard Hipp wrote: > But before I proceed, I would like to better understand how rewiring > the refs this way constitutes "changing history". The refs/heads > entries are all ephemeral - they are constantly changing on their own, > and no historical record of

Re: [sqlite] Please help me fix the SQLite Git mirror

Thanks for the help. See additional questions and remarks below On 4/22/19, Jonathan Brandmeyer wrote: > ``` > # Construct the matching branch name > git branch mistake 9b888fc > # Push the name alone to the remote > git push -u origin mistake > # Move the name of master > git checkout

Re: [sqlite] Please help me fix the SQLite Git mirror

``` # Construct the matching branch name git branch mistake 9b888fc # Push the name alone to the remote git push -u origin mistake # Move the name of master git checkout master && git reset --hard # Push the new name of master git push --force ``` Git reset --hard will move the name of the

Re: [sqlite] Please help me fix the SQLite Git mirror

On 4/22/19, Jeffrey Schiller wrote: > So if I understand you correctly, you just want to make "master" point to a > particular known commit. To do this, you can issue the commands (in a local > copy): > > git branch -m master oldmaster # Move it out of the way > git branch master 4f35b3b7 > This

Re: [sqlite] Please help me fix the SQLite Git mirror

So if I understand you correctly, you just want to make "master" point to a particular known commit. To do this, you can issue the commands (in a local copy): git branch -m master oldmaster # Move it out of the way git branch master 4f35b3b7 Then do a "git push -f origin master" (assuming that

[sqlite] Please help me fix the SQLite Git mirror

The Git mirror of SQLite found at https://github.com/sqlite/sqlite is busted. I don't know how to fix it and would appreciate advice from people who have more experience with Git internals. To describe the problem, consider this excerpt from the check-in sequence for SQLite: