Commit Briefs

885707edec Thomas Adam

disallow integrating into references outside refs/heads/

Spotted by stsp@ while considering a feature request for cmd_integrate. ok stsp@


4e2bdb0dad Thomas Adam

don't pass $ret to test_done on failure when it's known to be zero

Otherwise the test directory it's not left in place; ok tracey@


fc414659b4 Thomas Adam

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.


6e210706a4 Stefan Sperling

implicitly mark all files in work tree as up-to-date after 'got integrate'

Avoids having to run 'got update' for no good reason after 'got integrate'. The same change was made recently for both rebase and histedit in commit a615e0e7796ea1103a6e0d4b5dbb6134597886660 and we forgot about histedit.



f6d8c0acba Stefan Sperling

fix replacing symlinks with files

And add a test case which verifies that the inverse also works, i.e. a symlink being replaced with a regular file. problem reported and fix tested by jrick


9314b9f4a5 Stefan Sperling

test case for 'got integrate' failing if symlink changes to file; patch by jrick

This test verifies the current behaviour, even though it is not the most desirable behaviour.


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



73529b9f61 Stefan Sperling

set the executable bit on integrate.sh



2822a3526b Stefan Sperling

add 'got integrate' command