Commit Briefs

Stefan Sperling

implement 'got diff -c' for diffing commits with optional filtering by path

Need for filtering by path sugggested by kn@ ok naddy@



Stefan Sperling

add support for multiple path arguments to 'got diff'

positive feedback from Omar and kn ok kn








Stefan Sperling

show commit progress output when 'got merge -c' is used

Otherwise no progress output is shown at all with this command. Commit progress output will also display any additional changes which resulted from conflict resolution. ok millert@




Stefan Sperling

for portability, handle errno variations upon open(2) failure with O_NOFOLLOW

Problem pointed out by naddy for FreeBSD -portable. Discussed with millert, thomas adam, and naddy.


Stefan Sperling

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.


Stefan Sperling

add a 'got merge' command for creating merge commits

Additional testing by Thomas Adam. ok tracey


Stefan Sperling

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

ok tracey



Stefan Sperling

make got status -s and -S options conflict


Stefan Sperling

make 'got checkout' display the checked out reference and commit ID

ok tracey


Tracey Emery

add suppress status-code selection to got status. this allows for a quick way to

clean output without the use of ignore files. ok stsp


Tracey Emery

add -q quiet mode to checkout and update. supressing output keeps the terminal

responsive on large repos. ok jrick stsp



Stefan Sperling

rename got_fetch_parse_uri() to got_dial_parse_uri()

This function is now being used by both 'got fetch' and 'got send' so its former name was misleading.


Stefan Sperling

move duplicated dial_ssh() and dial_git() functions into a common file

These functions are used by 'got send' and 'got fetch' in order to open network connections to a server. Move them into new file lib/dial.c and declare relevant functions in got_dial.h and lib/got_lib_dial.h. No functional change.


Christian Weisgerber

indentation fixes