From 2c15ea71dae250a231b4676a9e5fa6e52c5c13f9 Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 28 Feb 2025 20:24:41 +0400 Subject: [PATCH 1/3] bug --- bin/pdev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pdev b/bin/pdev index c077954..c0433e2 100755 --- a/bin/pdev +++ b/bin/pdev @@ -83,7 +83,7 @@ EOF 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" die - elif [ -n "$Deleted" -n "$Pushed" ]; then + elif [ -n "$Deleted" -a -n "$Pushed" ]; then [ -n "$_KeepScript" ] || rm "$script" else local cmd From fa7625d61bddee8bd057e1f01b5ccccac6ca862c Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 28 Feb 2025 20:28:12 +0400 Subject: [PATCH 2/3] cosmetic --- bash/src/pman.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash/src/pman.sh b/bash/src/pman.sh index b095039..9df7df9 100644 --- a/bash/src/pman.sh +++ b/bash/src/pman.sh @@ -71,7 +71,7 @@ $1 == "|" { function _list_commits() { local source="${1:-$SrcBranch}" dest="${2:-$DestBranch}" mergebase 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/^\* +/+ /' | _filter_rel } From e44e4813f4a2c444d4bb22e46692bb81381ebaab Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 28 Feb 2025 20:28:41 +0400 Subject: [PATCH 3/3] Init changelog & version 0.3.2 --- CHANGES.md | 2 +- VERSION.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 901c211..c5910fa 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 diff --git a/VERSION.txt b/VERSION.txt index 9e11b32..d15723f 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.3.1 +0.3.2