aboutsummaryrefslogtreecommitdiff
path: root/devel/got
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@FreeBSD.org>2020-09-25 12:08:15 +0000
committerChristian Weisgerber <naddy@FreeBSD.org>2020-09-25 12:08:15 +0000
commitc3ac752bf3d5c5088e4465032af689cb6deda918 (patch)
tree1e92edab42462803e901d86c67d6b02b1b294a1b /devel/got
parent517ca4f3b89a9a909e770fe38657583dca4316ef (diff)
downloadports-c3ac752bf3d5c5088e4465032af689cb6deda918.tar.gz
ports-c3ac752bf3d5c5088e4465032af689cb6deda918.zip
Update to 0.41. User-visible changes:
- make 'got ref -d' delete both loose and packed representations of the ref - make dangling symbolic references show up in 'got ref -l' - fix handling of slashes in got.conf repository paths - make 'got histedit' collapse folded add+delete operations - fix matching the first object ID listed in a pack index - let 'got clone' try to connect to server before creating repository contents - fix default branch name written to Git config file by 'got clone' - allow an interrupted 'got clone' to be resumed by 'got fetch' - handle failed connection attempts to git:// servers
Notes
Notes: svn path=/head/; revision=550017
Diffstat (limited to 'devel/got')
-rw-r--r--devel/got/Makefile2
-rw-r--r--devel/got/distinfo6
-rw-r--r--devel/got/files/patch-got_got.c12
-rw-r--r--devel/got/files/patch-lib_object__create.c10
-rw-r--r--devel/got/files/patch-lib_worktree.c12
-rw-r--r--devel/got/files/patch-libexec_got-index-pack_got-index-pack.c4
-rw-r--r--devel/got/files/patch-libexec_got-read-gotconfig_parse.y8
-rw-r--r--devel/got/files/patch-tog_tog.c4
8 files changed, 29 insertions, 29 deletions
diff --git a/devel/got/Makefile b/devel/got/Makefile
index 629d96706f34..a8faf6a176f3 100644
--- a/devel/got/Makefile
+++ b/devel/got/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= got
-PORTVERSION= 0.40
+PORTVERSION= 0.41
CATEGORIES= devel
MASTER_SITES= https://gameoftrees.org/releases/
diff --git a/devel/got/distinfo b/devel/got/distinfo
index 9709155eca58..c4fbd43f3371 100644
--- a/devel/got/distinfo
+++ b/devel/got/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600702149
-SHA256 (got-0.40.tar.gz) = 7c587749bb990c9d933808e860fc18a4259861bb82cffac3ead7a4640c77d23b
-SIZE (got-0.40.tar.gz) = 440924
+TIMESTAMP = 1601035123
+SHA256 (got-0.41.tar.gz) = a0d2658d93c77de07bdf7fc3f65e0f25c4bd5332411f3344e27e7f13d1beeee1
+SIZE (got-0.41.tar.gz) = 444454
diff --git a/devel/got/files/patch-got_got.c b/devel/got/files/patch-got_got.c
index de08acf6e9d6..6cf6cdd2adfe 100644
--- a/devel/got/files/patch-got_got.c
+++ b/devel/got/files/patch-got_got.c
@@ -1,6 +1,6 @@
---- got/got.c.orig 2020-09-21 12:09:15 UTC
+--- got/got.c.orig 2020-09-25 11:58:47 UTC
+++ got/got.c
-@@ -213,7 +213,8 @@ main(int argc, char *argv[])
+@@ -215,7 +215,8 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
@@ -10,7 +10,7 @@
if (Vflag) {
got_version_print_str();
-@@ -3883,7 +3884,7 @@ print_diff(void *arg, unsigned char status, unsigned c
+@@ -4022,7 +4023,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;
-@@ -3896,7 +3897,7 @@ print_diff(void *arg, unsigned char status, unsigned c
+@@ -4035,7 +4036,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;
-@@ -9282,11 +9283,11 @@ cat_commit(struct got_object_id *id, struct got_reposi
+@@ -9421,11 +9422,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));
-@@ -9341,7 +9342,7 @@ cat_tag(struct got_object_id *id, struct got_repositor
+@@ -9480,7 +9481,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),
diff --git a/devel/got/files/patch-lib_object__create.c b/devel/got/files/patch-lib_object__create.c
index 93dad5464e30..d2fa398302ae 100644
--- a/devel/got/files/patch-lib_object__create.c
+++ b/devel/got/files/patch-lib_object__create.c
@@ -1,6 +1,6 @@
---- lib/object_create.c.orig 2020-07-25 09:10:27 UTC
+--- lib/object_create.c.orig 2020-09-25 11:58:47 UTC
+++ lib/object_create.c
-@@ -129,7 +129,7 @@ got_object_blob_create(struct got_object_id **id, cons
+@@ -131,7 +131,7 @@ got_object_blob_file_create(struct got_object_id **id,
fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW);
if (fd == -1) {
@@ -9,7 +9,7 @@
return got_error_from_errno2("open", ondisk_path);
if (lstat(ondisk_path, &sb) == -1) {
-@@ -142,7 +142,7 @@ got_object_blob_create(struct got_object_id **id, cons
+@@ -144,7 +144,7 @@ got_object_blob_file_create(struct got_object_id **id,
}
if (asprintf(&header, "%s %lld", GOT_OBJ_LABEL_BLOB,
@@ -18,7 +18,7 @@
err = got_error_from_errno("asprintf");
goto done;
}
-@@ -417,12 +417,12 @@ got_object_commit_create(struct got_object_id **id,
+@@ -440,12 +440,12 @@ got_object_commit_create(struct got_object_id **id,
}
if (asprintf(&author_str, "%s%s %lld +0000\n",
@@ -33,7 +33,7 @@
== -1) {
err = got_error_from_errno("asprintf");
goto done;
-@@ -623,7 +623,7 @@ got_object_tag_create(struct got_object_id **id,
+@@ -646,7 +646,7 @@ got_object_tag_create(struct got_object_id **id,
}
if (asprintf(&tagger_str, "%s%s %lld +0000\n",
diff --git a/devel/got/files/patch-lib_worktree.c b/devel/got/files/patch-lib_worktree.c
index a5e14bdc476b..dccdde2eff96 100644
--- a/devel/got/files/patch-lib_worktree.c
+++ b/devel/got/files/patch-lib_worktree.c
@@ -1,6 +1,6 @@
---- lib/worktree.c.orig 2020-09-11 17:05:16 UTC
+--- lib/worktree.c.orig 2020-09-25 11:58:47 UTC
+++ lib/worktree.c
-@@ -1225,7 +1225,7 @@ replace_existing_symlink(const char *ondisk_path, cons
+@@ -1227,7 +1227,7 @@ replace_existing_symlink(const char *ondisk_path, cons
*/
fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW);
if (fd == -1) {
@@ -9,7 +9,7 @@
return got_error_from_errno2("open", ondisk_path);
/* We are updating an existing on-disk symlink. */
-@@ -1701,9 +1701,9 @@ get_file_status(unsigned char *status, struct stat *sb
+@@ -1703,9 +1703,9 @@ get_file_status(unsigned char *status, struct stat *sb
}
} else {
fd = open(abspath, O_RDONLY | O_NOFOLLOW);
@@ -21,7 +21,7 @@
if (lstat(abspath, sb) == -1)
return got_error_from_errno2("lstat", abspath);
} else if (fd == -1 || fstat(fd, sb) == -1) {
-@@ -3484,7 +3484,7 @@ worktree_status(struct got_worktree *worktree, const c
+@@ -3518,7 +3518,7 @@ worktree_status(struct got_worktree *worktree, const c
fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY);
if (fd == -1) {
if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
@@ -30,7 +30,7 @@
err = got_error_from_errno2("open", ondisk_path);
else
err = report_single_file_status(path, ondisk_path,
-@@ -4156,7 +4156,7 @@ create_patched_content(char **path_outfile, int revers
+@@ -4190,7 +4190,7 @@ create_patched_content(char **path_outfile, int revers
if (dirfd2 != -1) {
fd2 = openat(dirfd2, de_name2, O_RDONLY | O_NOFOLLOW);
if (fd2 == -1) {
@@ -39,7 +39,7 @@
err = got_error_from_errno2("openat", path2);
goto done;
}
-@@ -4170,7 +4170,7 @@ create_patched_content(char **path_outfile, int revers
+@@ -4204,7 +4204,7 @@ create_patched_content(char **path_outfile, int revers
} else {
fd2 = open(path2, O_RDONLY | O_NOFOLLOW);
if (fd2 == -1) {
diff --git a/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c b/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c
index 124649c84b56..93e691a7251f 100644
--- a/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c
+++ b/devel/got/files/patch-libexec_got-index-pack_got-index-pack.c
@@ -1,6 +1,6 @@
---- libexec/got-index-pack/got-index-pack.c.orig 2020-09-11 20:18:20 UTC
+--- libexec/got-index-pack/got-index-pack.c.orig 2020-09-25 11:58:47 UTC
+++ libexec/got-index-pack/got-index-pack.c
-@@ -244,7 +244,7 @@ read_packed_object(struct got_pack *pack, struct got_i
+@@ -246,7 +246,7 @@ read_packed_object(struct got_pack *pack, struct got_i
free(data);
break;
}
diff --git a/devel/got/files/patch-libexec_got-read-gotconfig_parse.y b/devel/got/files/patch-libexec_got-read-gotconfig_parse.y
index 38d12d1d05fd..cd31aac318cd 100644
--- a/devel/got/files/patch-libexec_got-read-gotconfig_parse.y
+++ b/devel/got/files/patch-libexec_got-read-gotconfig_parse.y
@@ -1,6 +1,6 @@
---- libexec/got-read-gotconfig/parse.y.orig 2020-09-21 12:09:15 UTC
+--- libexec/got-read-gotconfig/parse.y.orig 2020-09-25 11:58:47 UTC
+++ libexec/got-read-gotconfig/parse.y
-@@ -61,7 +61,7 @@ int igetc(void);
+@@ -63,7 +63,7 @@ int igetc(void);
int lgetc(int);
void lungetc(int);
int findeol(void);
@@ -9,7 +9,7 @@
TAILQ_HEAD(symhead, sym) symhead = TAILQ_HEAD_INITIALIZER(symhead);
struct sym {
-@@ -123,7 +123,7 @@ boolean : STRING {
+@@ -125,7 +125,7 @@ boolean : STRING {
;
numberstring : NUMBER {
char *s;
@@ -18,7 +18,7 @@
yyerror("string: asprintf");
YYERROR;
}
-@@ -385,7 +385,7 @@ getservice(char *n)
+@@ -387,7 +387,7 @@ getservice(char *n)
}
static int
diff --git a/devel/got/files/patch-tog_tog.c b/devel/got/files/patch-tog_tog.c
index 13342c971645..36787a70bd25 100644
--- a/devel/got/files/patch-tog_tog.c
+++ b/devel/got/files/patch-tog_tog.c
@@ -1,6 +1,6 @@
---- tog/tog.c.orig 2020-09-14 19:31:57 UTC
+--- tog/tog.c.orig 2020-09-25 11:58:47 UTC
+++ tog/tog.c
-@@ -5645,7 +5645,7 @@ main(int argc, char *argv[])
+@@ -5654,7 +5654,7 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;