commit 90787c48b35be2a996234ae463a8fdc50404f50a
parent 47d4563ffa34eee9da70a188ad4bc1b63d800928
Author: Oscar Benedito <oscar@oscarbenedito.com>
Date: Tue, 15 Sep 2026 11:29:59 +0200
Merge tag '1.3'
Diffstat:
6 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
MIT/X Consortium License
-(c) 2015-2022 Hiltjo Posthuma <hiltjo@codemadness.org>
-(c) 2020-2021 Oscar Benedito <oscar@oscarbenedito.com>
+(c) 2015-2026 Hiltjo Posthuma <hiltjo@codemadness.org>
+(c) 2020-2026 Oscar Benedito <oscar@oscarbenedito.com>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
.POSIX:
NAME = stagit
-VERSION = 1.2
+VERSION = 1.3
# paths
PREFIX = /usr/local
diff --git a/stagit-index.1 b/stagit-index.1
@@ -1,4 +1,4 @@
-.Dd August 2, 2021
+.Dd May 29, 2026
.Dt STAGIT-INDEX 1
.Os
.Sh NAME
@@ -19,7 +19,7 @@ The basename of the directory is used as the repository name.
The suffix ".git" is removed from the basename, this suffix is commonly used
for "bare" repos.
.Pp
-The content of the follow files specifies the meta data for each repository:
+The content of the following files specifies the metadata for each repository:
.Bl -tag -width Ds
.It .git/description or description (bare repos).
description
diff --git a/stagit-index.c b/stagit-index.c
@@ -181,7 +181,7 @@ main(int argc, char *argv[])
int i, ret = 0, tmp;
if (argc < 2) {
- fprintf(stderr, "%s [repodir...]\n", argv[0]);
+ fprintf(stderr, "usage: %s [repodir...]\n", argv[0]);
return 1;
}
diff --git a/stagit.1 b/stagit.1
@@ -1,4 +1,4 @@
-.Dd August 2, 2021
+.Dd May 29, 2026
.Dt STAGIT 1
.Os
.Sh NAME
@@ -85,7 +85,7 @@ The basename of the directory is used as the repository name.
The suffix ".git" is removed from the basename, this suffix is commonly used
for "bare" repos.
.Pp
-The content of the follow files specifies the metadata for each repository:
+The content of the following files specifies the metadata for each repository:
.Bl -tag -width Ds
.It .git/description or description (bare repo).
description
diff --git a/stagit.c b/stagit.c
@@ -68,7 +68,7 @@ static char *strippedname = "";
static char description[255];
static char cloneurl[1024];
static char *submodules;
-static char *licensefiles[] = { "HEAD:LICENSE", "HEAD:LICENSE.md", "HEAD:COPYING" };
+static char *licensefiles[] = { "HEAD:LICENSE", "HEAD:LICENSE.md", "HEAD:LICENSE.txt", "HEAD:COPYING" };
static char *license;
static char *readmefiles[] = { "HEAD:README", "HEAD:README.md" };
static char *readme;
@@ -881,7 +881,7 @@ printcommitatom(FILE *fp, struct commitinfo *ci, const char *tag)
fputs("</updated>\n", fp);
}
if (ci->summary) {
- fputs("<title type=\"text\">", fp);
+ fputs("<title>", fp);
if (tag && tag[0]) {
fputs("[", fp);
xmlencode(fp, tag, strlen(tag));
@@ -901,7 +901,7 @@ printcommitatom(FILE *fp, struct commitinfo *ci, const char *tag)
fputs("</email>\n</author>\n", fp);
}
- fputs("<content type=\"text\">", fp);
+ fputs("<content>", fp);
fprintf(fp, "commit %s\n", ci->oid);
if (ci->parentoid[0])
fprintf(fp, "parent %s\n", ci->parentoid);
@@ -1279,7 +1279,7 @@ writerefs(FILE *fp)
void
usage(char *argv0)
{
- fprintf(stderr, "%s [-c cachefile | -l commits] "
+ fprintf(stderr, "usage: %s [-c cachefile | -l commits] "
"[-u baseurl] repodir\n", argv0);
exit(1);
}
@@ -1364,8 +1364,7 @@ main(int argc, char *argv[])
/* find HEAD */
if (!git_revparse_single(&obj, repo, "HEAD"))
- head = git_object_id(obj);
- git_object_free(obj);
+ head = git_object_id(obj); /* NOTE: do not git_object_free(), it is used below */
/* use directory name as name */
if ((name = strrchr(repodirabs, '/')))
