proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-30 20:39:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3880 from libgit2/ethomson/diff_file

Browse Source 
git_diff_file: move `id_abbrev`
This commit is contained in:
Edward Thomson 2016-08-03 22:00:21 -04:00 committed by GitHub
commit baa87dfc50
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -51,7 +51,6 @@ v0.24 + 1
* `git_blob_create_fromchunks()` has been removed in favour of * `git_blob_create_fromchunks()` has been removed in favour of
`git_blob_create_fromstream()`. `git_blob_create_fromstream()`.
### Breaking API changes ### Breaking API changes
* `git_packbuilder_object_count` and `git_packbuilder_written` now * `git_packbuilder_object_count` and `git_packbuilder_written` now
@ -61,6 +60,9 @@ v0.24 + 1
* `git_packbuiler_progress` now provides explicitly sized `uint32_t` * `git_packbuiler_progress` now provides explicitly sized `uint32_t`
values instead of `unsigned int`. values instead of `unsigned int`.
* `git_diff_file` now includes an `id_abbrev` field that reflects the
number of nibbles set in the `id` field.
v0.24 v0.24
------- -------

12
include/git2/diff.h
View File

@ -268,11 +268,6 @@ typedef enum {
* absent side of a diff (e.g. the `old_file` of a `GIT_DELTA_ADDED` delta), * absent side of a diff (e.g. the `old_file` of a `GIT_DELTA_ADDED` delta),
* then the oid will be zeroes. * then the oid will be zeroes.
* *
* The `id_abbrev` represents the known length of the `id` field, when
* converted to a hex string. It is generally `GIT_OID_HEXSZ`, unless this
* delta was created from reading a patch file, in which case it may be
* abbreviated to something reasonable, like 7 characters.
*
* `path` is the NUL-terminated path to the entry relative to the working * `path` is the NUL-terminated path to the entry relative to the working
* directory of the repository. * directory of the repository.
* *
@ -282,14 +277,19 @@ typedef enum {
* *
* `mode` is, roughly, the stat() `st_mode` value for the item. This will * `mode` is, roughly, the stat() `st_mode` value for the item. This will
* be restricted to one of the `git_filemode_t` values. * be restricted to one of the `git_filemode_t` values.
*
* The `id_abbrev` represents the known length of the `id` field, when
* converted to a hex string. It is generally `GIT_OID_HEXSZ`, unless this
* delta was created from reading a patch file, in which case it may be
* abbreviated to something reasonable, like 7 characters.
*/ */
typedef struct { typedef struct {
git_oid id; git_oid id;
int id_abbrev;
const char *path; const char *path;
git_off_t size; git_off_t size;
uint32_t flags; uint32_t flags;
uint16_t mode; uint16_t mode;
uint16_t id_abbrev;
} git_diff_file; } git_diff_file;
/** /**

6
src/patch_parse.c
View File

@ -192,7 +192,7 @@ static int parse_header_mode(uint16_t *mode, git_patch_parse_ctx *ctx)
static int parse_header_oid( static int parse_header_oid(
git_oid *oid, git_oid *oid,
int *oid_len, uint16_t *oid_len,
git_patch_parse_ctx *ctx) git_patch_parse_ctx *ctx)
{ {
size_t len; size_t len;
@ -202,14 +202,14 @@ static int parse_header_oid(
break; break;
} }
if (len < GIT_OID_MINPREFIXLEN || if (len < GIT_OID_MINPREFIXLEN || len > GIT_OID_HEXSZ ||
git_oid_fromstrn(oid, ctx->line, len) < 0) git_oid_fromstrn(oid, ctx->line, len) < 0)
return parse_err("invalid hex formatted object id at line %d", return parse_err("invalid hex formatted object id at line %d",
ctx->line_num); ctx->line_num);
parse_advance_chars(ctx, len); parse_advance_chars(ctx, len);
*oid_len = (int)len; *oid_len = (uint16_t)len;
return 0; return 0;
} }