Commits
- Commit:
10a623dfc23b47f494941e0eac741420c08372a3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
sort and de-duplicate work tree path command line arguments
This is important in cases like 'got diff file.txt file.txt' which
should only show the diff for file.txt once.
suggested by kn@
- Commit:
f6764181d7e0fc68673b90cbc93d6064509d0bd7
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' display the worktree's branch name upon success
ok tracey
- Commit:
67c65ed764e7542fc784be76cd535c4073c813c3
- From:
- Tracey Emery <tracey@traceyemery.net>
- Date:
add tests for checkout -q, update -q, and status -S. ok stsp
- Commit:
2c41dce749de6cee00ec5b611d0509f9e45f0fd7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow obstructed files skipped by 'got update' to be updated again
- Commit:
a769b60bb76783d3bc6637d75907b6ca5d623f40
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a bug where files skipped by 'got update' could not be updated again
ok semarie@
- Commit:
1c4cdd89292391629861b9a13688e94879efe2ea
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix bogus 'permission denied' error when a file at work tree root is removed
ok naddy
- Commit:
c6e8a8268ec4f4240d51dcfd54d05c5370060747
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
do not update symlinks which are already up-to-date
This fixes spurious 'U' notifications for symlinks during 'got update'
that occurred even when the work tree was fully up-to-date.
Observed on a work tree of the FreeBSD src repo and reproduced in our
test suite by adding a no-op update at the end of a test which deals
with updating symlinks.
- Commit:
d51387a0c213a0d133580b7cf37bca8f7e8569f3
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
expand coverage of test_update_single_file: test file deletion during update
- Commit:
79775c2f00066268b3ed08e320ef1ca812983705
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix copy-pasta in test_update_single_file
- Commit:
194cb7cb2a0f223daf0baa74a1e85bbbb44c10fd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix bug where 'got up -c commit path' deleted unrelated files from work tree
Problem reported by Timo Myyrä
- Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
- Commit:
1cb46f007dad47a45d2c2d32aaeee11372f95309
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
consistently label removed files as "/dev/null" in diff headers
- Commit:
f6cae3ed1ef0c22150181eeebb8f9e97db99dc5a
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
switch function declarations from Korn shell to Bourne/POSIX shell syntax
ok stsp
- Commit:
7fb414ae4d46ebdaeff458477ba801f9ad5853c4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a -q option to tests for quiet output and use it for 'make regress'
Previous default output remains when test cases are run individually.
ok tracey
- Commit:
b66cd6f325e3fa7ddd17ff6dd41cf6e59d04ebf5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
display more context info in "no such entry found in tree" error messages
- Commit:
283102fc7ecc50b874240654162793c0bd07a028
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove the symlink conflict header feature; it causes noise for little benefit
- Commit:
3b9f0f87ff620ce7d6ad75195b0c67425bc96ab7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle additional symlink conflicts and report skipping of unversioned files
- Commit:
993e2a1b1ac61a9d56877df5325d519f7b737375
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle symlink deletion and symlink conflicts during 'got update'
- Commit:
f35fa46a4c69eaeda5e106115e08b3cf8a0d3413
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add symlink support to 'got update'
- Commit:
e7303626967ed721dd323a8a6ea6c638aed46c50
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add submodule tests
ok semarie
- Commit:
9627c110bee81b5d7368441eaf4e661010ba9cd5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show a summary of conflicts and related problems after updating/merging files
ok millert@
- Commit:
5036ab18bf99be5d6811f17565b2c2fad47b3f73
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' skip conflicted files
ok millert@
- Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show base commit hash and omit filenames in conflict markers
- Commit:
523b8417c1fee8faa1a1732ffb036e97ae2ebb4a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle xbit-only changes during 'got update'