diff options
| author | Christian Hesse | 2018-01-18 09:19:31 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld | 2018-01-19 11:34:43 +0100 |
| commit | 1dd53e3a2ffec730ec27ebe15b3d63e0b417a544 (patch) | |
| tree | c86ffb13ce4b57b03f19b1e513c91417b357ee83 /cgit.c | |
| parent | git: update to v2.15.1 (diff) | |
| download | cgit-1dd53e3a2ffec730ec27ebe15b3d63e0b417a544.tar.gz cgit-1dd53e3a2ffec730ec27ebe15b3d63e0b417a544.zip | |
git: update to v2.16.0
Update to git version v2.16.0: * refs: convert resolve_ref_unsafe to struct object_id (49e61479be913f67e66bb3fdf8de9475c41b58bd) * diff: remove DIFF_OPT_SET macro (23dcf77f48feb49c54bad09210f093a799816334) * log: add option to choose which refs to decorate (65516f586b69307f977cd67cc45513a296cabc25) * diff: convert flags to be stored in bitfields (02f2f56bc377c287c411947d0e1482aac888f8db) Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'cgit.c')
| -rw-r--r-- | cgit.c | 2 |
1 files changed, 1 insertions, 1 deletions
| diff --git a/cgit.c b/cgit.c index 972a67e..a3702c2 100644 --- a/cgit.c +++ b/cgit.c | |||
| @@ -478,7 +478,7 @@ static char *guess_defbranch(void) | |||
| 478 | const char *ref, *refname; | 478 | const char *ref, *refname; |
| 479 | struct object_id oid; | 479 | struct object_id oid; |
| 480 | 480 | ||
| 481 | ref = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL); | 481 | ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL); |
| 482 | if (!ref || !skip_prefix(ref, "refs/heads/", &refname)) | 482 | if (!ref || !skip_prefix(ref, "refs/heads/", &refname)) |
| 483 | return "master"; | 483 | return "master"; |
| 484 | return xstrdup(refname); | 484 | return xstrdup(refname); |