git.proxmox.com Git - libgit2.git/commit

]> git.proxmox.com Git - libgit2.git/commit

author	Edward Thomson <ethomson@microsoft.com>
	Thu, 9 Jan 2014 02:29:42 +0000 (18:29 -0800)
committer	Edward Thomson <ethomson@microsoft.com>
	Mon, 20 Jan 2014 22:15:11 +0000 (17:15 -0500)
commit	c1d648c5c6361edfb1aa85a31656b628672c7616
tree	f611ff05206f2305c82867514f1e7f22b602c7b7	tree
parent	e49c98e6efaa444ed73ac3b8318a693801f93184	commit \| diff

merge_file should use more aggressive levels

The default merge_file level was XDL_MERGE_MINIMAL, which will
produce conflicts where there should not be in the case where
both sides were changed identically. Change the defaults to be
more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively
compress non-conflicts. This matches git.git's defaults.

Increase testing around reverting a previously reverted commit to
illustrate this problem.

33 files changed:

include/git2/merge.h		diff \| blob \| blame \| history
src/checkout.c		diff \| blob \| blame \| history
src/merge.c		diff \| blob \| blame \| history
src/merge_file.c		diff \| blob \| blame \| history
src/merge_file.h		diff \| blob \| blame \| history
tests/merge/trees/automerge.c		diff \| blob \| blame \| history
tests/merge/trees/trivial.c		diff \| blob \| blame \| history
tests/merge/workdir/simple.c		diff \| blob \| blame \| history
tests/merge/workdir/trivial.c		diff \| blob \| blame \| history
tests/resources/revert/.gitted/index		diff \| blob \| blame \| history
tests/resources/revert/.gitted/objects/0a/d19525be6d8cae5e5deb2770fc244b65255057	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/13/a6fdfd10bd74b1f258fb58801215985dd2e797	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/1b/c915c5cb7185a9438de28a7b1a7dfe8c01ee7f	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/1f/f0c423042b46cb1d617b81efb715defbe8054d	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/21/a96a98ed84d45866e1de6e266fd3a61a4ae9dc	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/39/9fb3aba3d9d13f7d40a9254ce4402067ef3149	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/46/ff0854663aeb2182b9838c8da68e33ac23bc1e	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/5c/f1d643f100d8112834e540264546ba2c159976	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/6b/ccd0dc58cea5ccff86014f3d64b31bd8c02a37	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/71/eb9c2b53dbbf3c45fb28b27c850db4b7fb8011	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/87/59ad453cf01cf7daf14e2a668f8218f9a678eb	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/9a/95fd974e03c5b93828ceedd28755965b5d5c60	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/a8/c86221b400b836010567cc3593db6e96c1a83a	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/ac/c4d33902092efeb3b714aa0b1007c329e2f2e6	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/b6/9d88e177455579896e2be495046e2a51456a9a	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/ca/f99de3a49827117bb66721010eac461b06a80c	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/de/03538407ed18914ff05657eeff70425c0f304d	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/e3/4ef1afe54eb526fd92eec66084125f340f1d65	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/ea/392a157085bc32daccd59aa1998fe2f5fb9fc0	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/objects/ee/c6adcb2f3ceca0cadeccfe01b19382252ece9b	[new file with mode: 0644]	blob
tests/resources/revert/.gitted/refs/heads/master		diff \| blob \| blame \| history
tests/resources/revert/.gitted/refs/heads/two	[new file with mode: 0644]	blob
tests/revert/workdir.c		diff \| blob \| blame \| history

The git library used in some Proxmox tool chains

RSS Atom