Commit Briefs

fbbbc6078a Thomas Adam

portable: release 0.61 (tags/0.61)

Update configure.ac and CHANGELOG for 0.61


5881cd172e Thomas Adam

gotadmin: include gotadmin.1 in dist

When building the dist tarball, include its man page.


09e453880e Thomas Adam

portable: remove extraneous strerror_r check

On a __GLIBC__ system, we need to use __xpg_strerror_r() -- this is already checked for, so simply one of these checks to reduce code changes from upstream.


c206b220ed Thomas Adam

regress: provide a sed wrapper

In order to portably handle the difference in how 'sed -i' works between *BSD and Linux, provide a wrapper to invoke the underying system sed(1) based on which OSTYPE is in use.


fa37079fce Thomas Adam

regress: use gdate/gln if on *BSD

To minimise the amount of churn between the difference in date(1) and ln(n) semantics, use gdate and gln from coreutils.


5a7ef102e3 Thomas Adam

regress: enable tests

Enable the compilation and execution of the tests under regress/


0ca5b679a4 Thomas Adam

portable: propagate AM_CFLAGS/AM_CPPFLAGS

Allow for warnings via AM_CFLAGS in a common Makefile, and let those values propagate to all other Makefiles. Currently the more useful checks are disabled until upstream changes are made to reduce warnings. While here, also fix the version string to remove quotes.



66eecf0df5 Thomas Adam

add test for merge result when lines are inserted at the top of a file

Based on a patch by Omar Polo



30f6c0c64b Thomas Adam

add support for multiple path arguments to 'got diff'

positive feedback from Omar and kn ok kn




746e2499a7 Thomas Adam

Ignore tags files

OK stsp


d2412c93d1 Thomas Adam

Provide lib/Makefile to enable tags file generation

The root Makefile does not hook into lib/ via <bsd.subdir.mk> since it is not a program itself and thus gets included by all others. This means `make tags` skips lib/ and `make -C lib/ tags` does not know what to do; provide a minimal <bsd.lib.mk> stub and hook it up just for the "tags" such that *all* source is browsable via tags. See /usr/share/mk/bsd.README for details. Feedback stsp tb OK tb


35add24aa6 Thomas Adam

plug memory leaks in got-fetch-pack and got-send-pack

ok naddy


ea83355f0a Thomas Adam

let 'got fetch' send all references to the server to avoid redundant downloads

Problem reported by naddy. ok naddy


1fe43c0707 Thomas Adam

Fix "mandoc -T lint -W style" nits


5b5b660da6 Thomas Adam

Document command aliases in tmux(1) style, add tags for navigation

Complete 95f394e8917def2c11ce292b3a8f804d261b1d12; reminder to look at gotadmin(1) from stsp, thanks.


d52bac284b Thomas Adam

ignore unversioned files while aborting rebase, histedit, merge or operations

ok jrick


ac93b2c5ff Thomas Adam

Fix "mandoc -T lint -W style got/got.1" nits


e8aa341a0a Thomas Adam

Document command aliases in tmux(1) style, add tags for navigation

This has the advantage of tags being located right by the full command; combined with tags ":tco" to search for the `co` alias will jump right to the `checkout` line, neatly showing everything without needing further navigation. tmux hint from Thomas Adam, thanks. OK stsp


b87752b722 Thomas Adam

update 'got merge' TODO item


a14a3000a5 Thomas Adam

bump version number


bf52745616 Thomas Adam

CHANGES for 0.61