Commit Briefs

Thomas Adam

regress: use bs=1M for dd, not bs=1m; fixes -portable test failure on ubuntu

GNU dd only accepts upper-case letters for the size units.


Thomas Adam

always show commit or tree IDs in diff header, in order to help 'got patch'

The idea is that got patch can simply look for a line such as: commit - abcde1234567... to find the merge base commit ID to show in diff3 conflict markers. got log -p now displays commit IDs in its diff header, instead ofl tree or blob IDs. ok op@


Thomas Adam

use test(1) -eq and -ne to compare integers, and reduce quoting

This brings the rest of the regression test scripts in line with patch.sh.


Thomas Adam

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

tweak and ok stsp@



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.


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.


Thomas Adam

regress: fix test failures using ln(1)

GNU ln uses -T instead of -h for no-target-directory. OK thomas.adam


Thomas Adam

regress: fix test failures using date(1)

This patch fixes test failures related the date(1) utility. In the long term we could add a wrapper function to detect valid options for date(1) and use the variant which works on the current OS. For now, this makes some tests pass and shows us where the problems are. OK thomas.adam


Stefan Sperling

make 'got update' display the worktree's branch name upon success

ok tracey



Christian Weisgerber

add missing "return 1" to failure handling in the regress scripts

ok stsp@



Stefan Sperling

add 'got commit -F' option to commit with a log message stored in a file

To avoid accidents commit -F opens the prepared log message in an editor so it can be reviewed before the commit is created. For non-interactive use the -N option is required in addition to -F. ok millert@



Christian Weisgerber

expand arguments in shell script since brace expansion is not in POSIX

ok stsp


Christian Weisgerber

switch function declarations from Korn shell to Bourne/POSIX shell syntax

ok stsp



Stefan Sperling

add got.conf(5) configuration file

ok tracey


Stefan Sperling

add a -q option to tests for quiet output and use it for 'make regress'

Previous default output remains when test cases are run individually. ok tracey


Stefan Sperling

fix committing file additions from a work tree with a path prefix

New files were added under the wrong tree in the repository if the work tree has a path prefix. Fix this problem and catch it in the existing commit_with_path_prefix regression test.




Stefan Sperling

extend test_commit_symlink test case