diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2020-09-21 15:40:04 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2020-09-21 15:40:04 +0000 |
| commit | defdab04c15540f28cb8a2a76c3251e1d126baba (patch) | |
| tree | 6ac05b9c52b1ce743e83402d987dc990df66e19d /devel/got/files/patch-got_got.c | |
| parent | Mark as broken on FreeBSD 11.4 amd64 (diff) | |
Update to 0.40. User-visible changes:
- document our default choice of text editor
- fix got.conf overriding GOT_AUTHOR even if no author is set in got.conf
- fix crash in got_free_gotconfig()
- print newline to clear the bottom line when tog exits
Diffstat (limited to 'devel/got/files/patch-got_got.c')
| -rw-r--r-- | devel/got/files/patch-got_got.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/devel/got/files/patch-got_got.c b/devel/got/files/patch-got_got.c index a35ffc028d8e..de08acf6e9d6 100644 --- a/devel/got/files/patch-got_got.c +++ b/devel/got/files/patch-got_got.c @@ -1,4 +1,4 @@ ---- got/got.c.orig 2020-09-14 13:58:27 UTC +--- got/got.c.orig 2020-09-21 12:09:15 UTC +++ got/got.c @@ -213,7 +213,8 @@ main(int argc, char *argv[]) @@ -10,7 +10,7 @@ if (Vflag) { got_version_print_str(); -@@ -3884,7 +3885,7 @@ print_diff(void *arg, unsigned char status, unsigned c +@@ -3883,7 +3884,7 @@ print_diff(void *arg, unsigned char status, unsigned c if (dirfd != -1) { fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW); if (fd == -1) { @@ -19,7 +19,7 @@ err = got_error_from_errno2("openat", abspath); goto done; -@@ -3897,7 +3898,7 @@ print_diff(void *arg, unsigned char status, unsigned c +@@ -3896,7 +3897,7 @@ print_diff(void *arg, unsigned char status, unsigned c } else { fd = open(abspath, O_RDONLY | O_NOFOLLOW); if (fd == -1) { @@ -28,7 +28,7 @@ err = got_error_from_errno2("open", abspath); goto done; -@@ -9283,11 +9284,11 @@ cat_commit(struct got_object_id *id, struct got_reposi +@@ -9282,11 +9283,11 @@ cat_commit(struct got_object_id *id, struct got_reposi } fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR, got_object_commit_get_author(commit), @@ -42,7 +42,7 @@ logmsg = got_object_commit_get_logmsg_raw(commit); fprintf(outfile, "messagelen %zd\n", strlen(logmsg)); -@@ -9342,7 +9343,7 @@ cat_tag(struct got_object_id *id, struct got_repositor +@@ -9341,7 +9342,7 @@ cat_tag(struct got_object_id *id, struct got_repositor fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER, got_object_tag_get_tagger(tag), |