Commits

Commit:
0ff8d236625b5d8329e10e9b812cbdef76917ba6
From:
Stefan Sperling <stsp@stsp.name>
Date:
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@
diff | patch | tree
Commit:
088449d31db27c8682d5e9dc737d92d05df6605e
From:
Stefan Sperling <stsp@stsp.name>
Date:
implement 'got merge -n' which interrupts before creating a merge commit
diff | patch | tree
Commit:
4e91ef1519233965edd1bbd83f6699f669c8f9d6
From:
Stefan Sperling <stsp@stsp.name>
Date:
make it possible to merge vendor branches with 'got merge'
diff | patch | tree
Commit:
5c02d2a555dc01ac06db5a47b8c81adf2bf3f8a6
From:
Stefan Sperling <stsp@stsp.name>
Date:
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.
diff | patch | tree
Commit:
1acd48bccbe935fbbd39c3387b92b0fb6aaf444f
From:
Stefan Sperling <stsp@stsp.name>
Date:
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.
diff | patch | tree
Commit:
f259c4c18277237ced1043033cb1af739f73db28
From:
Stefan Sperling <stsp@stsp.name>
Date:
add a 'got merge' command for creating merge commits Additional testing by Thomas Adam. ok tracey
diff | patch | tree
Commit:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got update' display the worktree's branch name upon success ok tracey
diff | patch | tree
Commit:
788d4a19ed0ddf9df069f9a6d5a8ecd9ebf932ee
From:
Stefan Sperling <stsp@stsp.name>
Date:
validate status codes given to 'got status -S'
diff | patch | tree
Commit:
b043307bfaa7ea801d19677c0cdb5d4074c0c234
From:
Stefan Sperling <stsp@stsp.name>
Date:
make got status -s and -S options conflict
diff | patch | tree
Commit:
08e5873e99dff11184476ccc3186fbd2a97a2e0b
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got checkout' display the checked out reference and commit ID ok tracey
diff | patch | tree
Commit:
00357e4dc78f7f5bd12eceaa07592ab743996e12
From:
Tracey Emery <tracey@traceyemery.net>
Date:
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
diff | patch | tree
Commit:
4ad4a1ec452e58730b6d841ae6a044ff53827e15
From:
Tracey Emery <tracey@traceyemery.net>
Date:
add -q quiet mode to checkout and update. supressing output keeps the terminal responsive on large repos. ok jrick stsp
diff | patch | tree
Commit:
1b796c3fa88f0d3101f3dd979d9f8b511fd93086
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix a null-pointer deref in 'got fetch -d'; reported by Omar Polo
diff | patch | tree
Commit:
5e5da8c4bcc83f7737a115b8da52fc3935fe3a6b
From:
Stefan Sperling <stsp@stsp.name>
Date:
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.
diff | patch | tree
Commit:
d65a88a2f0db40d2c2ac34ee34e8aff8ac629d52
From:
Stefan Sperling <stsp@stsp.name>
Date:
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.
diff | patch | tree
Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
indentation fixes
diff | patch | tree
Commit:
978a28a108ecdc501cf03dade3215aed24981a12
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
make "got branch -d" print reference name and value Also silence output of "got branch -d" in a regression test, from stsp. ok stsp
diff | patch | tree
Commit:
6435d2a6d2c84c4875a0c6f641b06d7cd1796a0c
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
sys/param.h is not needed
diff | patch | tree
Commit:
a16d97bdc65b49050d622450d50642fa98eb3cc1
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove ancestry sanity checks from 'got cherrypick' and 'got backout' While these checks might catch usage mistakes the performance overhead of scanning the entire history of the current branch is not worth it. Measurements provided by naddy, cherrypicking 5 commits of OpenBSD's src repository in usr.bin/rsync: Before: 5m50.33s real 4m02.36s user 2m04.41s system After: 1m04.92s real 0m28.24s user 0m36.54s system Further performance improvements could be needed but this is a first step.
diff | patch | tree
Commit:
eac1df479eff0a068548f94b188529f0249fd9be
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got send' heed the branch {} options in got.conf(5); they were ignored ok naddy
diff | patch | tree
Commit:
6480c871c8f9ffdce90c10e7a7313e1187de019a
From:
Stefan Sperling <stsp@stsp.name>
Date:
provide separate send {} and fetch {} configuration blocks in got.conf Feature requested by naddy. ok naddy, who also suggested some tweaks that will arrive shortly
diff | patch | tree
Commit:
e385fc421f331989f2e6518465e5ead42e5a0618
From:
Stefan Sperling <stsp@stsp.name>
Date:
use gmtime_r(3) instead of localtime_r(3) to display time in UTC as intended Problem noticed by naddy due to failing regress tests at midnight, and then analyzed with additional help from millert. ok naddy
diff | patch | tree
Commit:
27b75514d9b1c8e9f188ef9c483760647a8c1b72
From:
Stefan Sperling <stsp@stsp.name>
Date:
do not send a pack file when 'got send' is only deleting branches The git protocol spec says the client MUST NOT send a pack file if the only command used is 'delete'. Fixes 'got send -d' against Github's server which closed the session upon receiving the empty pack file we sent. This problem wasn't caught by regression tests since git-daemon does accept an empty pack file. Problem reported by jrick.
diff | patch | tree
Commit:
2f1457c6ccfe722888511926c09af843da3bee0d
From:
Stefan Sperling <stsp@stsp.name>
Date:
allow deletion of refs/remotes/ branches with got branch -d Also, make requirements for branch name arguments more flexible. Absolute reference names are now accepted. ok naddy@
diff | patch | tree
Commit:
f8a36e221091eb68b439ebe4eb07a5d03b335c28
From:
Stefan Sperling <stsp@stsp.name>
Date:
add 'got send' command for sending changes to remote repositories Known to work against git-daemon and github Git server implementations. Tests by abieber, naddy, jrick, and myself. Man page additions reviewed by Lucas.
diff | patch | tree