Commit Briefs
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@
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.
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.
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam. ok tracey
portable: initial Linux compilation
This commit modifies the GoT main branch to be able to compile it under linux.
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
add -q quiet mode to checkout and update. supressing output keeps the terminal
responsive on large repos. ok jrick stsp
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.
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.
make "got branch -d" print reference name and value
Also silence output of "got branch -d" in a regression test, from stsp. ok stsp