----- Original Nachricht ---- Von: Jeremy Baron <[email protected]> An: Pywikipedia discussion list <[email protected]> Datum: 05.09.2013 18:57 Betreff: Re: [Pywikipedia-l] Git error message
> On Sep 5, 2013 12:44 PM, <[email protected]> wrote: > > Jeremy, I did some pushes which where done without any problems. Then I > sometimes get that messages. I deleted the clones several times and started > a new try over and over again. But I did not found the point. Really I am > tired with that stuff. Could we get svn back please. > > so then maybe you don't have the hook installed at all. it must be > reinstalled every time you reclone. Yes, I always did it after cloning > > > git bash doesn't work with refs/for/master review because it seems to > redirect it to refs/refs/for/master. Obmitting refs/ creates a new > directory /for/master. I'ts very strange. > > Well I don't have Windows here and don't have much free time through the > end of the weekend but I would love to dig into that more. You should bring > these issues first to IRC when you encounter them; there's usually someone > around to help. (I'll be back on Monday and feel free to highlight me then. > (e.g. say 'jeremyb' in #pywikipediabot on freenode)) > I played a bit with git and could push some changes after the following try: $ git pull "origin" master From ssh://gerrit.wikimedia.org:29418/pywikibot/compat * branch master -> FETCH_HEAD Already up-to-date $ git pull --rebase There is no tracking information for the current branch. Please specify which branch you want to rebase against. See git-pull(1) for details git pull <remote> <branch> If you wish to set tracking information for this branch you do so with: git branch --set-upstream master origin/<branch> $ git push warning: push.default is unset; its implicit value is changing in Git 2.0 from 'matching' to 'upstream'. To squelch this message and maintain the current behavior after the default changes, use: git config --global push.default matching To squelch this message and adopt the new behavior now, use: git config --global push.default upstream See 'git help config' and search for 'push.default' for further information. Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (7/7), 878 bytes, done. Total 7 (delta 3), reused 0 (delta 0) remote: Resolving deltas: 100% (3/3) remote: Processing changes: closed: 2, refs: 1, done To ssh://[email protected]:29418/pywikibot/compat f9f28e8..b1b0531 master -> master # with this command the last push was merged without any review [1] # but afterwards I could push a new commit which I tried before without success: [2] tortoisegit git commit [ammend last commit] tortoisegit push master -> refs/for/master Awaiting the next failure. Best regards xqt [1] https://gerrit.wikimedia.org/r/#/c/82256/ [2] https://gerrit.wikimedia.org/r/#/c/83068/ _______________________________________________ Pywikipedia-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
