delta/libgit2.git/tests/merge, branch cmn/diff-binary-patch github.com: libgit2/libgit2.git merge: work around write-side racy protection when hacking the index 2015-06-22T14:11:58+00:00 Carlos Martín Nieto cmn@dwim.me 2015-06-20T11:17:06+00:00 5b05f954242a00077eedcdff8f20a820299deef2 As we attempt to replicate a situation in which an older checkout has put a file on disk with different filtering settings from us, set the timestamp on the entry and file to a second before we're performing the operation so the entry in the index counts as old. This way we can test that we're not looking at the on-disk file when the index has the entry and we detect it as clean. 
As we attempt to replicate a situation in which an older checkout has
put a file on disk with different filtering settings from us, set the
timestamp on the entry and file to a second before we're performing the
operation so the entry in the index counts as old.

This way we can test that we're not looking at the on-disk file when the
index has the entry and we detect it as clean.
merge::workdir::dirty: tick idx to defeat racy-git 2015-06-16T20:39:13+00:00 Edward Thomson ethomson@microsoft.com 2015-06-16T20:34:25+00:00 fef5344c50e33d01c08bec1687cb8a14a2a5efa2 






introduce `git_index_entry_is_conflict`
2015-05-28T13:47:31+00:00

Edward Thomson
ethomson@microsoft.com

2015-05-19T15:23:59+00:00

9f545b9d71c7bd316be80e5fe8b47135e9deb97e

It's not always obvious the mapping between stage level and
conflict-ness.  More importantly, this can lead otherwise sane
people to write constructs like `if (!git_index_entry_stage(entry))`,
which (while technically correct) is unreadable.

Provide a nice method to help avoid such messy thinking.





It's not always obvious the mapping between stage level and
conflict-ness.  More importantly, this can lead otherwise sane
people to write constructs like `if (!git_index_entry_stage(entry))`,
which (while technically correct) is unreadable.

Provide a nice method to help avoid such messy thinking.







merge: merge iterators
2015-05-11T18:11:56+00:00

Edward Thomson
ethomson@microsoft.com

2015-02-19T03:53:40+00:00

9ebb5a3ff31a58a25714fbc98704b0fda0982cdb












Collapse whitespace flags into git_merge_file_flags_t
2015-03-16T07:53:27+00:00

Jacques Germishuys
jacquesg@striata.com

2015-03-12T10:36:09+00:00

13de93631664cd6eec3afedabb7145d5562a3e01












Renamed git_merge_options 'flags' to 'tree_flags'
2015-03-16T07:53:27+00:00

Jacques Germishuys
jacquesg@striata.com

2015-03-12T10:29:47+00:00

f29dde682866c293292ce405fcfef1511ced3f55












Added tests to merge files and branches with whitespace problems and fixes
2015-03-16T07:53:27+00:00

Jacques Germishuys
jacquesg@striata.com

2015-03-09T15:03:03+00:00

0f24cac2b926e4842f6890ee1712ac2d85cc020c












reset: remove reflog message override
2015-03-03T13:40:50+00:00

Carlos Martín Nieto
cmn@dwim.me

2015-01-07T14:16:50+00:00

23a17803b6e3a8bf21f740726ec0a038968da9a1

This function is meant to simulate what git does in the reset command,
so we should include the reflog message in that.





This function is meant to simulate what git does in the reset command,
so we should include the reflog message in that.







Remove the signature from ref-modifying functions
2015-03-03T13:40:50+00:00

Carlos Martín Nieto
cmn@dwim.me

2015-01-07T12:23:05+00:00

659cf2029f322ea876d663d85783b48945227e8f

The signature for the reflog is not something which changes
dynamically. Almost all uses will be NULL, since we want for the
repository's default identity to be used, making it noise.

In order to allow for changing the identity, we instead provide
git_repository_set_ident() and git_repository_ident() which allow a user
to override the choice of signature.





The signature for the reflog is not something which changes
dynamically. Almost all uses will be NULL, since we want for the
repository's default identity to be used, making it noise.

In order to allow for changing the identity, we instead provide
git_repository_set_ident() and git_repository_ident() which allow a user
to override the choice of signature.







merge: lock the index at the start of the merge
2015-02-14T14:25:35+00:00

Edward Thomson
ethomson@microsoft.com

2015-01-18T05:28:53+00:00

8b0ddd5dd90e1d62f32faf14d5cb4bf88f04a095

Always lock the index when we begin the merge, before we write
any of the metdata files.  This prevents a race where another
client may run a commit after we have written the MERGE_HEAD but
before we have updated the index, which will produce a merge
commit that is treesame to one parent.  The merge will finish and
update the index and the resultant commit would not be a merge at
all.





Always lock the index when we begin the merge, before we write
any of the metdata files.  This prevents a race where another
client may run a commit after we have written the MERGE_HEAD but
before we have updated the index, which will produce a merge
commit that is treesame to one parent.  The merge will finish and
update the index and the resultant commit would not be a merge at
all.