Fixing github pull requests that I borked up (page 3)

On Wed, Oct 9, 2013 at 7:43 PM, Walter Bright <walter@digitalmars.com> wrote: > If I do: > > git commit --amend -a > git push origin branchname > > it fails. I have to add the -f. Yes, and that's fine. What is a bit dangerous is leaving the branch name off with -f. David _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals

On Mon, Oct 7, 2013 at 9:44 PM, Walter Bright <walter@digitalmars.com> wrote: > Git, miserable program that it is, has no: > > git undo Actually it does, sort of, but only for local changes: There is "git reflog", which lists all the different locations your HEAD pointed to, and "git reset --hard HEAD@{1}" resets your branch to where it pointed before the last operation. This is more of a handy trick if you know what you are doing than a fail-safe undo feature though. David _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals

On 10/9/2013 3:38 AM, Leandro Lucarella wrote: > GitHub support is pretty crappy, at least according to my experience. > I had a couple of very strange situations too, where things that > shouldn't had happened, happened. And I never got an useful answer or > explanation from them. I had one support thing with them, when I pointed out that some display stopped working with Explorer. They were helpful and quick about fixing it. I'm not denying your experience, just saying that they aren't 100% bad :-) _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals

On 10/9/2013 10:45 AM, David Nadlinger wrote: > On Wed, Oct 9, 2013 at 7:43 PM, Walter Bright <walter@digitalmars.com> wrote: >> If I do: >> >> git commit --amend -a >> git push origin branchname >> >> it fails. I have to add the -f. > Yes, and that's fine. What is a bit dangerous is leaving the branch > name off with -f. > > Point taken, and I won't in the future! (And I do thank everyone here for helping me out with git.) _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals

On Wednesday, October 09, 2013 10:43:39 Walter Bright wrote: > If I do: > > git commit --amend -a > git push origin branchname > > it fails. I have to add the -f. Yeah. That's required, because you altered your branch's history when you did the amend. The same happens if you rebase. -f is required any time you alter your branch's history (rather than simply adding more commits) but should not be required otherwise. - Jonathan M Davis _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals

On 9 okt 2013, at 19:54, Walter Bright <walter@digitalmars.com> wrote: > Point taken, and I won't in the future! > > (And I do thank everyone here for helping me out with git.) Perhaps you should change your git settings for push. Add the following: [push] default = simple To your git config. It's located in your home directory: ~/.gitconfig. With this change it will only push the current branch and if there is a matching branch name in the remote. For more information see: https://www.kernel.org/pub/software/scm/git/docs/git-config.html Search for "push.default". -- /Jacob Carlborg _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals

On Wednesday, October 09, 2013 19:48:48 David Nadlinger wrote: > On Mon, Oct 7, 2013 at 9:44 PM, Walter Bright <walter@digitalmars.com> wrote: > > Git, miserable program that it is, has no: > > git undo > > Actually it does, sort of, but only for local changes: There is "git reflog", which lists all the different locations your HEAD pointed to, and "git reset --hard HEAD@{1}" resets your branch to where it pointed before the last operation. > > This is more of a handy trick if you know what you are doing than a fail-safe undo feature though. Though to be honest, I don't think that anyone should be messing around with resets (especially hard resets) without fully understanding what they're doing. git reset is a very handy feature to be sure, but it also makes it very easy to lose commits if you're not careful. - Jonathan M Davis _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals

On Wed, Oct 9, 2013 at 8:20 PM, Jonathan M Davis <jmdavisProg@gmx.com> wrote: > git reset is a very handy feature to be sure, but it also makes it very easy to lose commits if you're not careful. Losing commits is not a problem thanks to the reflog – losing the current working directory state would be, though. David _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals

October 10, 2013

Re: [dmd-internals] Fixing github pull requests that I borked up

Posted by Brad Roberts
in reply to Leandro Lucarella

Permalink

Brad Roberts

Posted in reply to Leandro Lucarella

Permalink

On 10/9/13 3:38 AM, Leandro Lucarella wrote:
> Brad Roberts, el  8 de October a las 01:26 me escribiste:
>>> I don't know what exactly had happened or how Brad "fixed" this, but I'm pretty sure it's possible
>>> to correctly fix this without breaking the pull requests. Just reset back the history to the sate it
>>> was before the force push. Since you already made a push force, another push force is needed to fix
>>> the problem. Then correctly make the changes you wanted to make.
>>
>> The fix was merely repushing the commit id of the previously head of
>> master back as the current head of master.  Something internal to
>> github's management of pulls got confused at that point.  So far, no
>> response to my support request.
>
> GitHub support is pretty crappy, at least according to my experience.
> I had a couple of very strange situations too, where things that
> shouldn't had happened, happened. And I never got an useful answer or
> explanation from them.

At least in this case, they're being helpful, if a little slower than I'd hoped for.  The pull request I gave them to use as a representative example got merged by Andrei.  Their first cleaned up pull looks good, but it's old enough that it has a merge conflict.  I just gave them another to confirm that their cleanup works which was mergeable before the screw-up and still is.  Assuming it is after they clean up that pull they'll do the rest for us.  Presumably they'll fix the underlying bug too, and I'll follow up on that once we're back in pre-event shape.

More soon,
Brad

_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

Walter Bright, el 9 de October a las 10:52 me escribiste: > > On 10/9/2013 3:38 AM, Leandro Lucarella wrote: > >GitHub support is pretty crappy, at least according to my experience. I had a couple of very strange situations too, where things that shouldn't had happened, happened. And I never got an useful answer or explanation from them. > > I had one support thing with them, when I pointed out that some display stopped working with Explorer. They were helpful and quick about fixing it. I'm not denying your experience, just saying that they aren't 100% bad :-) Is good to know there is hope :) -- Leandro Lucarella (AKA luca) http://llucax.com.ar/ ---------------------------------------------------------------------- GPG Key: 5F5A8D05 (F8CD F9A7 BF00 5431 4145 104C 949E BFB6 5F5A 8D05) ---------------------------------------------------------------------- Señor, usted es militar? - No, no. Tiene un hermano militar? - No, no, no. Tiene algún pariente militar? - No, no, no, no. Tiene algún amigo íntimo militar? - No, no, pero por qué me lo pregunta? Porque me está pisando el pie. -- Tato vs. Tato (1980, Gobierno de Videla) _______________________________________________ dmd-internals mailing list dmd-internals@puremagic.com http://lists.puremagic.com/mailman/listinfo/dmd-internals

Forums