Commits
- Commit:
c639c9205a410cf7f3535d3ae7f17d2483f2bdfa
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
the my_refs reflist in delete_missing_refs() must be freed on exit
- Commit:
0a58e7222f591acd7479040f317f1e0e0e9d132e
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sync usage with reality
The -h and -V/--version flags must be given before the command; with
those flags the command is actually optional, but don't over-complicate
the usage string with these nitpicks.
ok/improvements stsp@
- Commit:
885707edec53f628c3039c20031c89670d36d2f6
- From:
- Josh Rickmar <jrick@zettaport.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
disallow integrating into references outside refs/heads/
Spotted by stsp@ while considering a feature request for
cmd_integrate.
ok stsp@
- Commit:
6d054bb9e38d22dc37c9141e75db6b8b9cd7ca9b
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
show file mode for new added files in work tree diffs
Make work tree diffs of local changes on disk display the file mode of new
added files like other versions of `got diff` currently do.
ok stsp@
- Commit:
e9424ba1b8bca2f931b594e9afef1192ad5cce27
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add gotadmin init -b <branch> to specify repo head ref
Similar to `git init -b`. Includes a change to `got import` behaviour such that
"main" is no longer hardcoded by default; instead, we import to the branch
resolved via the repository's HEAD reference unless `got import -b` is used,
and only if HEAD cannot be resolved to a branch do we fallback to "main".
includes fix plus ok from stsp@
- Commit:
7210b7156b950b1b2c0055beb00fab4b3e442317
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make got_commit_graph_iter_next use caller-provided storage for the id
and adjust the callers. discussed with and ok stsp@
- Commit:
d68b973725ce0a2c7b1f5094448a444d4f2effdc
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
plug leak in the commit graph iterator
We fail to release the memory for the nodes. To fix it however, we some
consumer of the commit graph iterator need to be corrected: the returned
pointer is safe to be used only up until the next iter_next call;
save a copy it if it's needed afterwards too.
ok stsp@
- Commit:
e4ca14132ba73f03dbfbdc465d31619781b465f3
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: fflush(stdout) after asking questions
Not everywhere getline does an implicit fflush, so we might end up not
showing the prompt to the user. Spotted on alpine with muslc.
ok Thomas Adams
- Commit:
8dbcf3885ae920e0fd38a455e7577824989a605f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
forbid rebase of references outside the refs/heads/ namespace
ok jrick
- Commit:
06714b03a48c3e2a8567f35937ba0eab06bb7a8d
- From:
- Josh Rickmar <jrick@zettaport.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Do not segfault verifying "lightweight" tags
ok stsp@
- Commit:
b6b86fd1b9828e38d59915e62fddce62952b8b75
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove trailing whitespace; patch by Josiah Frentsos
- Commit:
4ad4d490cb44a8933d2cd76e15289ed47be82920
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: fix typo in argc check when diffing two blobs
We already have two arguments when diffing two blobs, so check for more than
two like we do when diffing two objects to check for invalid path args.
Includes new regress test by op for diffing two blobs.
ok stsp@ and ok plus regress test from op@
- Commit:
b5c076278bbb7205a9828d2ac2da41999fff4a14
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix overflow in blame callback
spotted by noticing gotwebd crashing on some blame requests.
Diff from stsp@ with a fix from tracey@, I'm committing it only because
he is short on time.
ok stsp@
- Commit:
717a78d4f87c3704afe34c77e211349932575d5b
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix snprintf error handling
follow the "proper secure idiom" described in the CAVEATS section of
printf(3). reminded by tb@ and millert@
- Commit:
d6506a3d8fbcc06720765fc488978d6ad81202d4
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Group options in accordance with style(9)
patch by Josiah Frentsos
- Commit:
7a61761f598f1d4347c2e359e1733bb0aa109ab3
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix unused variable, function definition warnings for clang 15
- Commit:
19305070924df3384e8d0cc9d561b183ffd0bdef
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
avoid allocating too many errors in cmd_info
got_error_path uses get_custom_err to get a statically allocated error
allocated on a buffer that's used a ring. This is nice and simple, but
the drawback is that thees custom errors shouldn't be used "for too
long" because they might get overwritten later.
cmd_info is one offender: change it to store a "simple" error and later
re-use it to construct the per-path error.
OK and tweaks stsp@
- Commit:
021334f93ef590f85da3fa9312fcc519eb6b2d25
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix "got tag" not tagging the work tree's current branch by default
found by jrick
- Commit:
82c78e96f11e4190c3d91f18122df14e30347300
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tog: keymaps to jump to next/prev file/hunk in the diff
Add () and {} key maps to navigate to the previous and next file or hunk in
the diff. This required changing Got's diff API to collect line type metadata
in addition to the line offsets already produced as prompted by stsp.
ok stsp@
- Commit:
7d8bcb99cc69666c8317a8c1cadc8dc5885a7a77
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: add -c flag to apply at a specified commit
it's useful for e.g. to apply old patches that weren't generated by `got
diff' or git-diff(1) and so lacks the metadata needed for the 3-way
merge.
manpage improvements from and ok stsp@
- Commit:
7224234d05a484296e83f2c66dcfce87ab931cad
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
`got patch' pledge early
ok stsp@
- Commit:
aec48c6cc2cd132e59d0286d87f2b3377d62eb93
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got patch: error if patchfile isn't a regular file
`got patch' cannot read patches from non-regular files for obvious
reasons. However, it could crash in sendmsg because pledge doesn't
allow to send file descriptors referring to directories. So, restrict
`got patch' to operate on regular files only and fail otherwise.
This still allows to read patches from symlinks since they're resolved
at open(2) time and the file type check is performed after.
There may be a marginal usefullness in reading patches from fifos, but
the current code doesn't allow that anyway since got-read-patch needs a
seekable file descriptor anyway.
ok tracey@
- Commit:
33f9ea25c71c18df082c187e2ada3d3f288b912d
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
tweak cmd_info; no functional changes intended
* don't allocate unused pack_fds
* drop wpath, cpath, proc, exec and sendfd pledge promises
* close the worktree
ok stsp@
- Commit:
cae49de0a80da9ab02ce855debdd56fb0be36400
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got histedit' fetch author info from Git configuration as a fallback
- Commit:
8db00f97570360c732c5c8b9ab0f0415e74184c0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
do not require local author info during 'got rebase'
My commit to reset committer info during rebase was too strict
in some use cases. Even when simply forwarding a branch the rebase
operation could now fail if GOT_AUTHOR is not set.
To fix this, fall back on existing commiter information if no author
is configured. And try to obtain author info from Git config in case
GOT_AUTHOR is not set.
Problems reported by Mikhail.