Commits


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.


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@


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.


improve error message due to malformed `author' in got.conf tweak and ok stsp@


compress delta data from delta_cache directly into pack file


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


use the POSIX-compliant "date -u" command to return UTC time; ok stsp


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


fix hang in commit regress test. ok stsp


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@


use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA


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


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


add per-worktree got.conf(5) file in the .got directory; ok millert


add got.conf(5) configuration file ok tracey