Commit Briefs

Omar Polo

check file status before applying the patch

Don't allow `got patch' to delete files that are not known, or add files that are already known and to edit files that are known, not obstructed and without conflicts.


Stefan Sperling

make got log, diff, blame, tree, and cat unlock the work tree earlier

These commands perform potentially long-running operations on the repository after reading information from the work tree. There is no need for them to keep the work tree locked until the end. Doing so blocks other commands the user may want to run concurrently. For example, the user may want to be able to run 'got diff' in the work tree while browsing 'got log' output in less(1). Pointed out by Misha on gameoftrees IRC.


Omar Polo

got patch: re-add forgotten lseek

otherwise got-read-patch can't parse any patch because the position indicator is at the end of file. While here fix the return too and set patchfd to -1 on error (stsp suggestion.) ok thomas, stsp


Christian Weisgerber

make "got cherrypick/backout" match argument against refs before object IDs

Use got_repo_match_object_id() instead of hand-rolled code and pick up the updated handling of reference arguments. ok stsp


Christian Weisgerber

make "got ref" match argument against references before object IDs

Use got_repo_match_object_id() instead of hand-rolled code and pick up the updated handling of reference arguments. ok stsp




Christian Weisgerber

const-ify command and option tables

ok stsp


Josh Rickmar

remove stray tab that snuck in


Josh Rickmar

display GMT offset in cat command

ok stsp


Christian Weisgerber

shrink the width of formatted output fields to their expected size

Replace FMT_SCALED_STRSIZE with (FMT_SCALED_STRSIZE - 2) as field width when formatting output for printing. FMT_SCALED_STRSIZE includes space for a nul byte and a minus sign. Output values are expected to be always positive here. ok stsp


Omar Polo

tweak error reporting due to invalid numbers

Use the same idiom as in the strtonum(3) manpage which produces a more readable error message. OK kn, stsp


Omar Polo

improve error message due to malformed `author' in got.conf

tweak and ok stsp@


Stefan Sperling

make 'got rm' behave like rm(1) for paths found missing on disk

ok millert@


Stefan Sperling

wrap overlong lines


Stefan Sperling

add O_CLOEXEC (close-on-exec) to openat(2) calls

suggested by millert ok thomas_adam


Stefan Sperling

add O_CLOEXEC (close-on-exec) flag to open(2) calls

suggested by millert ok thomas_adam


Stefan Sperling

add "e" (close-on-exec) flag to fopen(3) calls

suggested by millert ok thomas_adam





Josh Rickmar

switch branches during noop rebases

Always update to the specified branch even if the branch is already rebased (no commits needed to be rebased, and the branch does not need a fast forward). With the old behavior of erroring and staying on the current branch, I sometimes found myself ignoring the error message, treating it as information and assuming the branch update, and later on committing on top of origin/main instead of the main branch. feedback and ok stsp


Stefan Sperling

sort and de-duplicate work tree path command line arguments

This is important in cases like 'got diff file.txt file.txt' which should only show the diff for file.txt once. suggested by kn@



Stefan Sperling

implement 'got diff -c' for diffing commits with optional filtering by path

Need for filtering by path sugggested by kn@ ok naddy@