Commits
- Commit:
102fba8b84c74851ac56ae5a99a5739e2a4b2514
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add an xfail test for a case where rebase fails to forward a branch
Because 'got rebase' only does a first-parent traversal it will try to
rebase commits which appear in the history of a branch, even when the
branch to be rebased is already based on that history. This results in
spurious merge conflicts as existing changes get re-applied.
The desired behaviour would be that 'got rebase' forwards the branch,
as it does when the 'got merge -M' command used by this test case is
replaced by a simple 'got merge' which avoids creating a merge commit.
Problem reported by naddy in the "Landry's firefox repository" thread:
https://marc.gameoftrees.org/mail/1706721001.20565_0.html
- Commit:
4cbe2b468089c3a0d8cc4963ef0056060b82049a
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test which checks what happens when rebasing onto a merge commit
- Commit:
13cd1d190795ee2b0bd10c7e4590dac2900cc248
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add a test which checks what happens when a merge commit is rebased
- 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:
af179be739cacd6576fdf9596ac7e61b714ee367
- From:
- Stefan Sperling <stsp@stsp.name>
- 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:
1b093d84c1f8f17f66aec3a337a121edcc6f77d9
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix rebase/histedit -a leaving some files on the temporary branch
The commands 'got rebase -a' and 'got histedit -a' were checking out
files from the wrong commit. Make them check files out from the commit
we are switching the work tree to, as intended.
Avoids spurious merge conflicts when the work tree is later used for
another rebase operation. It also makes 'got update' right after
'rebase -a' a no-op, as it should be.
Problem found by naddy@ while rebasing jca's llvm15 branch
ok op, jamsek earlier version
- 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:
980c6786a419950816c67eb1b53e021ebdfe483c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got rebase' work when the to-be-rebased branch has no parent commit
found by and ok op@, who also provided the test case
- Commit:
49a1ae4b7fbd435b06a58d71186f4675d399e2c7
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got rebase' not detecting an out-of-date work tree in some cases
ok jamsek, op
- Commit:
b2b3fce13e4eca588bb28a869b07f0063568b505
- From:
- Omar Polo <op@omarpolo.com>
- 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:
2c75f174eaa5edecfcf15dd4e81c87a70c53b21e
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
rebase.sh: remove accidentally included absolute path to "got"
- Commit:
0a706d22c0eedf209fc5cc5821872ac9b47ecfd4
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
add regression test which covers fast-forward rebase + path-prefix
- Commit:
442ede73eadb025cdc45bede186bf31aee869dad
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
forbid rebase of references outside the refs/heads/ namespace
ok jrick
- Commit:
5e91dae4dd43b8024731223110ab18f505f453ac
- From:
- Josiah Frentsos <jfrent@tilde.team>
- Via:
- Stefan Sperling <stsp@stsp.name>
- Date:
remove trailing whitespace; patch by Josiah Frentsos
- Commit:
1004841d7c8045b627768a441ebdb9c824d2134d
- From:
- Omar Polo <op@omarpolo.com>
- Date:
don't undef GOT_AUTHOR in regress
unset only in the subshell so further cose is unaffected. ok stsp@
- Commit:
50e7a649ac62e04706162f1e9b7b37e7485fc7ca
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
do not require local author info during 'got rebase'
My commit to reset committer info during rebase was too strict
in some use cases. Even when simply forwarding a branch the rebase
operation could now fail if GOT_AUTHOR is not set.
To fix this, fall back on existing commiter information if no author
is configured. And try to obtain author info from Git config in case
GOT_AUTHOR is not set.
Problems reported by Mikhail.
- Commit:
598eac4331d322ab9e91ee6864c54845e3a6e86c
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
reset committer during rebase and histedit
ok op@
- Commit:
67ba61612157092fbe0f8c4a02b60faf31967061
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
leave work tree in a usable state after 'got rebase' fails path-prefix checks
reported by naddy
- 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.
- Commit:
3d42b2660156bfd71df40d11a996d7bf233ed2a4
- From:
- Josh Rickmar <jrick@zettaport.com>
- Date:
switch branches during noop rebases
Always update to the specified branch even if the branch is already
rebased (no commits needed to be rebased, and the branch does not need
a fast forward). With the old behavior of erroring and staying on the
current branch, I sometimes found myself ignoring the error message,
treating it as information and assuming the branch update, and later
on committing on top of origin/main instead of the main branch.
feedback and ok stsp
- Commit:
41f061b2f459318f3738f59d7676efccc4beb344
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
ignore unversioned files while aborting rebase, histedit, merge or operations
ok jrick
- Commit:
1fa4907213af37d50029ee33b989867f41f0f124
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
print additional stats about things that went wrong during a merge
- Commit:
3a6b87604592c583079227ea995f50eb3ec74121
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
use the POSIX-compliant "date -u" command to return UTC time; ok stsp
- Commit:
a96621150027f46d946238e99c8236a06f79f0da
- From:
- Christian Weisgerber <naddy@mips.inka.de>
- Date:
add missing "return 1" to failure handling in the regress scripts
ok stsp@