regress/cmdline


Log

Author Commit Date CI Message
Tracey Emery 15341bfd 2020-03-05T14:39:37 trim directories in got remove -R This is a racy solution that needs to be properly implemented in the future. ok stsp
Stefan Sperling 5b87815e 2020-03-05T11:20:24 prevent commits from being listed more than once in a histedit script While merging a commit multiple times during a histedit operation could potentially make sense in some corner case, a commit appearing more than once in the script is more likely to happen accidentally. If desired, the same effect can still be achieved by running multiple histedit operations, or by using 'got cherrypick' while the histedit operation is paused for arbitrary editing.
Stefan Sperling de05890f 2020-03-05T10:53:53 fix histedit 'rebase commit ID mismatch' error when splitting a commit Commit IDs on histedit's temporary branch can change arbitrarily because the user may create new commits on this branch while editing past commits. So there is no point in trying to verify these IDs like we do during rebase. Add a test case which demonstrates the problem.
Stefan Sperling 4b6c9460 2020-03-05T08:41:12 be helpful when users try to check out work trees without a known branch Provide a useful error message in such cases and explicitly document intentional restrictions in the got(1) man page. Prompted by a question from Adam Steen via bsd.network https://bsd.network/@adams/103768951483318235
Stefan Sperling a0ea4fc0 2020-02-28T17:37:53 show merged commit ID + logmsg upon merge conflict during rebase and histedit This makes it more apparent which commit contained the conflicting change. The new output looks like this: C sys/dev/pci/if_iwm.c 8a98d848a1a5 -> merge conflict: properly modify station queues got: conflicts must be resolved before rebasing can continue
Stefan Sperling 80106605 2020-02-24T20:31:09 switch 'got tag' commit argument to a -c option for consistency
Stefan Sperling da76fce2 2020-02-24T20:31:09 let 'got branch' switch and update the work tree ok tracey
Stefan Sperling 7fa81f88 2020-02-21T01:06:03 allow 'got ref' to manipulate refs which do not have a slash in their name
Stefan Sperling 1ae0a341 2020-02-14T15:43:03 add a test which ensures that 'got rebase' trims empty dirs from disk
Stefan Sperling 5bda3ef8 2020-02-09T11:51:29 extend 'backout' tests; covers segfault found by semarie@ (fixed in 3c24af98)
Stefan Sperling db32465d 2020-02-07T18:02:56 add a test for bug fixed in a0975128
Tracey Emery 992eb9d8 2020-02-07T17:02:17 spelling
Stefan Sperling a46b9f33 2020-01-28T12:09:03 fix a bug where 'got revert -R' failed on added subtrees The command could fail with "got: no such entry found in tree". This problem is reproduced by the regression test added in this commit. This happened because file index entries were processed in the wrong order by diff_fileindex_dir(). To fix this, keep removed entries in the RB tree and skip them when the file index is written out, rather than removing entries from the RB tree immediately causing side-effects for RB_NEXT and friends.
Stefan Sperling f43793a4 2020-01-27T22:14:23 fix a bug where 'got log PATH' failed to map PATH into the repository The problem occured inside /usr/src/sys due to the /sys symlink, where /usr/src was a got work tree. If a work tree is present we already have the right path so checking the disk is pointless.
Stefan Sperling fb9704af 2020-01-27T17:07:01 do not display unversioned files during 'got revert -R'
Stefan Sperling ac03cf6d 2020-01-17T14:37:03 fix bug in tag list tests where expected datestamps were swapped
Stefan Sperling 562580bc 2020-01-14T13:25:55 support Git-style "lightweight" tags as arguments for 'got diff'
Stefan Sperling d4efa91b 2020-01-14T13:25:55 handle Git-style "lightweight" tags in got tag -l
Stefan Sperling bb51a5b4 2020-01-13T10:28:58 add -E option to 'got checkout' allowing use of a non-empty work tree path needed by and ok kn@
Stefan Sperling 5aa81393 2020-01-06T19:38:23 add copyright year for files already touched in 2020
Stefan Sperling b32c4525 2020-01-05T19:19:59 make it possible to run regress tests with packed repositories
Stefan Sperling 5175b31a 2020-01-04T21:51:24 improve commit graph's error handling of non-existent paths
Stefan Sperling e51d7b55 2020-01-04T08:35:17 prevent rebase with an out-of-date work tree
Stefan Sperling 7f47418f 2019-12-20T15:54:59 make 'got checkout' and 'got update' work with read-only repositories but warn users about the garbage collection problem
Tracey Emery 70e3e7f5 2019-12-13T20:05:57 add -k option to 'got remove' to keep files on disk ok stsp
Tracey Emery f2a9dc41 2019-12-13T00:29:28 add -R option to 'got remove' for recursive deletion ok stsp
Stefan Sperling dbb83fbd 2019-12-13T00:27:57 there's no need to store a directory path in struct schedule_addition_args ok tracey
Stefan Sperling 6db9f7f6 2019-12-10T11:42:22 always show numeric dates in ISO-8601/xkcd-1179 format ok millert tracey sthen
Tracey Emery 022fae89 2019-12-06T16:18:26 Introduce -I to cmd_add to disregard ignores when adding recursively. Expand add.sh tests. Update TODO.
Stefan Sperling 38b0338b 2019-11-29T03:57:10 if there are no commits to rebase, just forward the rebased branch's reference Problem found by kn@
Stefan Sperling 4e68cba3 2019-11-23T10:11:54 add -R option to 'got add' for recursive addition (patch by Tracey Emery)
Stefan Sperling 6a5eff7c 2019-11-23T10:00:27 trim trailing whitespace in revert.sh (patch by Tracey Emery)
Stefan Sperling a74f7e83 2019-11-10T11:33:13 add -c option to 'got branch', replacing the optional second argument
Stefan Sperling 5d67f40d 2019-11-08T16:23:17 rename 'got init' and 'got import' default branch to "main"; patch by kmos@
Stefan Sperling 7b5dc508 2019-10-28T10:31:50 fix staging of multiple files with -p ok semarie
Stefan Sperling 11db6024 2019-10-21T15:17:31 show commit date's century in 'got blame' output (patch by Tracey Emery) tests adjusted by me
Stefan Sperling 8b692cd0 2019-10-21T09:04:57 remove lock files, as intended, when reintegrate gets aborted
Stefan Sperling f69721c3 2019-10-21T09:04:57 show base commit hash and omit filenames in conflict markers
Stefan Sperling 46f68b20 2019-10-19T11:06:56 show file mode differences when diffing trees
Stefan Sperling 523b8417 2019-10-19T11:06:55 handle xbit-only changes during 'got update'
Stefan Sperling 1ebedb77 2019-10-19T11:06:55 teach 'got commit' to tweak the executable bit of a file
Stefan Sperling 73529b9f 2019-10-15T16:31:50 set the executable bit on integrate.sh
Stefan Sperling 3aef623b 2019-10-15T11:38:28 catch and reject integration into the freshly rebased branch
Stefan Sperling 2822a352 2019-10-15T11:38:27 add 'got integrate' command
Stefan Sperling d136cfcb 2019-10-12T07:33:12 show original file content in conflict markers
Stefan Sperling d4fc9a62 2019-10-09T06:40:24 in test_ref_create, test creating a new ref based on a commit ID
Stefan Sperling 63035f9f 2019-10-06T19:24:31 add -w (ignore whitespace) option to 'got diff'
Stefan Sperling ad89fa31 2019-10-04T15:56:03 make 'got branch' without args show work tree's branch; requested by benno@
Stefan Sperling bd8de430 2019-10-04T14:51:33 make 'got status' read .gitignore files; support **/ and /**/ in patterns
Stefan Sperling db1d3576 2019-10-04T13:13:22 handle empty trees during 'import' and 'checkout'; spotted by sthen@
Stefan Sperling aba9c984 2019-09-08T17:14:34 obtain repo format version and commit author name/email from .git/config
Stefan Sperling 40b289d7 2019-09-07T12:05:27 make 'got status' ignore inaccessible directories (reported by semarie)
Stefan Sperling 72fd46fa 2019-09-06T17:11:26 fix modified files not shown by 'got status' after committing staged changes
Stefan Sperling dca75039 2019-09-02T09:56:40 fix tag_list test failure on single-day-digit dates (patch by Evan Silberman)
Stefan Sperling 6aeab596 2019-08-28T14:51:42 fix deletion of branches stored in packed-refs broken since 29606af7a3a58767bf817a38035490899609d13e
Stefan Sperling dfe70b4b 2019-08-27T11:21:59 rename test for consistency with other tests for path-prefix behaviour
Stefan Sperling 0cfcb52d 2019-08-27T11:20:49 regression test for previous 'got log path' fix (patch by Evan Silberman)
Stefan Sperling 896e9b6f 2019-08-26T15:10:12 add support for path arguments to 'got cat'
Stefan Sperling 44392932 2019-08-26T00:13:01 make 'got log -p path' display patches for the specified path only
Stefan Sperling a4f89d48 2019-08-25T13:45:30 allow creating branches based on commit IDs as well as other branch references
Stefan Sperling 45cd4e47 2019-08-25T13:30:38 detect and prevent deletion of the work tree's current branch
Stefan Sperling 63c5ca5d 2019-08-24T20:56:15 detect and ignore Git submodules
Stefan Sperling 2a06fe5f 2019-08-24T12:58:07 indicate non-existent paths in 'got status' and make 'got diff' error for them
Stefan Sperling b8bad2ba 2019-08-23T20:01:06 make 'got tag -l' list tags by time stamp in descending order
Stefan Sperling e8039a4a 2019-08-23T13:20:34 create tag objects with both Git and Got during tag -l test
Stefan Sperling 2417344c 2019-08-23T13:19:31 tweak the way 'got tag -l' displays tagged objectsI
Stefan Sperling ea6d9f6b 2019-08-22T22:55:04 add a colon behind object type in got tag -l, for consistency
Stefan Sperling 8e7bd50a 2019-08-22T22:20:56 initial implementation of 'got tag' command
Stefan Sperling a009df92 2019-08-22T18:55:02 fix typo in comment
Stefan Sperling 8aa93786 2019-08-22T18:04:32 make 'got cat' output look more like raw object files
Stefan Sperling 01073a5d 2019-08-22T14:17:38 initial 'got cat' implementation
Stefan Sperling 4c9641fd 2019-08-21T16:57:44 fix and simplify blame algorithm Always diff against latest version of file. This is much easier since there is no need to keep track of lines shifting around.
Stefan Sperling 16357e96 2019-08-19T13:17:26 add another xfail blame test case
Stefan Sperling b24db1c1 2019-08-19T12:49:49 test suite: cross-check got blame results with git blame
Stefan Sperling 548237bc 2019-08-19T11:29:01 fix blame bug where lines got annotated with wrong commit
Stefan Sperling 8d725ae1 2019-08-17T09:37:25 make blame go through first parent history; add more blame test cases
Stefan Sperling 0b2899f8 2019-08-18T11:26:15 attribute commits created with git(1) in test suite to Flan Hacker
Sebastien Marie 3d69ad8d 2019-08-17T15:28:04 make 'got revert' to ignore unversioned files instead of aborting with 'bad path' and add a regress to check the revert isn't aborted anymore
Stefan Sperling 0def28b1 2019-08-17T10:15:35 fix 'last commit cannot be folded' check with reordered commits
Stefan Sperling 6af1ccbd 2019-08-16T13:16:50 sort tree object entries the way git likes it
Stefan Sperling bcb49d15 2019-08-15T00:07:22 make 'got blame' show dates at which lines were last modified
Stefan Sperling 82f6abb8 2019-08-14T23:37:07 make 'got blame' show committer names
Stefan Sperling 7ef28ff8 2019-08-14T23:10:00 make 'got blame' show line numbers
Stefan Sperling b1ebc001 2019-08-13T23:54:01 add GOT_LOG_DEFAULT_LIMIT env var for setting a got log -l default
Stefan Sperling 5a8ddf14 2019-08-13T17:08:56 also test "leightweight" tags in log tag test
Stefan Sperling a436ad14 2019-08-13T10:41:25 make 'got log' display tags in addition to branch references
Stefan Sperling 2d463f36 2019-08-13T00:42:47 test behaviour when 'got ref -s' is given a non-reference target
Stefan Sperling d1c1ae5f 2019-08-13T00:33:25 introduce 'got ref -s' and add two tests for 'got ref'
Stefan Sperling fc66b545 2019-08-12T14:45:02 fix behaviour of 'got rebase' with no commits to rebase; with semarie@
Stefan Sperling 78695fb7 2019-08-12T12:38:08 fix blame with single-commit history and with files without \n
Stefan Sperling d24820bf 2019-08-11T21:19:14 add support for tag objects to 'got diff'
Stefan Sperling 6c6b73bb 2019-08-10T17:24:59 fix race condition in test_revert_patch_one_change
Stefan Sperling f1e81a05 2019-08-10T16:57:20 fix bug where 'revert -p' would delete all lines following a reverted change
Stefan Sperling ce2b05c7 2019-08-10T16:12:32 test reverting the first hunk only with revert -p
Stefan Sperling 303e2782 2019-08-09T13:37:56 add support for tags to -c options of some got commands
Stefan Sperling 84792843 2019-08-09T12:31:18 attempt to reject GOT_AUTHOR values without an email address
Stefan Sperling 003cc5a3 2019-08-09T01:04:33 use a fake persona for GOT_AUTHOR; git can get confused by 'Charlie &'
Stefan Sperling 71db5e8c 2019-08-09T00:49:50 fix empty variable in two import regress tests
Stefan Sperling b80270a7 2019-08-09T00:12:00 make 'got status' find top-level .cvsignore when invoked from a subdir
Stefan Sperling 6841da00 2019-08-08T23:53:17 add support for .cvsignore files, as found in /usr/ports, to 'got status'