diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-19 11:23:59 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:47:31 -0400 |
| commit | 9f545b9d71c7bd316be80e5fe8b47135e9deb97e (patch) | |
| tree | d2cf3279b4fd716fcea963a2a0118dd522a52270 /CHANGELOG.md | |
| parent | 2f1080ea04ad1235efcd4b213dbe3a1b847644f7 (diff) | |
| download | libgit2-9f545b9d71c7bd316be80e5fe8b47135e9deb97e.tar.gz | |
introduce `git_index_entry_is_conflict`
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.
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 03e5273ed..cdd1a5d27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -108,6 +108,10 @@ support for HTTPS connections insead of OpenSSL. `GIT_STATUS_CONFLICTED` to indicate that a conflict exists for that file in the index. +* `git_index_entry_is_conflict()` is a utility function to determine if + a given index entry has a non-zero stage entry, indicating that it is + one side of a conflict. + ### API removals * `git_remote_save()` and `git_remote_clear_refspecs()` has been |