Commits
- Commit:
41f061b2f459318f3738f59d7676efccc4beb344
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ignore unversioned files while aborting rebase, histedit, merge or operations
ok jrick
- Commit:
b93c7142c142ac5699accd8dd259187a22e200fb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
cd33da4893c91d59c1e0a4f296e07c08cfd82bcb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
- Commit:
1fa4907213af37d50029ee33b989867f41f0f124
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
c1b057235b48f7b8bc01bd3c31348517856bc68b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got merge' interrupt the merge upon undeleted and unversioned files
- Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
print additional stats about things that went wrong during a merge
- 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@
- Commit:
088449d31db27c8682d5e9dc737d92d05df6605e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement 'got merge -n' which interrupts before creating a merge commit
- Commit:
4e91ef1519233965edd1bbd83f6699f669c8f9d6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make it possible to merge vendor branches with 'got merge'
- 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.
- 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.
- 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
- Commit:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' display the worktree's branch name upon success
ok tracey
- Commit:
788d4a19ed0ddf9df069f9a6d5a8ecd9ebf932ee
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
validate status codes given to 'got status -S'
- Commit:
b043307bfaa7ea801d19677c0cdb5d4074c0c234
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make got status -s and -S options conflict
- Commit:
08e5873e99dff11184476ccc3186fbd2a97a2e0b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got checkout' display the checked out reference and commit ID
ok tracey
- 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
- 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
- Commit:
1b796c3fa88f0d3101f3dd979d9f8b511fd93086
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a null-pointer deref in 'got fetch -d'; reported by Omar Polo
- 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.
- 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.
- Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
indentation fixes
- 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
- Commit:
6435d2a6d2c84c4875a0c6f641b06d7cd1796a0c
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
sys/param.h is not needed
- 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.