git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 6/6] doc: push: explain default=simple correctly

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 31, 2021, 17:31 UTC
Message-ID
<60b51d6c93c7d_279c820856@natae.notmuch>
In-Reply-To
<5fa7e3f4-60a0-c3b1-83f2-054ed38e5683@gmail.com>
Mathias Kunter wrote:
Show 23 quoted lines
> Am 31.05.21 um 17:14 schrieb Felipe Contreras:
> >> In your above example, I'm in centralized workflow, but I can still push
> >> the fix-1 branch to origin without having to configure an upstream
> >> branch for it.
> > 
> > No, you can't:
> > 
> >    % git push
> >    fatal: The current branch fix-1 has no upstream branch.
> >    To push the current branch and set the remote as upstream, use
> > 
> >        git push --set-upstream origin fix-1
> > 
> > Isn't that problem the one you originally described [1]?
> 
> It is.
> 
> > Maybe you are thinking this patch series implements the fix I proposed:
> > it doesn't.
> 
> Yes, I thought so. Sorry for the confusion. When I asked "will your 
> provided patch fix these failing push commands" you answered "It's not 
> really a patch (yet), but yeah: it will". So that's why I thought so.
I have not yet sent the patch to change the current behavior.

First I sent a bunch of patches to reorganize the code so it's more clear what it's actually doing.

Once those patches are merged, then I will probably send the one to change the behavior.

I will include you in the Cc list when I do so.
Show 9 quoted lines
> My point simply is: For the sake of easiness of use, I think the 
> following should work with the default settings of git:
> 
>     git clone $url
>     git checkout -b fix-1
>     # do commits
>     git push           # should push to origin/fix-1
>     # others push to origin/fix-1 (but no local changes)
>     git pull           # should pull from origin/fix-1
I agree.
> Will this be implemented?
It's hard do say, but it probably won't.

All my suggestions for improvement are mostly disregarded, and considering *nobody* has said a word about whether or not the current behavior makes sense, I don't think there are very good chances of changing it.

Consider my last mail "git push default doesn't make sense" [1]: nobody replied.

But maybe that's my fault, because even though I broke the In-Reply-To in order to start a new thread, it seems mail handling software still uses References (incorrectly IMO).

So maybe if I start a new thread completely fresh people will notice, and reply.

I will do so with a patch once I'm done with the reorganization.

In my experience you need to convince either Junio Hamano, or Jeff King for any change in behavior to happen, and until they do comment on this one it's fair to say it won't happen.

Cheers.
[1] https://lore.kernel.org/git/60b15cd2c4136_2183bc20893@natae.notmuch/
-- 
Felipe Contreras
Previous: Mathias KunterNext: Mathias Kunter
Message 18 of 59 in “Unconvolutize push.default=simple”
  1. 0/6 Unconvolutize push.default=simpleFelipe Contreras, May 29, 2021
  2. 1/6 push: hedge code of default=simpleFelipe Contreras, May 29, 2021
  3. Junio C HamanoMay 31, 2021
  4. Felipe ContrerasMay 31, 2021
  5. 4/6 push: simplify setup_push_simple()Felipe Contreras, May 29, 2021
  6. Junio C HamanoMay 31, 2021
  7. 2/6 push: move code to setup_push_simple()Felipe Contreras, May 29, 2021
  8. Junio C HamanoMay 31, 2021
  9. Felipe ContrerasMay 31, 2021
  10. 3/6 push: reorganize setup_push_simple()Felipe Contreras, May 29, 2021
  11. Junio C HamanoMay 31, 2021
  12. 6/6 doc: push: explain default=simple correctlyFelipe Contreras, May 29, 2021
  13. Mathias KunterMay 30, 2021
  14. Felipe ContrerasMay 30, 2021
  15. Mathias KunterMay 31, 2021
  16. Felipe ContrerasMay 31, 2021
  17. Mathias KunterMay 31, 2021
  18. Felipe ContrerasMay 31, 2021
  19. Mathias KunterMay 31, 2021
  20. Felipe ContrerasMay 31, 2021
  21. Mathias KunterMay 31, 2021
  22. Junio C HamanoMay 31, 2021
  23. Felipe ContrerasMay 31, 2021
  24. Junio C HamanoJun 1, 2021
  25. Felipe ContrerasJun 1, 2021
  26. Philip OakleyJun 1, 2021
  27. Felipe ContrerasJun 1, 2021
  28. Philip OakleyJun 1, 2021
  29. Felipe ContrerasJun 1, 2021
  30. Junio C HamanoJun 1, 2021
  31. 5/6 push: remove unused code in setup_push_upstream()Felipe Contreras, May 29, 2021
  32. 00/15 push: revamp push.defaultFelipe Contreras, May 29, 2021
  33. 01/15 push: create new get_upstream_ref() helperFelipe Contreras, May 29, 2021
  34. 02/15 push: return immediately in trivial switch caseFelipe Contreras, May 29, 2021
  35. 03/15 push: reorder switch casesFelipe Contreras, May 29, 2021
  36. Junio C HamanoMay 31, 2021
  37. Felipe ContrerasMay 31, 2021
  38. 04/15 push: factor out null branch checkFelipe Contreras, May 29, 2021
  39. 05/15 push: only get the branch when neededFelipe Contreras, May 29, 2021
  40. Junio C HamanoMay 31, 2021
  41. Felipe ContrerasMay 31, 2021
  42. 06/15 push: make setup_push_* return the dstFelipe Contreras, May 29, 2021
  43. 10/15 push: remove redundant checkFelipe Contreras, May 29, 2021
  44. 08/15 push: get rid of all the setup_push_* functionsFelipe Contreras, May 29, 2021
  45. Junio C HamanoMay 31, 2021
  46. 07/15 push: trivial simplificationsFelipe Contreras, May 29, 2021
  47. 09/15 push: factor out the typical caseFelipe Contreras, May 29, 2021
  48. 11/15 push: fix Yoda conditionFelipe Contreras, May 29, 2021
  49. Junio C HamanoMay 31, 2021
  50. 14/15 push: don't get a full remote objectFelipe Contreras, May 29, 2021
  51. 13/15 push: only get triangular when neededFelipe Contreras, May 29, 2021
  52. Junio C HamanoMay 31, 2021
  53. 12/15 push: remove trivial functionFelipe Contreras, May 29, 2021
  54. 15/15 push: rename !triangular to same_remoteFelipe Contreras, May 29, 2021
  55. Junio C HamanoMay 31, 2021
  56. Philip OakleyMay 29, 2021
  57. Felipe ContrerasMay 30, 2021
  58. Ævar Arnfjörð BjarmasonMay 30, 2021
  59. Felipe ContrerasMay 30, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.