Skip to content

diff-merges: let -m imply -p

Sergey Organov git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 31 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6t4013: add test for "git diff-index -m"t/t4013-diff-various.sh+13 -00 replies
2/6diff-merges: move specific diff-index "-m" handling to diff-indexbuiltin/diff-index.c diff-merges.c+36 -224 replies
3/6git-svn: stop passing "-m" to "git rev-list"perl/Git/SVN.pm+1 -10 replies
4/6stash list: stop passing "-m" to "git list"builtin/stash.c t/t3903-stash.sh+2 -20 replies
5/6diff-merges: rename "combined_imply_patch" to "merges_imply_patch"diff-merges.c revision.h+6 -60 replies
6/6diff-merges: let -m imply -pDocumentation/diff-options.txt diff-merges.c+5 -427 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [PATCH 0/6] diff-merges: let -m imply -p

Fix long standing inconsistency between -c/--cc that do imply -p, on one side, and -m that did not imply -p, on the other side.

After these patches

git log -m

will start to produce diffs without need to provide -p as well, that improves both consistency and usability. It gets even more useful if one sets "log.diffMerges" configuration variable to "first-parent" to force -m produce usual diff with respect to first parent only.

Previous semantics of -m could still be accessed using --diff-merges=separate option.

First 5 patches in the series are refactoring that is not expected to change existing behavior, and the last one is the actual functional change.

Sergey Organov (6):
t4013: add test for "git diff-index -m"
diff-merges: move specific diff-index "-m" handling to diff-index
git-svn: stop passing "-m" to "git rev-list"
stash list: stop passing "-m" to "git list"
diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
diff-merges: let -m imply -p

 Documentation/diff-options.txt |  8 +++---
 builtin/diff-index.c           | 45 ++++++++++++++++++++++++++--------
 builtin/stash.c                |  2 +-
 diff-merges.c                  | 24 ++++++------------
 perl/Git/SVN.pm                |  2 +-
 revision.h                     |  2 +-
 t/t3903-stash.sh               |  2 +-
 t/t4013-diff-various.sh        | 13 ++++++++++
 8 files changed, 63 insertions(+), 35 deletions(-)
Signature · 1 line
2.25.1