Commits

Commit:
d4f2833aca3f60e7f09a1b9af1bde138e4f79bc4
From:
Omar Polo <op@omarpolo.com>
Date:
wrap overlong line in diff.sh
diff | patch | tree
Commit:
360f3aea9198de6c93e8a185f87641b59c96dbfe
From:
Mark Jamsek <mark@jamsek.dev>
Date:
got: fix typo in argc check when diffing two blobs We already have two arguments when diffing two blobs, so check for more than two like we do when diffing two objects to check for invalid path args. Includes new regress test by op for diffing two blobs. ok stsp@ and ok plus regress test from op@
diff | patch | tree
Commit:
0543436dc194839e6e3ffa7cecc87f4774eb0350
From:
Omar Polo <op@omarpolo.com>
Date:
add a simple test for 'got diff' against CRLF files
diff | patch | tree
Commit:
8469d82143a591d423c000c47c63bababe6f5716
From:
Stefan Sperling <stsp@stsp.name>
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@
diff | patch | tree
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.
diff | patch | tree
Commit:
32b5305fbed2d1a4c55b0eef6b93349b93ba7db0
From:
Omar Polo <op@omarpolo.com>
Date:
new test: `got diff' on files matched by an ignore pattern
diff | patch | tree
Commit:
566e0ee7be3658e35381b86aee2469c0838c6985
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 '=='.
diff | patch | tree
Commit:
10a623dfc23b47f494941e0eac741420c08372a3
From:
Stefan Sperling <stsp@stsp.name>
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@
diff | patch | tree
Commit:
67b631c9e0d2c43ceeda1a387ba696b2d34a1035
From:
Stefan Sperling <stsp@stsp.name>
Date:
implement 'got diff -c' for diffing commits with optional filtering by path Need for filtering by path sugggested by kn@ ok naddy@
diff | patch | tree
Commit:
e7ffb0b07b18c20ebb619f3879602d629d0fbbc6
From:
Stefan Sperling <stsp@stsp.name>
Date:
add support for multiple path arguments to 'got diff' positive feedback from Omar and kn ok kn
diff | patch | tree
Commit:
4f3c844beaeb6a0b30565833e0481b8de9a5106e
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got update' display the worktree's branch name upon success ok tracey
diff | patch | tree
Commit:
54c39596938ae6d19fe5eede072d36a3f61baa12
From:
Stefan Sperling <stsp@stsp.name>
Date:
use POSIX [s1 = s2] syntax instead of [s1 == s2]; patch by Ryo ONODERA
diff | patch | tree
Commit:
578133c9903e5620b4601f9c0f178f530d28722f
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
replace echo with printf, stop option processing with "--" for portability ok stsp
diff | patch | tree
Commit:
1cb46f007dad47a45d2c2d32aaeee11372f95309
From:
Stefan Sperling <stsp@stsp.name>
Date:
consistently label removed files as "/dev/null" in diff headers
diff | patch | tree
Commit:
64453f7e55c4c69b6cd08229929ed8227b789ff8
From:
Stefan Sperling <stsp@stsp.name>
Date:
handle binary files in got/tog diff commands; add -a options to force text
diff | patch | tree