sda-php/nulib
Archived
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

<pman>Intégration de la branche dev74

Browse Source
This commit is contained in:
Jephté Clain 2025-02-28 20:30:13 +04:00
commit 0c473384f2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -1,3 +1,3 @@
## Release 0.3.1p74 du 28/02/2025-20:21 ## Release 0.3.2p74 du 28/02/2025-20:28
(tech) Migration vers pman (tech) Migration vers pman

2
VERSION.txt
View File

@ -1 +1 @@
0.3.1 0.3.2

2
bash/src/pman.sh
View File

@ -71,7 +71,7 @@ $1 == "|" {
function _list_commits() { function _list_commits() {
local source="${1:-$SrcBranch}" dest="${2:-$DestBranch}" mergebase local source="${1:-$SrcBranch}" dest="${2:-$DestBranch}" mergebase
setx mergebase=git merge-base "$dest" "$source" setx mergebase=git merge-base "$dest" "$source"
git log --oneline --graph "$mergebase..$source" | git log --oneline --graph --no-decorate "$mergebase..$source" |
grep -vF '|\' | grep -vF '|/' | sed -r 's/^(\| )+\* +/| /; s/^\* +/+ /' | grep -vF '|\' | grep -vF '|/' | sed -r 's/^(\| )+\* +/| /; s/^\* +/+ /' |
_filter_rel _filter_rel
} }

2
bin/pdev
View File

@ -83,7 +83,7 @@ EOF
elif ! "$script" merge ${Delete:+delete} ${Push:+push}; then elif ! "$script" merge ${Delete:+delete} ${Push:+push}; then
eimportant "Veuillez consulter le script $script pour le détail des opérations qui n'ont pas pu êtres effectuées" eimportant "Veuillez consulter le script $script pour le détail des opérations qui n'ont pas pu êtres effectuées"
die die
elif [ -n "$Deleted" -n "$Pushed" ]; then elif [ -n "$Deleted" -a -n "$Pushed" ]; then
[ -n "$_KeepScript" ] || rm "$script" [ -n "$_KeepScript" ] || rm "$script"
else else
local cmd local cmd