Commits
- Commit:
d1e03b8cc3ffd9122ab07adab47d84534f70bd67
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
replace "(cd path && git cmd)" with "git -C path cmd"
This matches the existing use of "got -r path cmd" and
"git_commit path args".
- Commit:
0b47703514fc6cbbe5318d575bb1cce7152aadcb
- From:
- James Cook <falsifian@falsifian.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress/cmdline: fix handling of unexpected success
Diff from James Cook, thanks!
- Commit:
31a4bd82de06791beb82e8f570cc0236202acca5
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: regress: add back GOT_TEST_PACK
The definition for GOT_TEST_PACK went walkies during a previous merge
conflict. Add this back.
- Commit:
ac3cdf31e06d51b4966449da12216d3614e10576
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: replace "sed -i" with ed(1) for portable in-place editing
"sed -i" is fundamentally unportable. GNU and OpenBSD sed(1) treat
the extension for the backup file as an optional argument and use
"sed -i" for no backup file. FreeBSD sed(1) treats the extension
as an obligatory argument and uses "sed -i ''" for no backup file.
There is no single syntax that works for both.
ok stsp op
- Commit:
e6f45b7279f2ab31024ae32f7ad28148bf80bee7
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: replace unportable ln -h option with rm && ln
ok stsp
- Commit:
9b4458b41088db703d890881c32dfd242efce4df
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
f289c82c68db93521308bd7bc6bb7a5733d80a26
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got stage: implicitly unstage when staging the reverse of the staged diff
otherwise we end up with a staged empty edit for that file.
ok stsp@
- Commit:
4e2bdb0dade94492580e4fbce20d9717bccc4e61
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
fc414659b454e49203f7ba02fb9866da42ffb4d0
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- 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:
c206b220ed859d6c8bd3e061fb2668e0caa68d5c
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: provide a sed wrapper
In order to portably handle the difference in how 'sed -i' works between
*BSD and Linux, provide a wrapper to invoke the underying system sed(1)
based on which OSTYPE is in use.
- Commit:
dd6165e49c3235f6e7c8bf7e2c1f9635009f08a4
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
regress: fix test failures using ln(1)
GNU ln uses -T instead of -h for no-target-directory.
OK thomas.adam
- Commit:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got update' display the worktree's branch name upon success
ok tracey
- Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
- Commit:
fe621944e83fe6367f7bff97128b4240a9cdc7c5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
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.
- 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:
75f0a0fb346fb0ad381536024728164cd32d2a7e
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
stop reinstalling symlinks after commit; 'got update' can handle that
- Commit:
35213c7c838a48142d398147b54bb9938af8cab0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
forbid bad symlinks; add -S option to 'got commit' and 'got stage' to allow them
- Commit:
fa3cef63799016195e8a917f39c82815522692aa
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got stage -p' work with symlinks
- Commit:
0aeb8099a04ea427eff4a7b6cb52b1cba62a87b0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
set a staged file type and handle it separately from the on-disk file type
- Commit:
c631b1152565e4c18cb2123e1d3d7c08d513c02f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make staging of symlinks work
- Commit:
9627c110bee81b5d7368441eaf4e661010ba9cd5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show a summary of conflicts and related problems after updating/merging files
ok millert@
- Commit:
7b5dc508da734468a2a01112b45b7999b55123ce
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix staging of multiple files with -p
ok semarie
- Commit:
46f68b205b4ab514846c5352c6d952720b9da365
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show file mode differences when diffing trees
- Commit:
72fd46fa56e8a73262ff8901b7c93554b7bad3e6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix modified files not shown by 'got status' after committing staged changes