Commit Briefs

4f3c844bea Stefan Sperling

make 'got update' display the worktree's branch name upon success

ok tracey

diff | patch | tree

54c3959693 Stefan Sperling

use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA

diff | patch | tree

fe621944e8 Stefan Sperling

merge new diff implementation from the git.gameoftrees.org diff.git repository

This new diff implementation was started by Neels Hofmeyr during the u2k20 hackathon and now replaces diffreg.c code lifted from the OpenBSD base system. The integration of this code into Got was done by me. Got now uses the patience diff algorithm by default. The diff.git repository will remain the primary repository for the diff code, which already compiles and runs on other operating systems such as Linux. Any fixes and improvements for files inherited from the diff.git repository should be written against that repository and synced to got.git afterwards.

diff | patch | tree

f6cae3ed1e Christian Weisgerber

switch function declarations from Korn shell to Bourne/POSIX shell syntax

ok stsp

diff | patch | tree

7fb414ae4d Stefan Sperling

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

diff | patch | tree

75f0a0fb34 Stefan Sperling

stop reinstalling symlinks after commit; 'got update' can handle that

diff | patch | tree

35213c7c83 Stefan Sperling

forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them

diff | patch | tree

fa3cef6379 Stefan Sperling

make 'got stage -p' work with symlinks

diff | patch | tree

0aeb8099a0 Stefan Sperling

set a staged file type and handle it separately from the on-disk file type

diff | patch | tree

c631b11525 Stefan Sperling

make staging of symlinks work

diff | patch | tree

9627c110be Stefan Sperling

show a summary of conflicts and related problems after updating/merging files

ok millert@

diff | patch | tree

7b5dc508da Stefan Sperling

fix staging of multiple files with -p

ok semarie

diff | patch | tree

46f68b205b Stefan Sperling

show file mode differences when diffing trees

diff | patch | tree

72fd46fa56 Stefan Sperling

fix modified files not shown by 'got status' after committing staged changes

diff | patch | tree

2a06fe5f59 Stefan Sperling

indicate non-existent paths in 'got status' and make 'got diff' error for them

diff | patch | tree

d3bcc3d18a Stefan Sperling

make revert of a staged deletion a no-op for better interaction with -R

diff | patch | tree

0f6d741505 Stefan Sperling

implement got revert -R

diff | patch | tree

e70a841e31 Stefan Sperling

test repeated stage -p on added and deleted files

diff | patch | tree

af5a81b2ea Stefan Sperling

fix and test repeated stage -p on the same file

diff | patch | tree

0f1cfa7fd9 Stefan Sperling

add test with out-of-date staged files

diff | patch | tree

8564cb2124 Stefan Sperling

test stage/unstage with non-existent paths

diff | patch | tree

8b13ce36c3 Stefan Sperling

fix and test stage/unstage with unversioned files

diff | patch | tree

4ce4674049 Stefan Sperling

label staged blobs with "(staged)" in got diff output

diff | patch | tree

f5a17245fd Stefan Sperling

make got -p skip deletion question consistent with the others

diff | patch | tree

ec9d9b2fbd Stefan Sperling

stop passing paths to 'got stage' in basic stage test

diff | patch | tree