Commits
- Commit:
e02b422b6f7736de0e851b3f8fad812e77e9c6b4- From:
- Josh Rickmar <jrick@zettaport.com>
- Date:
disallow integrating into references outside refs/heads/
Spotted by stsp@ while considering a feature request for
cmd_integrate.
ok stsp@
- Commit:
a19f439c4e07de5c812f1771b37cecbba6e631c4- From:
- Omar Polo <op@omarpolo.com>
- Date:
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@
- Commit:
49c543a6fe888394ca86e6399c706a9965486134- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
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.
- Commit:
6e210706a4224007cf266b48c28e5a54e8279589- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
- Commit:
f6d8c0acbade4a4b9cc8a674270e689a800b1fb6- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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
- Commit:
9314b9f4a55e5ebd1a98fa58bcd4e429e8b46163- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- 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:
8b692cd00bf22ee0c1455a6d17590b0e2f207a87- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove lock files, as intended, when reintegrate gets aborted
- Commit:
73529b9f61583f0e9c36cd6ce82523837e394747- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
set the executable bit on integrate.sh
- Commit:
3aef623b225b81a61fd3786dc79d091f47b68225- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
catch and reject integration into the freshly rebased branch
- Commit:
2822a3526b8c61302ec86e0871e724c07a4b078d- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add 'got integrate' command