Commits
- Commit:
3333aec6eab7596a83037f6fc7abb9e0c8dee838
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix pack index cache element rotation; keep often used entries near the front
- 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:
b6c8e5e0edc57f309ae866114527e614ad0cd76d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix a segfault in edscript() introduced by my previous commit
Found by our cherrypick regression tests.
- Commit:
461f6aedbd48fa1a352a579c70013ff02d50a6c5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix merging of files which contain a dot on a line by itself
Annoying bug which we inherited from OpenRCS which inherited
it from OpenBSD's diff3 program.
ok tracey millert
- Commit:
fd3a2fe6d4ac59847dc2b41f799aff0170600728
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
speed up 'got histedit -l' and 'got rebase -l'
Cache commit timestamps in struct got_reference in case we are sorting
references by commit timestamp. This avoids opening and closing commits
every time we compare two references with each other.
ok thomas.adam
- Commit:
2777a00400ba964b25ac62b33acdd6677af6ae80
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
align 'diff -c' usage help with synopsis given in man page; suggested by naddy
- 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:
a3599220a642dcd27bacb8def35d06dd79ca3795
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
display the requested object type when an object could not be found
ok millert@
- Commit:
238050ce7b9ba6527d21b357cea92a51d94d39cc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove code which was setting up repo_path redundantly from cmd_diff()
- Commit:
f1165c794c498a63e9167441e7294d79d558500e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make got_repo_match_object_id() filter tags by the requested object type
Potentially this function could return objects of a type that was not
requested. Problem found by code inspection.
This change does not affect any of our existing tests.
- Commit:
bea5ae74558ed1bc5c8372306ead95c29c5bc362
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
document "mg" as alias for the "merge" command
- Commit:
78c05fa484c4c4340258515e2742e87695ec941e
- From:
- Klemens Nanni <kn@openbsd.org>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
Ignore tags files
OK stsp
- Commit:
fbbbc6078a0f61f247a3631a2858d490cbc44cb5
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: release 0.61
Update configure.ac and CHANGELOG for 0.61
- Commit:
5881cd172e61061f5fa65200a61624a021ab8d3c
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
gotadmin: include gotadmin.1 in dist
When building the dist tarball, include its man page.
- Commit:
09e453880eb15ce9af1793de2d7e45c12fc8a480
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: remove extraneous strerror_r check
On a __GLIBC__ system, we need to use __xpg_strerror_r() -- this is
already checked for, so simply one of these checks to reduce code
changes from upstream.
- 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:
5a7ef102e32811458b2bdf94bf772cc692504511
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: enable tests
Enable the compilation and execution of the tests under regress/
- Commit:
0ca5b679a408be58a7330776fdb1a4748ca7a9bd
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: propagate AM_CFLAGS/AM_CPPFLAGS
Allow for warnings via AM_CFLAGS in a common Makefile, and let
those values propagate to all other Makefiles. Currently the more
useful checks are disabled until upstream changes are made to reduce
warnings.
While here, also fix the version string to remove quotes.
- Commit:
dc2a05aa2111fe14be0f0c3e025337dc9340b111
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add an xfail test for a bug in merging content with a dot on a line by itself
- Commit:
66eecf0df5e997194c448a2134bb59067ce1da17
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add test for merge result when lines are inserted at the top of a file
Based on a patch by Omar Polo
- Commit:
f4ff4f7a253c1eb85a549d1d64b00d30b8c4ccd3
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sync files from diff.git 346d4986568ffbcfdc53cce45dd8a468535a68f2
- 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:
2539ccf28b5b0e6be13e9a7f2063a104efa7217b
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
link to the FastCDC paper from deltify.c; suggested by Ori some time ago
- Commit:
82e16997c5d275dc67208ec011c70198fc0218ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make the number of elements in deltify's geartab explicit