|
74ad335c
|
2020-06-23T19:17:36
|
|
fix unintended change of current working directory in a test case
|
|
|
7aadece8
|
2020-05-17T08:23:19
|
|
allow creation of commits which carry unmodified submodule tree entries along
approach suggested by ori@ and matches how git9 behaves
ok semarie@ (who can now work with Rust-related Git repos containing submodules)
|
|
|
e7303626
|
2020-05-14T19:27:44
|
|
add submodule tests
ok semarie
|
|
|
0208f208
|
2020-05-05T09:53:57
|
|
show a list of paths changed in a commit with 'got log -P', and in tog
requested by matthieu@
|
|
|
2e8c69d1
|
2020-05-04T19:37:36
|
|
fix "no such entry found in tree" error with got log -p and an added path
ok millert@
|
|
|
70551d57
|
2020-04-24T16:23:39
|
|
add a test for rebase file index corruption problem fix in previous commit
ok tracey
|
|
|
50f2fada
|
2020-04-24T16:22:28
|
|
fix 'got log -r' loading refs from the wrong repo if invoked in a work tree
ok tracey
|
|
|
b90c3048
|
2020-04-19T09:10:52
|
|
adjust expected "object not found" error output in tests
|
|
|
d7c4e80d
|
2020-04-19T08:57:07
|
|
fix expected output in clone and fetch tests
|
|
|
dbec59df
|
2020-04-18T21:24:54
|
|
add 'got log' -R option to reverse commit display order
|
|
|
9627c110
|
2020-04-18T18:40:01
|
|
show a summary of conflicts and related problems after updating/merging files
ok millert@
|
|
|
5036ab18
|
2020-04-18T18:40:00
|
|
make 'got update' skip conflicted files
ok millert@
|
|
|
ceb466a7
|
2020-04-18T11:21:53
|
|
add a test for 'got cherrypick' with existing merge conflicts
|
|
|
d1fe46f9
|
2020-04-18T10:28:24
|
|
add 'got log' -x option to stop logging when a specific commit was traversed
|
|
|
cb35d58a
|
2020-04-14T11:46:43
|
|
assign 'ret' explicitly in test_commit_normalizes_filemodes
|
|
|
f7b97ccb
|
2020-04-14T11:37:39
|
|
normalize tree entry modes to 0100644 or 0100755 when writing tree objects
semarie@ reported an error from go-git used by Cirrus CI:
"57243613255d758e15b0f5ae1c960b970f0435f8: malformed mode (0100640)!"
'git fsck' has no problem with mode 0100640. But writing just the two
most commonly used file modes should provide the best compatibility.
|
|
|
bcf34b0e
|
2020-03-26T17:10:59
|
|
make 'got fetch' restore our copy of the remote HEAD if the copy was deleted
|
|
|
3789fd73
|
2020-03-26T14:58:16
|
|
make 'got fetch -d' delete branches from both refs/heads and refs/remotes
|
|
|
d911dcf5
|
2020-03-25T16:02:40
|
|
set the executable bit on tree.sh
|
|
|
f1bcca34
|
2020-03-25T16:02:28
|
|
make 'got fetch' update our copy of the remote HEAD in case it has changed
|
|
|
f298ae0f
|
2020-03-25T15:08:59
|
|
make 'got clone' create refs/remotes/origin/HEAD, as 'git clone' does
|
|
|
75236079
|
2020-03-25T14:30:15
|
|
handle refs/remotes/origin/HEAD properly; reported by Matthias aka _xhr_
|
|
810a850e
|
2020-03-23T16:52:26
|
|
spacing
|
|
|
4e0a20a4
|
2020-03-23T16:51:40
|
|
make got tree work on current branch and add tests for this use case
ok stsp
|
|
|
a740a1b3
|
2020-03-22T19:42:48
|
|
use 'got commit' in test_rebase_delete_missing_file instead of Git
|
|
|
ca6da77d
|
2020-03-22T19:25:28
|
|
add a test for 'got rebase' to check behaviour on delete vs. delete
|
|
|
ba580f68
|
2020-03-22T15:08:33
|
|
prevent 'got commit' from comitting empty sub-directories; found by tracey
|
|
|
9c2e8939
|
2020-03-22T15:02:28
|
|
fix test sandbox name of test_rm_directory_keep_files
|
|
|
b2070a3f
|
2020-03-22T14:21:07
|
|
allow for limiting output of 'got ref -l' to a single ref or a namespace
|
|
|
e31abbf2
|
2020-03-22T14:21:06
|
|
add -c option to 'got ref' which now expects just one argument after options
|
|
|
e8a967e0
|
2020-03-21T22:44:07
|
|
make replacing symrefs actually work in 'got fetch'
|
|
|
ecdc3b49
|
2020-03-21T22:14:18
|
|
fail test_fetch_reference properly if fetch succeeds unexpectedly
|
|
|
0e4002ca
|
2020-03-21T21:49:13
|
|
add support for fetching arbitrary references to 'got clone' and 'got fetch'
|
|
|
db6d8ad8
|
2020-03-21T19:40:36
|
|
prevent existing tags from being overwritten by 'got fetch' by default
|
|
|
3ef2e71a
|
2020-03-21T18:16:30
|
|
set executable bit on clone.sh and fetch.sh
|
|
|
c8c71e6e
|
2020-03-21T17:28:30
|
|
add tests for 'got clone' and 'got fetch'; requires 'ssh 127.0.0.1' to work
|
|
|
62a4c94c
|
2020-03-20T15:01:15
|
|
support non-default port numbers with SSH and tweak URI parser port handling
|
|
|
a244cd92
|
2020-03-19T14:59:16
|
|
fix fetch test's expected results and check results properly
|
|
|
9a682fbe
|
2020-03-19T14:43:38
|
|
add support for Git's SCP style URLs to got_fetch_parse_uri()
|
|
|
629bd8f3
|
2020-03-18T16:11:28
|
|
fix fetch_test build
|
|
|
82ebf666
|
2020-03-18T16:10:34
|
|
tweak parse_uri() function, declare it as public API, and add a test for it
|
|
|
3969253a
|
2020-03-07T19:01:44
|
|
remove implicit entry update from got_fileindex_entry_alloc(); just alloc
|
|
|
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
|
|
|
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.
|
|
|
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.
|
|
|
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
|
|
|
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
|
|
|
80106605
|
2020-02-24T20:31:09
|
|
switch 'got tag' commit argument to a -c option for consistency
|
|
|
da76fce2
|
2020-02-24T20:31:09
|
|
let 'got branch' switch and update the work tree
ok tracey
|
|
|
7fa81f88
|
2020-02-21T01:06:03
|
|
allow 'got ref' to manipulate refs which do not have a slash in their name
|
|
|
bb63914a
|
2020-02-17T21:57:56
|
|
make tmp dir location a compile-time setting and change gotweb's tmp dir
We are not sure whether a gotweb package can own /var/www/tmp on OpenBSD.
Moving gotweb's tmp dir to /var/www/got/tmp sidesteps that issue.
|
|
|
1ae0a341
|
2020-02-14T15:43:03
|
|
add a test which ensures that 'got rebase' trims empty dirs from disk
|
|
|
5bda3ef8
|
2020-02-09T11:51:29
|
|
extend 'backout' tests; covers segfault found by semarie@ (fixed in 3c24af98)
|
|
|
db32465d
|
2020-02-07T18:02:56
|
|
add a test for bug fixed in a0975128
|
|
|
992eb9d8
|
2020-02-07T17:02:17
|
|
spelling
|
|
|
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.
|
|
|
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.
|
|
|
fb9704af
|
2020-01-27T17:07:01
|
|
do not display unversioned files during 'got revert -R'
|
|
|
ac03cf6d
|
2020-01-17T14:37:03
|
|
fix bug in tag list tests where expected datestamps were swapped
|
|
|
562580bc
|
2020-01-14T13:25:55
|
|
support Git-style "lightweight" tags as arguments for 'got diff'
|
|
|
d4efa91b
|
2020-01-14T13:25:55
|
|
handle Git-style "lightweight" tags in got tag -l
|
|
|
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@
|
|
|
5aa81393
|
2020-01-06T19:38:23
|
|
add copyright year for files already touched in 2020
|
|
|
b32c4525
|
2020-01-05T19:19:59
|
|
make it possible to run regress tests with packed repositories
|
|
|
5175b31a
|
2020-01-04T21:51:24
|
|
improve commit graph's error handling of non-existent paths
|
|
|
e51d7b55
|
2020-01-04T08:35:17
|
|
prevent rebase with an out-of-date work tree
|
|
|
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
|
|
|
70e3e7f5
|
2019-12-13T20:05:57
|
|
add -k option to 'got remove' to keep files on disk
ok stsp
|
|
|
f2a9dc41
|
2019-12-13T00:29:28
|
|
add -R option to 'got remove' for recursive deletion
ok stsp
|
|
|
dbb83fbd
|
2019-12-13T00:27:57
|
|
there's no need to store a directory path in struct schedule_addition_args
ok tracey
|
|
|
6db9f7f6
|
2019-12-10T11:42:22
|
|
always show numeric dates in ISO-8601/xkcd-1179 format
ok millert tracey sthen
|
|
|
022fae89
|
2019-12-06T16:18:26
|
|
Introduce -I to cmd_add to disregard ignores when adding recursively. Expand add.sh tests. Update TODO.
|
|
|
38b0338b
|
2019-11-29T03:57:10
|
|
if there are no commits to rebase, just forward the rebased branch's reference
Problem found by kn@
|
|
|
56e0773d
|
2019-11-28T02:32:58
|
|
convert tree entries from SIMPLEQ to an array
|
|
|
4e68cba3
|
2019-11-23T10:11:54
|
|
add -R option to 'got add' for recursive addition (patch by Tracey Emery)
|
|
|
6a5eff7c
|
2019-11-23T10:00:27
|
|
trim trailing whitespace in revert.sh (patch by Tracey Emery)
|
|
|
a74f7e83
|
2019-11-10T11:33:13
|
|
add -c option to 'got branch', replacing the optional second argument
|
|
|
5d67f40d
|
2019-11-08T16:23:17
|
|
rename 'got init' and 'got import' default branch to "main"; patch by kmos@
|
|
|
7b5dc508
|
2019-10-28T10:31:50
|
|
fix staging of multiple files with -p
ok semarie
|
|
|
11db6024
|
2019-10-21T15:17:31
|
|
show commit date's century in 'got blame' output (patch by Tracey Emery)
tests adjusted by me
|
|
|
8b692cd0
|
2019-10-21T09:04:57
|
|
remove lock files, as intended, when reintegrate gets aborted
|
|
|
f69721c3
|
2019-10-21T09:04:57
|
|
show base commit hash and omit filenames in conflict markers
|
|
|
46f68b20
|
2019-10-19T11:06:56
|
|
show file mode differences when diffing trees
|
|
|
523b8417
|
2019-10-19T11:06:55
|
|
handle xbit-only changes during 'got update'
|
|
|
1ebedb77
|
2019-10-19T11:06:55
|
|
teach 'got commit' to tweak the executable bit of a file
|
|
|
73529b9f
|
2019-10-15T16:31:50
|
|
set the executable bit on integrate.sh
|
|
|
3aef623b
|
2019-10-15T11:38:28
|
|
catch and reject integration into the freshly rebased branch
|
|
|
2822a352
|
2019-10-15T11:38:27
|
|
add 'got integrate' command
|
|
|
d136cfcb
|
2019-10-12T07:33:12
|
|
show original file content in conflict markers
|
|
|
d4fc9a62
|
2019-10-09T06:40:24
|
|
in test_ref_create, test creating a new ref based on a commit ID
|
|
|
63035f9f
|
2019-10-06T19:24:31
|
|
add -w (ignore whitespace) option to 'got diff'
|
|
|
ad89fa31
|
2019-10-04T15:56:03
|
|
make 'got branch' without args show work tree's branch; requested by benno@
|
|
|
bd8de430
|
2019-10-04T14:51:33
|
|
make 'got status' read .gitignore files; support **/ and /**/ in patterns
|
|
|
db1d3576
|
2019-10-04T13:13:22
|
|
handle empty trees during 'import' and 'checkout'; spotted by sthen@
|
|
|
aba9c984
|
2019-09-08T17:14:34
|
|
obtain repo format version and commit author name/email from .git/config
|
|
|
40b289d7
|
2019-09-07T12:05:27
|
|
make 'got status' ignore inaccessible directories (reported by semarie)
|
|
|
72fd46fa
|
2019-09-06T17:11:26
|
|
fix modified files not shown by 'got status' after committing staged changes
|
|
|
dca75039
|
2019-09-02T09:56:40
|
|
fix tag_list test failure on single-day-digit dates (patch by Evan Silberman)
|
|
|
6aeab596
|
2019-08-28T14:51:42
|
|
fix deletion of branches stored in packed-refs
broken since 29606af7a3a58767bf817a38035490899609d13e
|
|
|
dfe70b4b
|
2019-08-27T11:21:59
|
|
rename test for consistency with other tests for path-prefix behaviour
|