Skip to content

Add git-merge --cleanup support

Denton Liu git 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest4 patches 0 repliesNew
  2. v54 patches 0 repliesSuperseded

Changes in v6 from the cover letter

* Rebase on latest master and resolve merge conflicts

Patches in v6 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4commit: extract cleanup_mode functions to sequencerbuiltin/commit.c sequencer.c sequencer.h+35 -190 replies
2/4t7600: clean up 'merge --squash c3 with c7' testt/t7600-merge.sh+3 -40 replies
3/4merge: cleanup messages like commitDocumentation/merge-options.txt builtin/merge.c builtin/pull.c +3 more+106 -100 replies
4/4merge: add scissors line on merge conflictDocumentation/merge-options.txt builtin/commit.c builtin/merge.c +1 more+78 -60 replies

Reviews trailers per patch

None of the 4 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchSZEDER GáborEric SunshineJunio C HamanoPhillip WoodRamsay Jones
SeriesHelped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by R-b R-b R-b Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by R-b R-b Helped-by Helped-by Helped-by Helped-by Helped-by R-b R-b R-b Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by Helped-by
1/4
2/4Helped-by
3/4
4/4

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v6 thread

Cover letter [PATCH v6 0/4] Add git-merge --cleanup support

There were some merge conflicts since v5 so I've rebased the last few patches on the latest master and fixed the conflicts.

Not related to this but while I was making my changes, I noticed that -F and -m don't die properly in git-merge when they accept invalid arguments. Instead, they just print an error message to stderr and the program keeps running. Is this the expected behaviour?

Changes since V1:
* Only check MERGE_MSG for a scissors line instead of all prepended files
* Make a variable static in merge where appropriate
* Add passthrough options in pull
* Add documentation for the new option
* Add tests to ensure desired behaviour

Changes since V2:
* Merge both patches into one patch
* Fix bug in help message printing logic

Changes since V3:
* Add patch to cleanup 'merge --squash c3 with c7' test in t7600
* Use test_i18ncmp instead of test_cmp to pass GETTEXT_POISON tests

Changes since V4:
* Add patches so that git-merge messages will be cleaned up like in git-commit

Changes since V5:
* Rebase on latest master and resolve merge conflicts

Denton Liu (4):
commit: extract cleanup_mode functions to sequencer
t7600: clean up 'merge --squash c3 with c7' test
merge: cleanup messages like commit
merge: add scissors line on merge conflict

 Documentation/merge-options.txt |  7 ++++
 builtin/commit.c                | 41 +++++++++-------------
 builtin/merge.c                 | 45 ++++++++++++++++++++----
 builtin/pull.c                  |  6 ++++
 sequencer.c                     | 29 ++++++++++++++++
 sequencer.h                     |  4 +++
 t/t7600-merge.sh                | 53 +++++++++++++++++++++++++---
 t/t7604-merge-custom-message.sh | 61 +++++++++++++++++++++++++++++++++
 wt-status.c                     | 12 +++++--
 wt-status.h                     |  1 +
 10 files changed, 221 insertions(+), 38 deletions(-)
Signature · 1 line
2.20.1.3.ge68552ea27.dirty