|
c861864b
|
2022-01-03T11:34:34
|
|
'got stage' tests rely on unreferenced loose objects; disable GOT_TEST_PACK=1
|
|
|
4f3c844b
|
2021-09-14T16:12:52
|
|
make 'got update' display the worktree's branch name upon success
ok tracey
|
|
|
54c39596
|
2020-12-28T17:38:34
|
|
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
|
|
|
fe621944
|
2020-11-10T22:54:37
|
|
merge new diff implementation from the git.gameoftrees.org diff.git repository
This new diff implementation was started by Neels Hofmeyr during the u2k20
hackathon and now replaces diffreg.c code lifted from the OpenBSD base system.
The integration of this code into Got was done by me.
Got now uses the patience diff algorithm by default.
The diff.git repository will remain the primary repository for the diff code,
which already compiles and runs on other operating systems such as Linux.
Any fixes and improvements for files inherited from the diff.git repository
should be written against that repository and synced to got.git afterwards.
|
|
f6cae3ed
|
2020-09-13T14:05:17
|
|
switch function declarations from Korn shell to Bourne/POSIX shell syntax
ok stsp
|
|
|
7fb414ae
|
2020-08-08T07:34:47
|
|
add a -q option to tests for quiet output and use it for 'make regress'
Previous default output remains when test cases are run individually.
ok tracey
|
|
|
75f0a0fb
|
2020-07-23T14:22:39
|
|
stop reinstalling symlinks after commit; 'got update' can handle that
|
|
|
35213c7c
|
2020-07-23T14:22:39
|
|
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
|
|
|
fa3cef63
|
2020-07-23T14:22:37
|
|
make 'got stage -p' work with symlinks
|
|
|
0aeb8099
|
2020-07-23T14:22:37
|
|
set a staged file type and handle it separately from the on-disk file type
|
|
|
c631b115
|
2020-07-23T14:22:36
|
|
make staging of symlinks work
|
|
|
9627c110
|
2020-04-18T18:40:01
|
|
show a summary of conflicts and related problems after updating/merging files
ok millert@
|
|
|
7b5dc508
|
2019-10-28T10:31:50
|
|
fix staging of multiple files with -p
ok semarie
|
|
|
46f68b20
|
2019-10-19T11:06:56
|
|
show file mode differences when diffing trees
|
|
|
72fd46fa
|
2019-09-06T17:11:26
|
|
fix modified files not shown by 'got status' after committing staged changes
|
|
|
2a06fe5f
|
2019-08-24T12:58:07
|
|
indicate non-existent paths in 'got status' and make 'got diff' error for them
|
|
|
d3bcc3d1
|
2019-08-08T17:27:36
|
|
make revert of a staged deletion a no-op for better interaction with -R
|
|
|
0f6d7415
|
2019-08-08T17:21:07
|
|
implement got revert -R
|
|
|
e70a841e
|
2019-08-08T14:15:39
|
|
test repeated stage -p on added and deleted files
|
|
|
af5a81b2
|
2019-08-08T14:08:34
|
|
fix and test repeated stage -p on the same file
|
|
|
0f1cfa7f
|
2019-08-08T13:51:43
|
|
add test with out-of-date staged files
|
|
|
8564cb21
|
2019-08-08T13:29:51
|
|
test stage/unstage with non-existent paths
|
|
|
8b13ce36
|
2019-08-08T13:02:20
|
|
fix and test stage/unstage with unversioned files
|
|
|
4ce46740
|
2019-08-08T12:44:18
|
|
label staged blobs with "(staged)" in got diff output
|
|
|
f5a17245
|
2019-08-08T09:09:51
|
|
make got -p skip deletion question consistent with the others
|
|
|
ec9d9b2f
|
2019-08-08T09:02:40
|
|
stop passing paths to 'got stage' in basic stage test
|
|
|
eba70f38
|
2019-08-08T09:01:40
|
|
verify stage -p behaviour with incomplete response script
|
|
|
88f33a19
|
2019-08-08T08:54:18
|
|
ensure that stage -p choice 'q' doesn't skip subsequent files
|
|
|
a7c9878d
|
2019-08-08T08:40:38
|
|
make stage -p show the number of changes in a file
|
|
|
c8ede203
|
2019-08-08T08:25:09
|
|
make stage -p offer 'q' option only for edits, not additions and deletions
|
|
|
2db2652d
|
2019-08-07T18:25:46
|
|
make path arguments to 'got stage' optional
|
|
|
b353a198
|
2019-08-07T17:40:15
|
|
add 'q' response to 'got stage -p'
|
|
|
dc424a06
|
2019-08-07T17:26:35
|
|
initial 'got stage -p' implementation
|
|
|
31b20a6e
|
2019-08-06T11:35:22
|
|
add a test for 'no changes to stage' error condition
|
|
|
a4f692bb
|
2019-08-04T13:48:00
|
|
add a test for 'got stage -l'
|
|
|
6d022e97
|
2019-08-04T12:45:17
|
|
use get_worktree_paths_from_argv consistently; improves add/rm edge cases
Double 'got rm' becomes a no-op like double 'got add' already is,
and 'got add' of an already staged file is now an error.
|
|
|
9c5c5eed
|
2019-08-04T00:35:00
|
|
fix missing ret assignment in test_double_stage
|
|
|
5f8a88c6
|
2019-08-04T00:00:37
|
|
make 'got commit' work with changed stanges
|
|
|
f0b75401
|
2019-08-03T22:55:36
|
|
fix out-of-date check regression; only commit staged files after 'got stage'
|
|
|
a76c42e6
|
2019-08-03T22:13:28
|
|
ensure that 'got update' refuses to update staged files
|
|
|
243d7cf1
|
2019-08-03T22:01:19
|
|
ensure that 'got rebase' refuses to run with staged changes
|
|
|
b9622844
|
2019-08-03T21:49:22
|
|
ensure that 'got histedit' refuses to run while shanges are staged
|
|
|
735ef5ac
|
2019-08-03T21:35:34
|
|
reject staging of out-of-date files
|
|
|
ebf48fd5
|
2019-08-03T20:43:55
|
|
handle conflicted files passed to 'got stage'
|
|
|
98eaaa12
|
2019-08-03T20:37:01
|
|
implement got diff -s
|
|
|
408b4ebc
|
2019-08-03T19:57:06
|
|
add basic stage support to 'got diff' + add 'got stage -l'
|
|
|
d3e7c587
|
2019-08-03T17:26:53
|
|
handle double-staging
|
|
|
24278f30
|
2019-08-03T17:16:35
|
|
make 'got revert' work with staged files
|
|
|
9acbc4fa
|
2019-08-03T15:50:08
|
|
test 'got rm' behaviour on staged files
|
|
|
1e1446d3
|
2019-08-03T15:33:53
|
|
test how 'got add' interacts with staged files
|
|
|
fccbfb98
|
2019-08-03T14:11:33
|
|
add initial stage test
|
|
|
244725f2
|
2019-08-03T15:20:09
|
|
make 'got status' indicate changes relative to staged files
|
|
|
c363b2c1
|
2019-08-03T14:55:49
|
|
show staged file status separately in 'got status'
|
|
|
88d0e355
|
2019-08-03T14:30:32
|
|
report staged status via status callback
|