Hi,
This is the 2nd iteration of the 'git notes merge' patch series.
Changes between the 1st WIP/RFC iteration and this version:
- Rebased on top of e93487d which obsoletes patch #7 in the previous
series. AFAICS, it now merges cleanly against "master", and almost
cleanly (modulo one trivial conflict) against "next". If desired,
I can rebase the series onto "next" to avoid the trivial conflict.
- (Jonathan Nieder) Future-proof by always checking add_note() return
value.
- (Stephen Boyd) Simplify argc logic.
- (Stephen Boyd) Use test_commit.
- (Stephen Boyd) Use "automatically resolves" instead of
"auto-resolves".
- Renamed -X/--resolve to -s/--strategy. This is more in line with
'git merge' (although the available strategies are different), and
allows us to use -X for strategy-specific options in the future.
- Documentation: Moved documentation of notes merge strategies into
its own section.
- Implemented manual conflict resolution of notes. Conflicting note
entries are stored in .git/NOTES_MERGE_WORKTREE/*, while the
non-conflicting note entries are committed, and referenced by
.git/NOTES_MERGE_PARTIAL (aka. the partial merge result). When the
conflicts have been edited/fixed, the user calls
'git notes merge --commit' to recombine the partial merge result and
the resolved conflicts to produce the final notes merge result.
Alternatively, the user can call 'git notes merge --reset' to abort
the notes merge.
- Add another auto-resolving notes merge strategy: "cat_sort_uniq"
- Test merging of notes trees at different fanout levels
To be done in later series:
- Handle merging of notes trees with non-notes
- Allow notes merge strategies to be specified (per (group of?) notes
ref) in the config
Some open questions:
- Should we refuse to finalize a notes merge when conflict markers
present in .git/NOTES_MERGE_WORKTREE? Since add/commit in regular
merges does NOT do this, I have not implemented it for notes merge.
- When resolving notes merge conflicts, you can add/remove files/notes
in .git/NOTES_MERGE_WORKTREE; 'git notes merge --commit' does not
check that the notes have any relationship to the notes originally
put there by 'git notes merge'. Should we warn about removed and
added notes in .git/NOTES_MERGE_WORKTREE? Currently we don't, and
I'm not sure it's worth it. Users can always review the merge commit
afterwards.
- Fetching and pushing note refs:
- Add refs/notes/* to default fetch refspec?
- A way to specify (at clone time) which refspec(s) to set up?
- A way for the remote repo to hint at which refspecs you might want
to set up (by default?)
Have fun! :)
...Johan
Johan Herland (18):
(trivial) notes.h: Minor documentation fixes to copy_notes()
notes.h: Make default_notes_ref() available in notes API
notes.h/c: Clarify the handling of notes objects that are == null_sha1
notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
(trivial) t3303: Indent with tabs instead of spaces for consistency
notes.c: Use two newlines (instead of one) when concatenating notes
builtin/notes.c: Split notes ref DWIMmery into a separate function
git notes merge: Initial implementation handling trivial merges only
builtin/notes.c: Refactor creation of notes commits.
git notes merge: Handle real, non-conflicting notes merges
git notes merge: Add automatic conflict resolvers (ours, theirs, union)
Documentation: Preliminary docs on 'git notes merge'
git notes merge: Manual conflict resolution, part 1/2
git notes merge: Manual conflict resolution, part 2/2
git notes merge: List conflicting notes in notes merge commit message
git notes merge: --commit should fail if underlying notes ref has moved
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
git notes merge: Add testcases for merging notes trees at different fanouts
Documentation/git-notes.txt | 81 ++++-
Makefile | 2 +
builtin.h | 2 +-
builtin/notes.c | 245 ++++++++++--
notes-cache.c | 3 +-
notes-merge.c | 718 +++++++++++++++++++++++++++++++++
notes-merge.h | 92 +++++
notes.c | 272 +++++++++-----
notes.h | 47 ++-
t/t3301-notes.sh | 4 +
t/t3303-notes-subtrees.sh | 19 +-
t/t3308-notes-merge.sh | 327 +++++++++++++++
t/t3309-notes-merge-auto-resolve.sh | 647 +++++++++++++++++++++++++++++
t/t3310-notes-merge-manual-resolve.sh | 556 +++++++++++++++++++++++++
t/t3311-notes-merge-fanout.sh | 436 ++++++++++++++++++++
t/t3404-rebase-interactive.sh | 1 +
t/t9301-fast-import-notes.sh | 5 +
17 files changed, 3315 insertions(+), 142 deletions(-)
create mode 100644 notes-merge.c
create mode 100644 notes-merge.h
create mode 100755 t/t3308-notes-merge.sh
create mode 100755 t/t3309-notes-merge-auto-resolve.sh
create mode 100755 t/t3310-notes-merge-manual-resolve.sh
create mode 100755 t/t3311-notes-merge-fanout.sh
--
1.7.3.98.g5ad7d9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html