|
2822a352
|
2019-10-15T11:38:27
|
|
add 'got integrate' command
|
|
|
d136cfcb
|
2019-10-12T07:33:12
|
|
show original file content in conflict markers
|
|
|
c6368c2e
|
2019-10-11T09:10:54
|
|
properly handle read errors in got_packidx_init_hdr (found by jj@ scan-build)
|
|
|
d59c0cb2
|
2019-10-09T08:55:19
|
|
improve use of mixed size_t/off_t types in diff3.c's edscript()
|
|
|
b2338eff
|
2019-10-09T08:45:51
|
|
diff3.c: do not use the same variables for both line numbers and byte offsets
|
|
|
88775814
|
2019-10-09T08:30:54
|
|
diff3.c's skip() returns number of bytes skipped so switch from int to size_t
|
|
|
96cbb597
|
2019-10-09T08:24:38
|
|
remove worklist code; it was only used to unlink files which we already unlink
|
|
|
68bda3b1
|
2019-10-09T08:20:05
|
|
diff3.c: check for unlink errors and unlink dp13 and dp23 again
|
|
|
9688d20a
|
2019-10-09T08:02:04
|
|
rename local variable in diff3.c's edscript() from j to len (not a loop index)
|
|
|
9d4a5e89
|
2019-10-09T07:57:27
|
|
rename local variable in diff3.c's skip() from j to len (not a loop index)
|
|
|
db330080
|
2019-10-09T07:45:59
|
|
remove pointless attempt of unlinking temporary file name template paths
|
|
|
e4531130
|
2019-10-09T07:35:37
|
|
do not leak open file in diff3.c's readin() error paths
|
|
|
971405a7
|
2019-10-09T07:32:03
|
|
do not abuse d3s->fp[0] as a local variable in diff3.c's readin()
|
|
|
50351dee
|
2019-10-09T07:26:28
|
|
remove unused 'pr' argument from diff3.c's skip() function
|
|
|
24b5452a
|
2019-10-09T06:50:28
|
|
show bad reference names in error messages to make such errors more clear
|
|
|
575e8218
|
2019-10-07T10:26:33
|
|
more mechanical conversions to struct got_error: buf_load() and buf_alloc()
|
|
|
63035f9f
|
2019-10-06T19:24:31
|
|
add -w (ignore whitespace) option to 'got diff'
|
|
|
e19660d5
|
2019-10-06T18:59:31
|
|
some whitespace fixes in diff3.c
|
|
|
346b301a
|
2019-10-06T18:51:41
|
|
check for errors from buf_append() in diff3.c's diff_output()
|
|
|
950435fd
|
2019-10-06T18:48:11
|
|
remove pointless debug code from diff3.c
|
|
|
18b9ebab
|
2019-10-06T18:44:35
|
|
eflag in diff3.c is hard-coded to 3; remove code for other cases
|
|
|
e9dabdfb
|
2019-10-06T18:23:02
|
|
check for errors from fseek(3) in diff3.c's edscript()
|
|
|
ce09ab8d
|
2019-10-06T18:20:02
|
|
check for errors from diff_output() in diff3.c
|
|
|
02b87977
|
2019-10-06T18:11:34
|
|
convert remaining functions in diff3.c to struct got_error
|
|
|
f571bb85
|
2019-10-06T17:36:20
|
|
convert error handling in diff3.c's repos() to struct got_error
|
|
|
180dce26
|
2019-10-06T17:09:32
|
|
convert handling in diff3.c's merge() function to struct got_error
|
|
|
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@
|
|
13555e04
|
2019-09-28T12:26:47
|
|
Show only whitelisted commit headers in 'got log'
Generic way to deal with gpgsig header or extra headers added by some tools.
All headers still available via 'got cat'
ok stsp@
|
|
500467ff
|
2019-09-25T22:02:03
|
|
getline: fix the return type to ssize_t and small nits
|
|
|
b077bccd
|
2019-09-22T19:03:17
|
|
remove pointless oflag from struct diff3_state
|
|
6dea73df
|
2019-09-22T22:47:16
|
|
Replace fgetln() with getline()
getline() is, per the latter's OpenBSD man page, safer and more
portable than fgetln().
|
|
|
303e14b5
|
2019-09-22T16:04:05
|
|
Add missing includes for time() and ctime()
These headers were implicitly used on OpenBSD, but building on Linux
revealed that <time.h> wasn't included directly. diffreg.c uses
ctime(), which additionally needs <sys/types.h>.
|
|
|
83290b45
|
2019-09-22T15:59:06
|
|
Remove return value from diffreg's fetch()
The last use of this was removed in
0165cdf03ffac4c24334979832ad27554913d54c over a year ago.
|
|
|
8fbe07c2
|
2019-09-22T15:58:49
|
|
Remove unused variable in diffreg's fetch()
|
|
|
f66c734c
|
2019-09-22T15:24:34
|
|
missing error check in write_tree(); found by jj@ with scan-build
|
|
|
909d120e
|
2019-09-22T15:21:26
|
|
missing errer check in update_blob(); found by jj@ with scan-build
|
|
|
4793d91b
|
2019-09-22T15:16:33
|
|
have got_object_parse_* check for zero-length input
|
|
|
6ced7ba8
|
2019-09-22T13:28:06
|
|
avoid a NULL deref in diff_fileindex_tree(); found by jj@ with scan-build
|
|
|
b1317e77
|
2019-09-22T10:51:10
|
|
plug error leak in got_packidx_init_hdr(); found by jj@ with scan-build
|
|
|
aa6c0b51
|
2019-09-22T10:35:16
|
|
remove unused variable in got_privsep_recv_obj() (patch by Steven McDonald)
|
|
|
5cade901
|
2019-09-22T10:34:44
|
|
fix error return in got_path_find_prog() (patch by Steven McDonald)
|
|
|
d6fca0ba
|
2019-09-15T13:51:17
|
|
check calloc() for NULL return value
|
|
|
25dced9b
|
2019-09-15T13:46:51
|
|
fix possible memleak in worklist_add() if path is too long
|
|
|
ddc7b220
|
2019-09-08T18:29:14
|
|
do not leak ibuf in error paths of read_*_privsep()
|
|
|
c9956ddf
|
2019-09-08T18:13:54
|
|
use author name/email from ~/.gitconfig if GOT_AUTHOR is not set
|
|
|
aba9c984
|
2019-09-08T17:14:34
|
|
obtain repo format version and commit author name/email from .git/config
|
|
|
4b55f459
|
2019-09-08T13:13:37
|
|
fix indentation in lib/worktree.c
|
|
|
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
|
|
|
6b68ccd6
|
2019-09-01T13:10:13
|
|
prevent theoretical double-free with non-OpenBSD asprintf (found by jasper)
|
|
|
cc483380
|
2019-09-01T13:08:13
|
|
fix NULL deref in got_error_from_errno via got_error_uuid (found by jasper)
|
|
|
cdb8f1fa
|
2019-08-28T18:50:20
|
|
fix possible NULL deref in alloc_symref()
|
|
|
7f11502c
|
2019-08-28T18:48:27
|
|
fix possible use-after-free in got_worktree_close()
|
|
|
6772cf22
|
2019-08-27T19:01:04
|
|
got_packidx_open: free packidx object when open(2) fails
|
|
|
57ebf19f
|
2019-08-27T19:00:15
|
|
buf_alloc: free whole BUF* in allocation failure path
|
|
|
6aeab596
|
2019-08-28T14:51:42
|
|
fix deletion of branches stored in packed-refs
broken since 29606af7a3a58767bf817a38035490899609d13e
|
|
|
f2db9c47
|
2019-08-24T22:14:29
|
|
don't mask "not a git repo" errors in got_repo_open()
|
|
|
1d126e2d
|
2019-08-24T14:39:58
|
|
add support for reading .git/config; parser was based on isakmpd/conf.c
|
|
|
63c5ca5d
|
2019-08-24T20:56:15
|
|
detect and ignore Git submodules
|
|
|
2a06fe5f
|
2019-08-24T12:58:07
|
|
indicate non-existent paths in 'got status' and make 'got diff' error for them
|
|
|
b8bad2ba
|
2019-08-23T20:01:06
|
|
make 'got tag -l' list tags by time stamp in descending order
|
|
|
29606af7
|
2019-08-23T18:42:27
|
|
allow got_ref_list() to restrict returned refs to a particular namespace
|
|
|
de30857e
|
2019-08-23T16:40:51
|
|
fix reading pack index files with large offsets (patch by Hiltjo Posthuma)
|
|
|
2575b0eb
|
2019-08-22T22:51:39
|
|
use correct label for author (aka tagger) info when writing tag objects
|
|
|
8e7bd50a
|
2019-08-22T22:20:56
|
|
initial implementation of 'got tag' command
|
|
|
8aa93786
|
2019-08-22T18:04:32
|
|
make 'got cat' output look more like raw object files
|
|
|
24ea5512
|
2019-08-22T14:26:00
|
|
make 'got cat' show raw log messages, i.e. leaving PGP sigs intact
|
|
|
01073a5d
|
2019-08-22T14:17:38
|
|
initial 'got cat' implementation
|
|
|
6fb7cd11
|
2019-08-22T11:33:50
|
|
add cancellation support to commit graph and 'got blame'
|
|
|
e6209546
|
2019-08-22T11:12:24
|
|
untie cancel callback declaration from the work tree
|
|
|
d0275cf7
|
2019-08-22T01:15:38
|
|
remove unused variable in blame_commit()
|
|
|
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.
|
|
|
d0c4e49e
|
2019-08-19T12:12:30
|
|
remove pointless offset variable in get_blamed_line()
|
|
|
548237bc
|
2019-08-19T11:29:01
|
|
fix blame bug where lines got annotated with wrong commit
|
|
|
b02560ec
|
2019-08-19T09:54:52
|
|
fix number of lines accounted for during blame
|
|
|
84f17c46
|
2019-08-18T15:11:10
|
|
don't put pointless zero-offset chunk at head of diffset list
|
|
|
1e45b069
|
2019-08-18T15:02:58
|
|
don't add chunks with zero offset to diffoffset list
|
|
|
8d725ae1
|
2019-08-17T09:37:25
|
|
make blame go through first parent history; add more blame test cases
|
|
|
14ed98fd
|
2019-08-15T01:57:45
|
|
remove unused 'oldfile' parameter from diffreg.c's fetch()
|
|
|
0b2899f8
|
2019-08-18T11:26:15
|
|
attribute commits created with git(1) in test suite to Flan Hacker
|
|
|
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
|
|
|
dd4a6547
|
2019-08-17T10:17:49
|
|
plug memory leak in sort_tree_entries_the_way_git_likes_it()
|
|
|
6af1ccbd
|
2019-08-16T13:16:50
|
|
sort tree object entries the way git likes it
|
|
|
0d8ff7d5
|
2019-08-15T00:15:32
|
|
rename got_blame_incremental() to got_blame()
|
|
|
e27a7222
|
2019-08-14T22:52:57
|
|
remove got_blame() API, now unused
|
|
|
f595d9bd
|
2019-08-14T22:51:13
|
|
fix line offset calculations in got_object_blob_dump_to_file()
|
|
|
09867e48
|
2019-08-13T17:01:23
|
|
properly parse timestamps in commit objects as UTC (patch by Hiltjo Posthuma)
|
|
|
5943eee2
|
2019-08-13T16:58:34
|
|
strip Git GPG signatures from log messages
|
|
|
5d844a1e
|
2019-08-13T15:41:46
|
|
don't attempt to parse Git's "leightweight" tags as real tag objects
|
|
|
8d2c5ea3
|
2019-08-13T10:49:23
|
|
don't leak memory for pack file path when opening objects
|
|
|
ca0d469c
|
2019-08-13T10:20:42
|
|
don't forget to do refcounting in got_object_tag_close()
|
|
|
29e86f7a
|
2019-08-13T00:32:42
|
|
introuce a hard limit on recursion through symbolic references
|
|
|
12ce7a6c
|
2019-08-12T20:56:30
|
|
include <limits.h> instead of <sys/limits.h>; patch by Thomas Klausner
|
|
|
78695fb7
|
2019-08-12T12:38:08
|
|
fix blame with single-commit history and with files without \n
|
|
|
d24820bf
|
2019-08-11T21:19:14
|
|
add support for tag objects to 'got diff'
|
|
|
718ef3e9
|
2019-08-11T20:15:17
|
|
simplify cleanup code paths in got_path_find_prog()
|
|
|
202329ae
|
2019-08-11T20:11:56
|
|
fix some more occurrences of potential errno clobbering
|
|
|
41d2888b
|
2019-08-11T20:03:36
|
|
move an assignment closer to error check in got_object_get_path()
|
|
|
b15816dd
|
2019-08-11T20:01:21
|
|
in got_fileindex_entry_update() don't hide errors other than ENOENT
|