Commits

Commit:
69d57f3de25cfb3fd0cbfef22bd20090b36cee5e
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix spurious 'got cherrypick' error with a path prefix and an empty tree If the work tree's path prefix does not exist in the first of the two trees, then 'got cherrypick' failed with "no such entry found in tree". But this is a legitimate situation, as shown in the new test added here. The first tree could be the empty tree, for example, which should result in 'got cherrypick' adding all files from the second tree instead of complaining about a non-existent path-prefix directory in the first tree.
diff | patch | tree
Commit:
b66cd6f325e3fa7ddd17ff6dd41cf6e59d04ebf5
From:
Stefan Sperling <stsp@stsp.name>
Date:
display more context info in "no such entry found in tree" error messages
diff | patch | tree
Commit:
ff21961dc4dad7f7d30223f9b6fbe38fa9ca0b3c
From:
Tracey Emery <tracey@traceyemery.net>
Date:
plug some parse.y leaks
diff | patch | tree
Commit:
b2118c49a14c29447e228bf9a2b2a38f2da4f10b
From:
Stefan Sperling <stsp@stsp.name>
Date:
Add a 'got info' command which displays work tree meta-data. Remove the alias 'got in' for 'got init'. The 'in' alias was too close to either 'init' or 'info'. ok tracey, millert
diff | patch | tree
Commit:
cf07f22bd8beb1ed9e048433d553e394cc323c5f
From:
Stefan Sperling <stsp@stsp.name>
Date:
improve "got log ." command mark-up in got.1 EXAMPLES
diff | patch | tree
Commit:
aa9ad2764a70adc7378ea2b701d08f9dd7c8dd7d
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix use of uninitialized variable in got_fileindex_entry_update()
diff | patch | tree
Commit:
af358f55386cfa2314813941ea81d531795792b0
From:
Stefan Sperling <stsp@stsp.name>
Date:
tweak description of new -S option for 'got commit' and 'got stage' with input from + ok tracy and millert
diff | patch | tree
Commit:
559d127ca5c66567e9ab8afe6f5ab9d866d7d735
From:
Stefan Sperling <stsp@stsp.name>
Date:
errant tab found by tracey
diff | patch | tree
Commit:
41806587196ab5f410de18aee2567cac7deb5d6b
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix missing 'return 1' in commit.sh test failure cases
diff | patch | tree
Commit:
283102fc7ecc50b874240654162793c0bd07a028
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove the symlink conflict header feature; it causes noise for little benefit
diff | patch | tree
Commit:
f9eec9d5cdd0cbb22e0d3ed2d1cb55569afafce9
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename get_symlink_status() to get_symlink_modification_status() for clarity
diff | patch | tree
Commit:
f179e66de44d3541fbbcf6be9a5bcc70465f0bc9
From:
Stefan Sperling <stsp@stsp.name>
Date:
use a shortcut in get_file_status() for detecting symlinks appearing on disk
diff | patch | tree
Commit:
fda8017d0d1d1314b68ea9776bb563c2ea127f3e
From:
Stefan Sperling <stsp@stsp.name>
Date:
move deeply indented code from unstage_path() to a new unstage_hunks() helper
diff | patch | tree
Commit:
36bf999ca5297d07cc17f79a154b0875c1574148
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got unstage -p' work with symlinks
diff | patch | tree
Commit:
aa0926921193099319156437044e75e4b7b702e1
From:
Stefan Sperling <stsp@stsp.name>
Date:
initialize output parameter of got_object_blob_read_to_str(); found by ofree
diff | patch | tree
Commit:
cf0e59fe1a0f4e26a3cad1593337c6c93245fc02
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix wrong test result check in revert.sh symlink test
diff | patch | tree
Commit:
c2677d5d89614e1ee741e7db045977d219d097f9
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix missing return statements in revert.sh symlink test failure cases
diff | patch | tree
Commit:
dfe9fba06700a32516eb465d89fe7e0b6d96ad2f
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove merge_blob() fallback from merge_symlink(); let callers handle this
diff | patch | tree
Commit:
75f0a0fb346fb0ad381536024728164cd32d2a7e
From:
Stefan Sperling <stsp@stsp.name>
Date:
stop reinstalling symlinks after commit; 'got update' can handle that
diff | patch | tree
Commit:
35213c7c838a48142d398147b54bb9938af8cab0
From:
Stefan Sperling <stsp@stsp.name>
Date:
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
diff | patch | tree
Commit:
3c1ec782ab68abf6084ad937bc2a3e4a9c8fe049
From:
Stefan Sperling <stsp@stsp.name>
Date:
put checks for bad symlink target paths into a dedicated function
diff | patch | tree
Commit:
ea7786be381853efad88beae518c19a391d13791
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got unstage' work with symlinks
diff | patch | tree
Commit:
b7422a2f5c775615ff397e14c04aa9c9a41504c1
From:
Stefan Sperling <stsp@stsp.name>
Date:
stop using realpath(3) to resolve a symlink target in install_symlink() We should not resolve a symlink target path recursively when installing a symlink in the work tree. We want to handle this symlink's target, not the end result of following a chain of symlinks in case such links already exist.
diff | patch | tree
Commit:
369fd7e5fa99b95f7d7aa812b5260584b86a3778
From:
Stefan Sperling <stsp@stsp.name>
Date:
add support for symlinks to 'got revert -p'
diff | patch | tree
Commit:
fa3cef63799016195e8a917f39c82815522692aa
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got stage -p' work with symlinks
diff | patch | tree