Commit Briefs

8469d82143 Stefan Sperling

always show commit or tree IDs in diff header, in order to help 'got patch'

The idea is that got patch can simply look for a line such as: commit - abcde1234567... to find the merge base commit ID to show in diff3 conflict markers. got log -p now displays commit IDs in its diff header, instead ofl tree or blob IDs. ok op@


49c543a6fe Christian Weisgerber

use test(1) -eq and -ne to compare integers, and reduce quoting

This brings the rest of the regression test scripts in line with patch.sh.



566e0ee7be Thomas Adam

regress: make test operands POSIX compliant

Since the interpreter for the regress shell scripts are using /bin/sh this will usually imply some level of POSIX compliance (that isn't bash-specific, for instance). Some systems use dash as their sh shell and as such is stricter POSIX compliance. To help -portable, make the shell test checks use a single '=' for equality, rather than '=='.


10a623dfc2 Stefan Sperling

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@


67b631c9e0 Stefan Sperling

implement 'got diff -c' for diffing commits with optional filtering by path

Need for filtering by path sugggested by kn@ ok naddy@


e7ffb0b07b Stefan Sperling

add support for multiple path arguments to 'got diff'

positive feedback from Omar and kn ok kn


4f3c844bea Stefan Sperling

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

ok tracey



578133c990 Christian Weisgerber

replace echo with printf, stop option processing with "--" for portability

ok stsp





f6cae3ed1e Christian Weisgerber

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

ok stsp


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


40dde666c0 Stefan Sperling

add support for symlinks in the repository to 'got diff'


4135d7d058 Stefan Sperling

fix symlink change in test_diff_symlinks_in_work_tree


39449a05d5 Stefan Sperling

make 'got diff' show changes to symlinks in a work tree


e730362696 Stefan Sperling

add submodule tests

ok semarie


9627c110be Stefan Sperling

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

ok millert@




46f68b205b Stefan Sperling

show file mode differences when diffing trees


d136cfcb98 Stefan Sperling

show original file content in conflict markers


63035f9f4f Stefan Sperling

add -w (ignore whitespace) option to 'got diff'