Commit Briefs

Thomas Adam

whitespace fix from Omar Polo





Thomas Adam

libexec: honour libeexec path for helpers

libexec is a common path which is understood by autotools, and should be honoured. Patch from Christian "naddy" Weisgerber


Thomas Adam

FreeBSD: tighten UUID check

If UUID libraries are already detected, don't ignore them by then checking pkg-config, etc. Noticed by Christian "naddy" Weisgerber.


Thomas Adam

README: add for Github mirroring purposes

Add a .github/README.md file so that the read-only clone of GoT on Github, which is used for CI purposes, explains the project. Also, update the README.portable vesion to patch.


Thomas Adam

Cirrus-CI: add build YAML file

Cirrus-CI allows for FreeBSD builds as well as Linux.


Thomas Adam

portable: add FreeBSD support

This adds the capability to compile got-portable on FreeBSD.


Thomas Adam

fix 'got update' of an added + obstructed file

When 'got update' tried to add a new file to the work tree and this file was obstructed by, say, a directory on disk, the update failed: $ got update ? new got: new: Is a directory $ And the work tree was not updated. With this commit this situation is properly detected as an obstruction and the update succeeds: $ got update ~ new Updated to refs/heads/master: c1f85b4938dc4c668a88f13df2b98a520fc077cc File paths obstructed by a non-regular file: 1 $ Extend a corresponding test case to cover this issue. ok tracey


Thomas Adam

stop using the term 'obstructed' ambiguously in the got.1 man page

Specifically, obstructed files are versioned files which should be on disk but have been replaced on disk by a non-regular file (e.g. by a directory). The man page used the phrase "deletion was obstructed" which is unrelated to the above concept and can be expressed as "deletion was prevented" instead.


Thomas Adam

stop caring about obstructed versioned files in 'got merge'

Tyring to write a test to cover this case I found that obstructed files are (correctly) detected as local modifications in the work tree. Thus they trigger the pre-condition check for local modications and 'got merge' will not even start to do any work in the presence of obstructed files.




Thomas Adam

add a 'got merge' command for creating merge commits

Additional testing by Thomas Adam. ok tracey


Thomas Adam

show parent commit IDs of merge commits in the tog diff view

ok tracey




Thomas Adam

manpages: install .5 to correct location

When installing man pages, split out .1 and .5 as they install to different paths.


Thomas Adam

compat: Makefile: add missing trailing backslash

The uuid.c source file was missing a trailing backslash.


Thomas Adam

portable: add CHANGELOG (tags/0.60)

Although there is already a CHANGES file, the CHANGELOG is used to indicate any -portable specific changes which have happened for that release. All version numbers in -portable correspond to their OpenBSD counterpart.


Thomas Adam

tog: make blame view work

Fix the thread comparison with tog's blame view.


Thomas Adam

dist: rework files for distcheck

Rather than having a toplevel EXTRA_DIST target in the toplevel Makefile.am file, move the relevant files to their own Makefile.am locations.


Thomas Adam

regress: port cmdline tests

This commit introduces the 'make tests' target which will run the cmdline/* tests.


Thomas Adam

configure: bump version

Follow the same version as got itself.