Commits
- Commit:
c0df59665de91324eeab1808c6c4e41343f21789
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
wrap overlong lines
- Commit:
e7ae0bafeffce6697bc3b67fda753e5bac995cb6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add O_CLOEXEC (close-on-exec) to openat(2) calls
suggested by millert
ok thomas_adam
- Commit:
8bd0cdad05519cbb08d8d11223bdde0472678150
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add O_CLOEXEC (close-on-exec) flag to open(2) calls
suggested by millert
ok thomas_adam
- Commit:
00fe21f262ab567bb792120514b49b37236c5422
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add "e" (close-on-exec) flag to fopen(3) calls
suggested by millert
ok thomas_adam
- Commit:
8a4f8535de4903dd333ad924bd7ff874afa741fa
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix NULL dereference in 'got clone' if server sends an empty pack file
- Commit:
f76670f06a0f4f426ea232a2dd02899fe3698cf2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add got branch -t option to sort listed branches by modification time
- Commit:
0f104432aecf1cda4672c5ff4e4d228f5aae1bdb
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add got ref -t option to sort listed references by modification time
- Commit:
3d42b2660156bfd71df40d11a996d7bf233ed2a4
- From:
- Josh Rickmar <jrick@zettaport.com>
- Date:
switch branches during noop rebases
Always update to the specified branch even if the branch is already
rebased (no commits needed to be rebased, and the branch does not need
a fast forward). With the old behavior of erroring and staying on the
current branch, I sometimes found myself ignoring the error message,
treating it as information and assuming the branch update, and later
on committing on top of origin/main instead of the main branch.
feedback and ok stsp
- Commit:
10a623dfc23b47f494941e0eac741420c08372a3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
sort and de-duplicate work tree path command line arguments
This is important in cases like 'got diff file.txt file.txt' which
should only show the diff for file.txt once.
suggested by kn@
- Commit:
51ed7429eaf94d2ab0dfa3f248549b2279c7e5d6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
align 'diff -c' usage help with synopsis given in man page; suggested by naddy
- Commit:
67b631c9e0d2c43ceeda1a387ba696b2d34a1035
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement 'got diff -c' for diffing commits with optional filtering by path
Need for filtering by path sugggested by kn@
ok naddy@
- Commit:
8f83a2643c211f21ec5731e80ebcb6218f7c6689
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove code which was setting up repo_path redundantly from cmd_diff()
- Commit:
e7ffb0b07b18c20ebb619f3879602d629d0fbbc6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for multiple path arguments to 'got diff'
positive feedback from Omar and kn
ok kn
- 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