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

[PATCH 0/6] Reroll of rr/triangular-push-fix

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 24, 2013, 04:33 UTC
Message-ID
<1372048388-16742-1-git-send-email-gitster@pobox.com>

This is mostly Ram's triangular-push-fix series, but the fix-up commits I queued on top of it when the series was queued to 'pu' have been squashed in.

  [PATCH 1/6] t/t5528-push-default: remove redundant test_config lines
  No changes, as posted by Ram.
  [PATCH 2/6] config doc: rewrite push.default section
  Reorganization (including moving of 'matching' to the end) is Ram's,
  but otherwise moderately rewritten.
  [PATCH 3/6] push: change `simple` to accommodate triangular workflows
  Sqaushed in the fix to keep the semantics of "simple" when used in
  the centralized workflow the same as before.
  [PATCH 4/6] t/t5528-push-default: generalize test_push_*
  As posted by Ram.
  [PATCH 5/6] t/t5528-push-default: test pushdefault workflows
  A style fix from the review, and comment tweaks to describe what
  each tests mean better.
  [PATCH 6/6] push: honor branch.*.push
  This is new.  It probably needs tests and docs.

I am trying this myself primarily because this changes the plan for Git 2.0 and jc/push-2.0-default-to-simple topic needs to be redone, but before we can do so, we need to see this topic solidify enough.

Junio C Hamano (1):
  push: honor branch.*.push
Ramkumar Ramachandra (5):
  t/t5528-push-default: remove redundant test_config lines
  config doc: rewrite push.default section
  push: change `simple` to accommodate triangular workflows
  t/t5528-push-default: generalize test_push_*
  t/t5528-push-default: test pushdefault workflows
 Documentation/config.txt | 80 ++++++++++++++++++++++++++++++------------------
 builtin/push.c           | 59 +++++++++++++++++++++++++++--------
 remote.c                 |  5 +++
 remote.h                 |  2 ++
 t/t5528-push-default.sh  | 65 ++++++++++++++++++++++++++++++++++++---
 5 files changed, 165 insertions(+), 46 deletions(-)
-- 
1.8.3.1-721-g0a353d3
Next: Junio C Hamano
Message 1 of 36 in “Reroll of rr/triangular-push-fix”
  1. 0/6 Reroll of rr/triangular-push-fixJunio C Hamano, Jun 24, 2013
  2. 1/6 t/t5528-push-default: remove redundant test_config linesJunio C Hamano, Jun 24, 2013
  3. 2/6 config doc: rewrite push.default sectionJunio C Hamano, Jun 24, 2013
  4. 3/6 push: change `simple` to accommodate triangular workflowsJunio C Hamano, Jun 24, 2013
  5. Johan HerlandJun 24, 2013
  6. Junio C HamanoJun 24, 2013
  7. Ramkumar RamachandraJun 24, 2013
  8. Johan HerlandJun 24, 2013
  9. Ramkumar RamachandraJun 24, 2013
  10. Junio C HamanoJun 24, 2013
  11. Johan HerlandJun 24, 2013
  12. 4/6 t/t5528-push-default: generalize test_push_*Junio C Hamano, Jun 24, 2013
  13. Johan HerlandJun 24, 2013
  14. Junio C HamanoJun 24, 2013
  15. Johan HerlandJun 24, 2013
  16. Eric SunshineJun 24, 2013
  17. Johan HerlandJun 24, 2013
  18. Junio C HamanoJun 24, 2013
  19. 5/6 t/t5528-push-default: test pushdefault workflowsJunio C Hamano, Jun 24, 2013
  20. 6/6 push: honor branch.*.pushJunio C Hamano, Jun 24, 2013
  21. Johan HerlandJun 24, 2013
  22. Junio C HamanoJun 24, 2013
  23. Ramkumar RamachandraJun 24, 2013
  24. Junio C HamanoJun 24, 2013
  25. Ramkumar RamachandraJun 24, 2013
  26. Johan HerlandJun 24, 2013
  27. Junio C HamanoJun 24, 2013
  28. Junio C HamanoJun 24, 2013
  29. Ramkumar RamachandraJun 24, 2013
  30. Junio C HamanoJun 24, 2013
  31. Ramkumar RamachandraJun 24, 2013
  32. Junio C HamanoJun 24, 2013
  33. Ramkumar RamachandraJun 24, 2013
  34. Ramkumar RamachandraJun 24, 2013
  35. Junio C HamanoJun 24, 2013
  36. Ramkumar RamachandraJun 24, 2013

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.