mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

unposted: vcs_info git: Teach the rebase-apply test case generator to also generate rebase-merge test cases

Browse source
This commit is contained in:
Daniel Shahaf 2022-01-29 13:10:26 +00:00
parent 10ee9e5bd7
commit 75c3664a62
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2022-01-29 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Functions/VCS_Info/test-repo-git-rebase-apply,
Functions/VCS_Info/test-repo-git-rebase-merge: vcs_info git:
Teach the rebase-apply test case generator to also generate
rebase-merge test cases
* unposted: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: Add a missing guard against redefining a function.

12
Functions/VCS_Info/test-repo-git-rebase-apply
View file

@ -44,6 +44,16 @@ append_lines 7 8 9
# Specify a rebase that would create the history [1,3,4,5,6,7,8,9].
# This will conflict because r7 depends on r2 which is not included.
git checkout -b myref
git rebase --onto=rebase_onto_this rebase_from_this myref
case $0:P in
(*/test-repo-git-rebase-apply)
git rebase --onto=rebase_onto_this rebase_from_this myref
;;
(*/test-repo-git-rebase-merge)
git -c core.editor=true rebase -i --onto=rebase_onto_this rebase_from_this myref
;;
(*)
echo >&2 "$0: unrecognized basename"
;;
esac

1
Functions/VCS_Info/test-repo-git-rebase-merge Symbolic link
View file

@ -0,0 +1 @@
test-repo-git-rebase-apply