Commit Briefs

Omar Polo

use GOT_IGNORE_GITCONFIG in regress

fixes test_rebase_no_author_info when a valid ~/.gitconfig is found. ok stsp@


Omar Polo

got commit: add flag to specify the author

This adds a new flag, `got commit -A', that allows to specify the commit author but retains the "committer" (which is obtained as usual via GOT_AUTHOR, got.conf or git config.) with lots of help from and ok stsp


Omar Polo

fix email address parsing

we were both too strict and too lose. To avoid breaking got object parser (and to some extent ours too) we need to ensure that there aren't any line feeds, extra < or > and no trailing gibberish. The '@' is not actually required in the email. various tweaks and ok stsp


Stefan Sperling

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.


Stefan Sperling

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@


Christian Weisgerber

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.


Omar Polo

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

tweak and ok stsp@



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