Skip to content

nd/ita-empty-commit update

Nguyễn Thái Ngọc Duy git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest4 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/4diff-lib: allow ita entries treated as "not yet exist in index"diff-lib.c diff.h t/t2203-add-intent.sh +2 more+38 -40 replies
2/4diff: add --ita-[in]visible-in-indexDocumentation/diff-options.txt diff.c t/t2203-add-intent.sh+15 -10 replies
3/4commit: fix empty commit creation when there's no changes but ita entriesbuiltin/commit.c diff-lib.c diff.h +2 more+18 -50 replies
4/4commit: don't be fooled by ita entries when creating initial commitbuiltin/commit.c t/t2203-add-intent.sh+18 -30 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/4] nd/ita-empty-commit update

This version splits the old 1/3 into two, with better description in 1/4. The index_differs_from() also takes a flag to set/clear this new flag instead of relying on has_ita_entries like the old 2/3.

The name ita-invisible-in-index is not perfect but I could not think of any better. Another name could be diff-cached-ignores-ita, but that's just half of what it does. The other half is diff-files-includes-ita...

Nguyễn Thái Ngọc Duy (4):
Subject: diff-lib: allow ita entries treated as "not yet exist in index"
diff: add --ita-[in]visible-in-index
commit: fix empty commit creation when there's no changes but ita entries
commit: don't be fooled by ita entries when creating initial commit

 Documentation/diff-options.txt |  8 ++++++++
 builtin/commit.c               | 13 +++++++++----
 diff-lib.c                     | 18 +++++++++++++++++-
 diff.c                         |  4 ++++
 diff.h                         |  3 ++-
 sequencer.c                    |  4 ++--
 t/t2203-add-intent.sh          | 41 +++++++++++++++++++++++++++++++++++++++--
 t/t7064-wtstatus-pv2.sh        |  4 ++--
 wt-status.c                    |  7 ++++++-
 9 files changed, 89 insertions(+), 13 deletions(-)
Signature · 1 line
2.8.2.524.g6ff3d78