Ything-RepoMirrors/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-01-25 11:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: drop bitfields in git_remote_fetch_options

Browse Source 
In attempting to make a clever change that added fetch options as flags,
while keeping ABI and API compatibility, we screwed up. Bitfields in
structs are implementation-specific and are not necessarily ABI
compatible across compilers.

Make `update_fetchhead` a flags value which is weirdly named, but
that's a future problem. This removes the `report_unchanged` option from
API.
This commit is contained in:
Edward Thomson
2024-05-06 15:46:21 +01:00
parent e5e233caed
commit 2d649ccd23
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/git2/remote.h
View File

@@ -746,8 +746,7 @@ typedef struct {
/**
* How to handle reference updates; see `git_remote_update_flags`.
*/
unsigned int update_fetchhead : 1,
report_unchanged : 1;
unsigned int update_fetchhead;
/**
* Determines how to behave regarding tags on the remote, such
@@ -790,8 +789,7 @@ typedef struct {
GIT_FETCH_OPTIONS_VERSION, \
GIT_REMOTE_CALLBACKS_INIT, \
GIT_FETCH_PRUNE_UNSPECIFIED, \
1, \
0, \
GIT_REMOTE_UPDATE_FETCHHEAD, \
GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED, \
GIT_PROXY_OPTIONS_INIT }

7
src/libgit2/remote.c
View File

@@ -1376,12 +1376,7 @@ int git_remote_fetch(
return error;
if (opts) {
if (opts->update_fetchhead)
update_flags |= GIT_REMOTE_UPDATE_FETCHHEAD;
if (opts->report_unchanged)
update_flags |= GIT_REMOTE_UPDATE_REPORT_UNCHANGED;
update_flags = opts->update_fetchhead;
tagopt = opts->download_tags;
}