|
a129376b
|
2019-03-29T00:04:52
|
|
add initial implementation of 'got revert'
|
|
fc6346c4
|
2019-03-27T12:51:30
|
|
don't leave file as unversioned in case of wt edit vs repo rm
|
|
13d9040b
|
2019-03-27T12:33:41
|
|
test and improve behaviour for wt edit vs repo rm conflict
|
|
708d8e67
|
2019-03-27T12:00:59
|
|
fix behaviour when update deletes an edited file
|
|
7154f6ce
|
2019-03-27T09:22:15
|
|
make 'got status' detect and indicate merge conflict markers
|
|
01a44956
|
2019-03-27T08:36:44
|
|
declare conflict marker strings in got_lib_diff.h
|
|
1430b4e0
|
2019-03-27T08:18:28
|
|
treat 'add vs add' on update as a text conflict for now
|
|
71a29355
|
2019-03-27T07:48:54
|
|
fix behaviour when 'got rm' is used twice
|
|
5c99ca9f
|
2019-03-27T07:41:37
|
|
fix behaviour when 'got add' is used twice
|
|
031a5338
|
2019-03-26T10:46:18
|
|
make got_worktree_schedule_add() report 'added' via status_cb
|
|
2ec1f75b
|
2019-03-26T10:35:33
|
|
add a basic implementation of 'got rm'
|
|
049da17d
|
2019-03-26T10:34:58
|
|
use correct diff header label for deletion in got_diff_blob_file()
|
|
d00136be
|
2019-03-26T09:03:53
|
|
implement a basic 'got add' command
|
|
5e3ce57a
|
2019-03-26T09:00:13
|
|
return relative paths from got_path_skip_common_ancestor()
|
|
db5ba8ed
|
2019-03-26T08:59:56
|
|
init output argument of got_path_skip_common_ancestor()
|
|
ddce0520
|
2019-03-26T07:02:59
|
|
allow file index entries without blobs and/or commits
|
|
eb983b4b
|
2019-03-26T06:49:00
|
|
make file index flags private to fileindex.c
|
|
e288864f
|
2019-03-26T06:44:27
|
|
renmae GOT_FILEIDX_F_NOT_ON_DISK to GOT_FILEIDX_F_NOT_FLUSHED
|
|
2181e0c8
|
2019-03-19T16:00:06
|
|
add some initial code for zlib compression
|
|
5211b8c8
|
2019-03-19T13:26:23
|
|
improve error checking around inflateInit()
|
|
23bc48a9
|
2019-03-19T12:55:28
|
|
rename got_zstream_* to got_inflate_*
|
|
e02fc99f
|
2019-03-19T12:40:44
|
|
move declaration of object labels to got_lib_object.h
|
|
7baf5860
|
2019-03-19T12:37:32
|
|
avoid code duplication in error case of open_blob()
|
|
ff2a4428
|
2019-03-19T12:34:28
|
|
rename "object tags" to "labels" to avoid confusion with tag objects
|
|
b70703ad
|
2019-03-18T17:16:10
|
|
fix bugs in got_repo_map_path() and add more related tests
|
|
6c7ab921
|
2019-03-18T16:48:18
|
|
introduce got_worktree_resolve_path()
|
|
c2ac9456
|
2019-03-15T16:39:34
|
|
add missing 'static' for local functions
|
|
a0bf6e76
|
2019-03-15T16:35:47
|
|
rename 'intent-to-add' file index flag to 'not-on-disk'
|
|
598a8b91
|
2019-03-15T13:38:49
|
|
implement support for packed refs in 'got ref -d'
|
|
6249107b
|
2019-03-15T13:35:47
|
|
fix uninitialized variable in insert_ref()
|
|
80d5fc1f
|
2019-03-15T13:24:51
|
|
use sizeof instead of SHA1_DIGEST_LENGTH in memcpy
|
|
6fdbf7b0
|
2019-03-15T13:14:08
|
|
better malloc size idiom in insert_ref()
|
|
c0a1c016
|
2019-03-15T13:11:20
|
|
move assignment closer to check in parse_ref_file()
|
|
505287be
|
2019-03-15T13:06:47
|
|
properly handle duplicates when calling insert_ref()
|
|
27a1ed03
|
2019-03-15T12:59:35
|
|
don't leak 'new' in insert_ref()
|
|
0bb4abae
|
2019-03-15T12:50:27
|
|
better fparseln error handling and memory leak fix in got_ref_list()
|
|
7ab0422a
|
2019-03-15T12:49:08
|
|
better foarseln() error handling in open_packed_ref()
|
|
c980e470
|
2019-03-15T12:47:15
|
|
plug memleak in alloc_ref()
|
|
c53671d0
|
2019-03-15T12:45:56
|
|
plug memleak in got_ref_resolve()
|
|
f9267c9a
|
2019-03-15T11:09:41
|
|
set an is_packed flag on refs parsed from packed-refs file
|
|
e09d28b1
|
2019-03-15T11:09:02
|
|
plug two memory leaks when refs get closed
|
|
7bcb2ecf
|
2019-03-11T20:24:21
|
|
move worktree base refs into a subdirectory
|
|
d1667f0d
|
2019-03-11T20:22:28
|
|
introduce got_path_dirname()
|
|
5e1c9f23
|
2019-03-11T20:13:26
|
|
fix dirname() usage errors around got_path_mkdir()
|
|
49c7094f
|
2019-03-11T20:02:10
|
|
fix broken error checking in got_ref_write()
|
|
ddcd8544
|
2019-03-11T19:57:53
|
|
move worktree-specific error handling out of got_path_mkdir()
|
|
47112f60
|
2019-03-11T19:32:21
|
|
fix allocation size bug in got_lockfile_lock()
|
|
0647c563
|
2019-03-11T19:18:30
|
|
remove path portion from worktree base commit ref name
|
|
517bab73
|
2019-03-11T19:06:13
|
|
deduplicate code for constructing a worktree's base ref name
|
|
0c48fee2
|
2019-03-11T18:15:28
|
|
refuse to create got worktree at a git repo path
|
|
0cd1c46a
|
2019-03-11T18:07:33
|
|
create references to base commits of got worktrees
|
|
e2e879a0
|
2019-03-11T16:58:21
|
|
introduce got_ref_list_free() and use it in got and tog
|
|
2d2e1378
|
2019-03-11T16:34:33
|
|
add got_ref_delete(); only loose refs supported for now
|
|
8fa2f096
|
2019-03-11T16:28:11
|
|
fix off-by-one in fwrite() check in got_ref_write()
|
|
0fd469ce
|
2019-03-11T16:27:15
|
|
make got_ref_write() work for refs which do not exist yet
|
|
c789dbac
|
2019-03-11T16:26:28
|
|
fix bug in got_lockfile_lock() where it never succeeded
|
|
58908ed0
|
2019-03-11T16:25:39
|
|
fix path construction with empty subdir in open_ref()
|
|
9e672c74
|
2019-03-11T14:56:04
|
|
implement got_ref_write()
|
|
f02eaa22
|
2019-03-11T14:27:35
|
|
better error if .got directory is missing files
|
|
f77a24b0
|
2019-03-11T14:20:46
|
|
validate ref names
|
|
01b7ba6b
|
2019-03-11T11:36:40
|
|
add a lockfile API
|
|
5892cdd6
|
2019-03-10T16:17:12
|
|
introduce got_ref_alloc()
|
|
bd165944
|
2019-03-10T15:56:38
|
|
plug memleak in got_open_worktree()
|
|
c442a90d
|
2019-03-10T15:55:28
|
|
read UUID back from work tree meta data
|
|
ec22038e
|
2019-03-10T15:45:57
|
|
add a UUID to work tree meta data
|
|
09589288
|
2019-03-10T15:45:07
|
|
add got_error_uuid()
|
|
eb73a30f
|
2019-03-07T13:00:23
|
|
do not deadlock in waitpid() when user hits Ctrl-C
|
|
41496140
|
2019-02-21T15:17:36
|
|
prevent double-close(2) of file descriptors passed in imsg
|
|
3a11398b
|
2019-02-21T14:15:33
|
|
more specific mmap(2) failure checks
|
|
70a0c8ec
|
2019-02-20T10:35:33
|
|
preserve permissions on merged files
|
|
2a57020b
|
2019-02-20T09:43:09
|
|
clean up temp files if rename(2) fails
|
|
65ad4e61
|
2019-02-20T08:37:01
|
|
improve wording of a comment in merge_blob()
|
|
80c5c120
|
2019-02-19T13:38:08
|
|
missing fread(3) error check in get_file_status()
|
|
d10c9b58
|
2019-02-19T13:23:04
|
|
missing stat error check in read_meta_file()
|
|
68c76935
|
2019-02-19T13:20:39
|
|
update cached timestamps of files left unmodified after a merge
|
|
3cbbd752
|
2019-02-19T12:55:43
|
|
fix get_file_status() for files larger than blob read buffer size
|
|
af54ae4a
|
2019-02-19T12:03:13
|
|
avoid cross-device rename(2) after 3-way file merge
|
|
816dc654
|
2019-02-16T13:45:15
|
|
check for errors from fsync(2)
|
|
5ea74b5a
|
2019-02-11T14:20:09
|
|
don't close input files in dump_delta_chain_to_file(); caller does it
|
|
3a6ce05a
|
2019-02-11T12:32:53
|
|
check for errors from close(2)
|
|
bcd28dfd
|
2019-02-11T12:32:29
|
|
don't close input files in got_diffreg(); callers will do that
|
|
fb43ecf1
|
2019-02-11T11:59:09
|
|
check for errors from fclose()
|
|
cbe7f848
|
2019-02-11T11:35:55
|
|
check for fflush() errors
|
|
e135804e
|
2019-02-10T19:15:13
|
|
make got_ref_open() search on-disk refs before packed-refs
|
|
927df6b7
|
2019-02-10T18:42:29
|
|
allow restricting 'got diff' and 'got status' to a path in work tree
|
|
13ff9e90
|
2019-02-10T16:53:56
|
|
use break instead of goto to exit loop; no functional change
|
|
2c201a36
|
2019-02-10T16:41:44
|
|
make 'got status' ignore symlinks, for now
|
|
18831e78
|
2019-02-10T16:32:21
|
|
fix another path ordering bug during status/update crawl
|
|
b8f41171
|
2019-02-10T14:03:49
|
|
eliminate redundant stat() calls during status crawl
|
|
a378724f
|
2019-02-10T13:20:43
|
|
make 'got update' restore missing files
|
|
02c07007
|
2019-02-10T12:46:14
|
|
don't update cached timestamps of already modified files
|
|
ba8a0d4d
|
2019-02-10T12:30:06
|
|
clear executable bit when updating files if necessary
|
|
68ed9ba5
|
2019-02-10T12:02:52
|
|
preserve executable bit on files during checkout and update
|
|
276262e8
|
2019-02-08T15:27:19
|
|
fix typo in status code name: GOT_STATUS_MODIFIY -> GOT_STATUS_MODIFY
|
|
6353ad76
|
2019-02-08T15:12:00
|
|
make 'got update' merge file edits
|
|
57ee5d50
|
2019-02-08T15:10:49
|
|
allow callers of diff3 code to detect merge conflicts
|
|
a551f215
|
2019-02-08T14:58:30
|
|
diff3: make labels work and fix leaks
|
|
5d731149
|
2019-02-08T13:22:01
|
|
initialize temp_files in got_merge_diff3()
|
|
abc6a33f
|
2019-02-08T13:20:08
|
|
make readin() actually write to its output argument
|
|
25d0340b
|
2019-02-08T12:27:42
|
|
get rid of an unused global in diff3 code
|