Skip to content

status: show default branch comparison when tracking non-default branch

Harald Nordgren via GitGitGadget git 6 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest6 patches 4 repliesIn review
  2. v55 patches 0 repliesSuperseded
  3. v44 patches 0 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v33 patches0 repliesSuperseded
v22 patches4 repliesSuperseded
v11 patch18 repliesSuperseded

Patches in v6 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6status: show comparison with upstream default branchremote.c t/t6040-tracking-info.sh+350 -00 replies
2/6Simplify default branch comparison logicremote.c+19 -400 replies
3/6Use repo.settings.statusGoalBranch config for status comparisonremote.c t/t6040-tracking-info.sh+100 -190 replies
4/6Rename default_remote to goal_branchremote.c+31 -320 replies
5/6Add warning for malformed statusGoalBranch configt/t6040-tracking-info.sh+36 -130 replies
6/6Change config key to status.compareBranchremote.c t/t6040-tracking-info.sh+19 -190 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v6 yet.

Read the v6 thread

Cover letter [PATCH v6 0/6] status: show default branch comparison when tracking non-default branch

cc: Chris Torek [email protected] cc: Yee Cheng Chin [email protected] cc: "brian m. carlson" [email protected]

Harald Nordgren (6):
status: show comparison with upstream default branch Simplify default branch comparison logic
Use repo.settings.statusGoalBranch config for status comparison Rename default_remote to goal_branch
Add warning for malformed statusGoalBranch config Change config key to status.compareBranch

 remote.c                 |  92 +++++++++++
 t/t6040-tracking-info.sh | 340 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 432 insertions(+)

base-commit: c4a0c8845e2426375ad257b6c221a3a7d92ecfda
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2138%2FHaraldNordgren%2Fahead_of_main_status-v6
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2138/HaraldNordgren/ahead_of_main_status-v6
Pull-Request: https://github.com/git/git/pull/2138

Range-diff vs v5:

 1:  a3800aed18 = 1:  a3800aed18 status: show comparison with upstream default branch
 2:  417f2075fb = 2:  417f2075fb Simplify default branch comparison logic
 3:  c9ec5d9610 = 3:  c9ec5d9610 Use repo.settings.statusGoalBranch config for status comparison
 4:  0e308141da = 4:  0e308141da Rename default_remote to goal_branch
 5:  441678939f = 5:  441678939f Add warning for malformed statusGoalBranch config
 -:  ---------- > 6:  242dbbae44 Change config key to status.compareBranch
Signature · 1 line
gitgitgadget