Commits
- Commit:
3a76741959b24e02b76fdd973c68b782d2f4510d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
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 '=='.
- Commit:
f1417e9f1c817d4e11dba207cf39ae12ffda2138
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
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@
- Commit:
cc8021afc28da386d1cab85b4d74b632b90e0108
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got diff -c' for diffing commits with optional filtering by path
Need for filtering by path sugggested by kn@
ok naddy@
- 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:
fa37079fce1f4b2e6b73ab317c1840a860b56eb4
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: use gdate/gln if on *BSD
To minimise the amount of churn between the difference in date(1)
and ln(n) semantics, use gdate and gln from coreutils.
- Commit:
30f6c0c64b5c08d79e22cc2c0bd1f1340288a7f5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add support for multiple path arguments to 'got diff'
positive feedback from Omar and kn
ok kn
- 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:
578133c9903e5620b4601f9c0f178f530d28722f
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
replace echo with printf, stop option processing with "--" for portability
ok stsp
- Commit:
1cb46f007dad47a45d2c2d32aaeee11372f95309
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
consistently label removed files as "/dev/null" in diff headers
- Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle binary files in got/tog diff commands; add -a options to force text
- Commit:
dffd0deb2bcfd6ec499f8c026c01afd41369b3a6
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test for diffing binary files; got diff behaves like 'diff -a'
- 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:
40dde666c0e7cae797b8652b1f4368e52c2c7b13
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add support for symlinks in the repository to 'got diff'
- Commit:
4135d7d058f245363e836faa15dbedbd91bd1334
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix symlink change in test_diff_symlinks_in_work_tree
- Commit:
39449a05d564e098f638d1be356d1efbba3ab38c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got diff' show changes to symlinks in a work tree
- Commit:
e7303626967ed721dd323a8a6ea6c638aed46c50
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add submodule tests
ok semarie
- Commit:
9627c110bee81b5d7368441eaf4e661010ba9cd5
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show a summary of conflicts and related problems after updating/merging files
ok millert@
- Commit:
562580bce8d701d318471fe7601bc614a00c94ef
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
support Git-style "lightweight" tags as arguments for 'got diff'
- Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show base commit hash and omit filenames in conflict markers
- Commit:
46f68b205b4ab514846c5352c6d952720b9da365
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show file mode differences when diffing trees
- Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
show original file content in conflict markers
- Commit:
63035f9f4ff2f4ea5b7361830edad916a30e37cd
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add -w (ignore whitespace) option to 'got diff'