Commits
- Commit:
f73bf5bd9e54af999a744c731dfb492e1c9b2b6d
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- 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:
0778bf802f073bf7f785d53ab5ea4d8e6a8f0a59
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
got: regress for log -x keyword and log -dPp combinations
Plus multiple copypasta fixes where I was cmp(1)ing stdout instead of stderr!
Fortunately, we were doing the right thing despite not checking it properly.
The log -dPp test is from op@.
ok + tweaks op@
- Commit:
79c49d8454129776fe282b780f5836be20ea0052
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
regress: nix 'set -A' kshism from tests
As reported by naddy, this is a non-portable Korn shell construct.
Instead, use the one argument array then make faux space-delimited string
"arrays" for the other ids; they can still be indexed with pop_idx.
improved by + ok naddy@
- Commit:
df6221c7df42758252c508006201c3f66e6ae831
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
use a separate .cvg meta data directory for cvg(1) work trees
This prevents mixing the use of got and cvg clients in the same work tree.
Avoids confusion going forward while cvg differentiates itself further.
tog(1) and gotadmin(1) remain compatible with both work tree formats.
These tools only read work trees to locate the corresponding repository.
- Commit:
fd7552d245966f4a57fdc5ec287c3226d5145391
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
implement support for keywords as got <commit> arguments
This begins enabling the use of keywords in got wherever commit ids or
references are used, with more work intended to expand support across all
such instances (e.g., branch, checkout, etc.), and add more keywords.
The keywords ":base" and ":head" can be passed to 'got {diff,log,update} -c'
commands as a substitute for the corresponding commit hash id. Keywords and
references can also be modified by appending a ':+' or ':-' and an optional
integer N to specify by first parent traversal the Nth generation descendant
or antecedent, respectively. If N is omitted, a '1' is implicitly appended.
tweaks + ok op and stsp
- Commit:
cf31b4749a965b44fa03a3c98bdfc8b60f2c987d
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix a segfault in got diff when a root commit is passed to -c
Problem reported by Alexander Arkhipov
ok jamsek
- Commit:
ba0bed23e515b14cd3fe877c6847785c8c29971e
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
regress: fix test for 'got diff' against CRLF files
ok stsp
- Commit:
760a1ec3d507da3e46a5dc13041ad1a23cfc0847
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make diffing files which changed into dirs and vice-versa possible
Problem marked with a TODO comment by me ages ago and rediscovered by naddy@
ok op@
- Commit:
885e96dfba200f362ddd1d9795740251bcb6e39b
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- 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:
f55db25a40103e9990a713a4f61d37686d786194
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
regress: replace unportable ln -h option with rm && ln
ok stsp
- Commit:
9334723a60466be8c0bff5875128e9f02c32e5b1
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
add xfail test for "got diff" when a commit changed a file to a directory
git diff:
diff --git a/alpha b/alpha
deleted file mode 100644
index 4a58007..0000000
--- a/alpha
+++ /dev/null
@@ -1 +0,0 @@
-alpha
diff --git a/alpha/beta b/alpha/beta
new file mode 100644
index 0000000..65b2df8
--- /dev/null
+++ b/alpha/beta
@@ -0,0 +1 @@
+beta
got diff:
diff d973bf45ce9b2b437b5d6352368e8406f9e256e2 34413d01304800f99058a1a42769e92afc534199
commit - d973bf45ce9b2b437b5d6352368e8406f9e256e2
commit + 34413d01304800f99058a1a42769e92afc534199
- Commit:
05594ba5c50d7a7b10882b9504d75bdd5df348a3
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
regress: replace typeset with printf for shell portability
The typeset shell builtin is a ksh(1) feature. It is not available
in a pure POSIX sh(1). Use printf(1) to portably perform the same
string truncation.
tweak and ok op jamsek
- Commit:
4a1a737306fe863c1d6378370d345fae962a2cad
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
fix diff and log diffstat tests broken in 65dedee0a2cd
I failed to update regress when changing the diffstat summary line in the
previous commit to use a singular noun after 1.
ok op@ and stsp@
- Commit:
34d80a0ff3357761ddb975a1a96d3ee795218e41
- From:
- Omar Polo <op@omarpolo.com>
- Date:
regress: use `local' for some variables
- Commit:
6b37f13aa48dd88d4cc6c8176104a3101d7a260c
- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
add regress for 'got diff -d' and minor output fix
Ensure an actual file path is displayed in the 'got diff -d -c commit path ...'
case when one of the specified paths is a deleted file. Prior to this, the
unhelpful "/dev/null" label was shown instead. Includes some copypasta fixes
noted by op.
ok stsp@ op@