summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2010-11-14 23:57:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-17 21:22:53 (GMT)
commita6a09095a08339afc8468d053ff978ed4662a1d5 (patch)
tree915beb0e1f4fbe5fe5932b8188a1ac983c7ed786 /notes-merge.c
parent6cfd6a9dea889707fa207ee2003010c3b56b2131 (diff)
downloadgit-a6a09095a08339afc8468d053ff978ed4662a1d5.zip
git-a6a09095a08339afc8468d053ff978ed4662a1d5.tar.gz
git-a6a09095a08339afc8468d053ff978ed4662a1d5.tar.bz2
git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
This new strategy is similar to "concatenate", but in addition to concatenating the two note candidates, this strategy sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the "cat | sort | uniq" shell pipeline to the two note candidates. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicate lines in the merge result. Note that if either of the note candidates contain duplicate lines _prior_ to the merge, these will also be removed by this merge strategy. The patch also contains tests and documentation for the new strategy. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
-rw-r--r--notes-merge.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/notes-merge.c b/notes-merge.c
index 459b1c2..71c4d45 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -453,6 +453,13 @@ static int merge_one_change(struct notes_merge_options *o,
die("failed to concatenate notes "
"(combine_notes_concatenate)");
return 0;
+ case NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ:
+ OUTPUT(o, 2, "Concatenating unique lines in local and remote "
+ "notes for %s", sha1_to_hex(p->obj));
+ if (add_note(t, p->obj, p->remote, combine_notes_cat_sort_uniq))
+ die("failed to concatenate notes "
+ "(combine_notes_cat_sort_uniq)");
+ return 0;
}
die("Unknown strategy (%i).", o->strategy);
}