Commits
- Commit:
9d70a0bf7236fdcfbe7186f0d90a5a15f5a10b18
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: make UUID includes generic
Move the detection of UUID header files to be included portably. This
will have no functional effect until MacOS detection is put in place.
- Commit:
fe1d86855517f122428c120d5c41f4af72120637
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix 'got diff' on files which match an ignore pattern; found by Omar Polo
- Commit:
84bf00a657aa272bf25d00785cfc8302c60e2fca
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
improve 'got add' error message if file does not exist; reported by Timo Myyrä
ok tracey
- Commit:
d5a18aced0bb9a9cb91f83832693160ea4eec898
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got rm' report an "unexpected status" error for unversioned files
ok millert@
- Commit:
d64cc78a320df6e371662d50eba6332a7be001c6
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got rm' behave like rm(1) for paths found missing on disk
ok millert@
- Commit:
ce0bbcfd76f150d6b4253f7ac8817db59aad88ac
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove non-reachable 'return NULL' statement from report_single_file_status()
- Commit:
e8f02263080ea8f6ff76ae63d06d6de4c4212c55
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
compress delta data from delta_cache directly into pack file
- Commit:
48b4f239031ad66225f64bd6745f4a57a35c3a0f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
wrap overlong lines
- Commit:
fc63f50d9b54fdd7a892d5a770542bdb07fb05d1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add O_CLOEXEC (close-on-exec) to openat(2) calls
suggested by millert
ok thomas_adam
- Commit:
063406214771fb1483c7582bc7bd45f5d6b26c48
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add O_CLOEXEC (close-on-exec) flag to open(2) calls
suggested by millert
ok thomas_adam
- Commit:
c56c5d8a20e8209334b5357111eddee0861cddae
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add "e" (close-on-exec) flag to fopen(3) calls
suggested by millert
ok thomas_adam
- Commit:
24f136e0f955e179395f9d081b45fbea32f02325
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
preverse binary files during updates and merges
- Commit:
1ea7ccc6f361b1b07c3f3c301b033ea50b17cf54
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
let gotadmin find the repository automatically if invoked in a work tree
Move a small amount of code from worktree.c to a new file worktree_open.c,
which contains everything required to open and close a work tree and inspect
some of its basic parameters. This can be used by gotadmin.
ok tracey
- Commit:
6092c29954d72000fdc1b6fe2a9c10ff56aabc65
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
skip ignored directories during 'got status' disk crawl
- Commit:
ae1e948a3179529896cf69272a0c1b45ab8ced1c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
show commit progress output when 'got merge -c' is used
Otherwise no progress output is shown at all with this command.
Commit progress output will also display any additional changes
which resulted from conflict resolution.
ok millert@
- Commit:
3dc1dc04a5ecf97ba3ce3f8c103c73bcfe00e31e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
for portability, handle errno variations upon open(2) failure with O_NOFOLLOW
Problem pointed out by naddy for FreeBSD -portable.
Discussed with millert, thomas adam, and naddy.
- Commit:
ace90326f82adffc32a25213124922899e849771
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
allow bad symlinks to survive a merge
Commands which perform merges will now install bad symlinks as symlinks
in the work tree, instead of creating them as regular files. This means
bad symlinks committed with 'got commit -S' (or Git) will be preserved.
The decision to introduce a bad symlink is done at commit-time and
merges should not forcefully reverse this decision.
The cherrypick and backout commands require a manual commit step, and
a merge result with bad symlinks will require use of 'got commit -S'.
Additional testing by thomas adam
- Commit:
92a9e85d28a30997176ce0d3c2915e3ea70782c7
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: add FreeBSD support
This adds the capability to compile got-portable on FreeBSD.
- Commit:
e6f4ba3109814ba43d3a9e9c9c9dc55c40149dbc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix 'got update' of an added + obstructed file
When 'got update' tried to add a new file to the work tree and this
file was obstructed by, say, a directory on disk, the update failed:
$ got update
? new
got: new: Is a directory
$
And the work tree was not updated.
With this commit this situation is properly detected as an obstruction
and the update succeeds:
$ got update
~ new
Updated to refs/heads/master: c1f85b4938dc4c668a88f13df2b98a520fc077cc
File paths obstructed by a non-regular file: 1
$
Extend a corresponding test case to cover this issue.
ok tracey
- Commit:
dfe86d1fa6f81d3a709059eda591863efd8d5a34
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
plug memory leak in got_worktree_merge_in_progress(); spotted by tracey
- Commit:
10604dce6e625d11974fb5491598bbb54069e5d3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add a 'got merge' command for creating merge commits
Additional testing by Thomas Adam.
ok tracey
- Commit:
dd038bc6ec835ad3fd3c0b5303b8af9ad506c8cc
- From:
- Thomas Adam <thomas@xteddy.org>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
portable: initial Linux compilation
This commit modifies the GoT main branch to be able to compile it under
linux.
- Commit:
abc59930d57a2d46c310e1b0c758c948554bc1af
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
indentation fixes
- Commit:
69de9dd4215502c97f3e9b6c95cd1ce609fba278
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
limit checks for merge conflicts to files affected by the merge
Performance problems reported by naddy
- Commit:
5546d4669ccce281a6f6f89ccf204e671ed0d3a9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
plug a memory leak in check_merge_ok()