Commits
- Commit:
814624e72dc6ddb62ada261a323f7899caa5b4f1
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
move got_patch file status checking in worktree.c
check_file_status used got_worktree_status to check if the file was in
an allowed state, but it's wrong since the callback is not invoked on
unchanged files.
While here also fix a relate bug: unlink(newpath) is in the wrong spot
and ends up removing files even when it shouldn't, so move it early in
the got_worktree_schedule_* error handling.
Finally, update the appropriate test case. It was passing before
because got_worktree_schedule_add returned GOT_ERR_FILE_STATUS, not
because check_file_status failed.
ok stsp@
- Commit:
d64cc78a320df6e371662d50eba6332a7be001c6
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got rm' behave like rm(1) for paths found missing on disk
ok millert@
- Commit:
ae1e948a3179529896cf69272a0c1b45ab8ced1c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
10604dce6e625d11974fb5491598bbb54069e5d3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey
- Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
indentation fixes
- Commit:
f6343036aa4d7e3805a44832b566b531271c1c6d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
new -I option for 'got status' to show files which match an ignore pattern
- Commit:
e600f1246e15fff13251ba9d299d74a24ae579c2
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ensure that old commits remain referenced after rebase and histedit
Create automatic "backup" references which ensure that objects from
the pre-rebase or pre-histedit state remain in the repository.
A new -l option for 'got rebase' and 'got histedit' lists old commits.
This makes it easier to recover from botched rebase or histedit operations.
Removal of such objects currently requires got ref -d and git-gc.
This will be made more convenient in the future.
testing and ok jrick
- Commit:
50b0790ed9a28fced631f31e5b7ca76a9a610ea5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add per-worktree got.conf(5) file in the .got directory; ok millert
- Commit:
766841c2970cb5bef66c9c69201b231d0eefb120
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -s option to 'got remove' which deletes files in a particular status
This makes it easy to deal with files that were deleted from disk by external
tooling which modified the work tree. Such files are left in missing (!)
status and can now be marked for deletion in bulk via 'got rm -s\! -R .'
For consistency, modified (M) files can now be removed with 'got rm -s M'
which implies 'got rm -f'.
Prompted by feedback from krw@
- Commit:
b2118c49a14c29447e228bf9a2b2a38f2da4f10b
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
Add a 'got info' command which displays work tree meta-data.
Remove the alias 'got in' for 'got init'.
The 'in' alias was too close to either 'init' or 'info'.
ok tracey, millert
- Commit:
35213c7c838a48142d398147b54bb9938af8cab0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
- Commit:
5036ab18bf99be5d6811f17565b2c2fad47b3f73
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' skip conflicted files
ok millert@
- Commit:
7f47418fd49bc98fe4570c139767c057cd066409
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got checkout' and 'got update' work with read-only repositories
but warn users about the garbage collection problem
- Commit:
70e3e7f5a129106c0c31204233b35dfdf0d6a990
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add -k option to 'got remove' to keep files on disk
ok stsp
- Commit:
12463d8bf337d3eb12e6cd73d5bd1f25c278e571
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
address some of the file descriptor vs. path races in status callbacks
- Commit:
f2a9dc41d851ff2d575b08c2766583ff11cdd7af
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add -R option to 'got remove' for recursive deletion
ok stsp
- Commit:
022fae89eee20051d352d3dc2b8c64486bdafe93
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
Introduce -I to cmd_add to disregard ignores when adding recursively. Expand add.sh tests. Update TODO.
- Commit:
4e68cba3de6663791e40fa15f1eecbc4a2bf724c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -R option to 'got add' for recursive addition (patch by Tracey Emery)
- Commit:
1ebedb77e0d68bff22163a9aafc13db5f3f706df
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
teach 'got commit' to tweak the executable bit of a file
- Commit:
2822a3526b8c61302ec86e0871e724c07a4b078d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'got integrate' command
- Commit:
2a06fe5f59f1b7b42f63bd9afe5187935c341321
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
indicate non-existent paths in 'got status' and make 'got diff' error for them
- Commit:
e620954619292de6ad76df32021946b9d6aa168c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
untie cancel callback declaration from the work tree
- Commit:
33aa809d4fd2e43328dd3ad4897a7394c28c79ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement 'revert -p'
- Commit:
2e1f37b02955aef4d5bd0d0307e98da1e4b95463
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
implement 'got unstage -p'
- Commit:
a7c9878d5b0e7770339e76efc0821897fe7a6be8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make stage -p show the number of changes in a file