Commits
- Commit:
8641a33271eb0cef324fbeb4440485de8f433134
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
when aborting rebase/histedit/merge, unlink files added by merged changes
Otherwise we leave unversioned files behind in the work tree which may
interfere with new attempts to rebase or merge the changes again.
Problem found by + ok naddy@
- Commit:
0e5a098ac4b42e007819f387dac06a941534cea5
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
extent regress test to check content after histedit fold operation
- Commit:
0529f8df6d2e002eb21598365157e0ada97aa85f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
support histedit fold operations which delete a file and then add it again
problem found by naddy@
ok op@
- Commit:
99fe3033f2c5c27a510a69c329fb1a542c4620cf
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add xfail test for histedit folding of delete followed by add
If a file is deleted, then in modified form added again, folding
should restore the file with its new contents.
ok stsp
- 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:
40f2f72b99bb70a7be40eada71e5acd8a77ab58d
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: regress: drop setting LC_TIME
common.sh sets LC_ALL=C which makes this change unnecessary now.
Patch from Christian "naddy" Weisgerber.
- Commit:
1c72bab5d11d2f52b471a33a23614dc19deab730
- From:
- Thomas Adam <thomas@xteddy.org>
- Date:
portable: regress: drop GNU date on *BSDs
Check if date(1) supports -r and fallback to gdate if that fails, via a
shell-wrapper.
From Christian "naddy" Weisgerber.
- Commit:
070c80a59d5048ca05990df52d7993f3015c2ee4
- From:
- Mark Jamsek <mark@jamsek.dev>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
got: add 'got histedit -d' flag to drop all commits
Like -f, except drop all commits. Discussed with op and stsp on irc.
ok stsp@
- Commit:
afe4b8089ddc1958d7cac842c90a5651dbfab4b1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
use VISUAL instead of EDITOR in histedit_mesg_filemode_change
VISUAL is preferred and relying on EDITOR may cause test
failures in some environments.
pointed out by op and jamsek
- Commit:
b5b4dc30da5b0d78463ce7a7488ea9b5dfc8a1be
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
simplify file content comparison in a regress test; suggested by op@
- Commit:
630fc61f66dc259068303613f6f3cfc39f1d267f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix histedit -m on a commit which only changes filemode bits
The commit was being miscategorized as a no-op change and dropped.
Now the commit is retained and its log message is updated as expected.
ok op, jamsek
- Commit:
7a9950a80d85b9aa47ca5e135cd0eb94fbaa474c
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: consistently use ed -s
didn't know about -s when writing those tests; saves some output
redirection.
ok jamsek
- Commit:
a2c162ebaea11f9bd1d46c4cdf5b8f488ebaf58f
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
respect umask when creating or changing files and directories
This behaviour is already documented in got-worktree(5) but wasn't
actually implemented.
ok stsp@
- Commit:
150d7275caef04226a9f0c82b7b6c7ac62cfab0e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
reset committer during rebase and histedit
ok op@
- Commit:
4ec2ae63130b434acdd2bf3204a61a8e38380644
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
regress: add missing return in error path
- Commit:
8ea72c47a2077c52fad27872183808829d76c4d8
- From:
- Omar Polo <op@omarpolo.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
histedit: make sure mesg is only used after pick or edit
It doesn't really make sense to use mesg after a fold or drop, or after
another mesg. it currently "works" as intended, but the behaviour is
confusing and not useful, better abort the operation as it's probably
not what the user intended.
Suggested by and ok stsp@
- 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:
e39a17e2af24e9e217862e7c5221afe33a65aa24
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
FreeBSD's ed(1) does not accept "0i"; use the equivalent "1i" instead
- 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:
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:
d52bac284bc87b2e54ff8afd22886a7260f68b26
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
ignore unversioned files while aborting rebase, histedit, merge or operations
ok jrick
- Commit:
c50a74557db04e5ab02a1b0c53cb4fbdd64088ac
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
180f111d564b657f44e4182cd43fcfbdd40096bc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas.adam@smoothwall.net>
- Date:
regress: fix test failures using date(1)
This patch fixes test failures related the date(1) utility.
In the long term we could add a wrapper function to detect valid options
for date(1) and use the variant which works on the current OS.
For now, this makes some tests pass and shows us where the problems are.
OK thomas.adam
- Commit:
ad324bf53a11587dc227a2c00b65020595aa18dc
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix histedit_no_op test which was failing randomly
A no-op replayed history ends up having exactly the same commit IDs
if all commits are created at roughly the same moment in time.
There are no content changes involved so if commit timestamps do not
differ then commit hashes will be the same. In which case there is no
fork in history for 'got histedit -l' to display, yet the test was
always expecting a fork in history to be displayed.
Update the test to take this issue into account. The test will now pass
no matter which result is produced by the histedit operation.
Problem found by Lucas who observed that this test was randomly failing.
Patch also provided by Lucas.