From cfb8f0d559e283c005fa670e10e79b1fd6adbb01 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Wed, 22 Oct 2025 08:04:42 +0400
Subject: [PATCH] corriger la prise en compte des configurations de branche

---
 bash/src/pman.sh | 5 ++---
 bin/_merge82     | 2 +-
 bin/ptool        | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bash/src/pman.sh b/bash/src/pman.sh
index 41e2da9..3250e4f 100644
--- a/bash/src/pman.sh
+++ b/bash/src/pman.sh
@@ -366,7 +366,8 @@ function load_config() {
             ac_set_tmpfile config
             git show "$ConfigBranch:.pman.conf" >"$config" 2>/dev/null
             [ -s "$config" ] || die "$ConfigBranch: aucune configuration trouvée sur cette branche" || return
-            source "$config"
+            ConfigFile="$config"
+            source "$ConfigFile"
         fi
     elif [ -f .pman.conf ]; then
         ConfigFile="$(pwd)/.pman.conf"
@@ -681,9 +682,7 @@ function _create_upstream_action() {
 
     # faire une copie de la configuration actuelle
     local config; ac_set_tmpfile config
-    set -x; ls -l "$ConfigFile" #XXX
     cp "$ConfigFile" "$config"
-    set +x #XXX
 
     einfo "Création de la branche $RefBranch"
     git checkout --orphan "$RefBranch" || die
diff --git a/bin/_merge82 b/bin/_merge82
index 7a4cac4..e1afdeb 100755
--- a/bin/_merge82
+++ b/bin/_merge82
@@ -9,4 +9,4 @@ args=(
 )
 parse_args "$@"; set -- "${args[@]}"
 
-exec "$MYDIR/ptool" -fupstream -Bdev82 -m --tech-merge ${dev74:+-a "git checkout dev74"} "$@"
+exec "$MYDIR/ptool" -fupstream -Bdev82 --tech-merge ${dev74:+-a "git checkout dev74"} "$@"
diff --git a/bin/ptool b/bin/ptool
index c1cd363..3025df9 100755
--- a/bin/ptool
+++ b/bin/ptool
@@ -221,6 +221,9 @@ if check_gitdir; then
     set_pman_vars "$merge_dir"
     load_branches current
     loaded_config=1
+    # remettre à zéro ConfigFile pour ne pas influencer le rechargement plus bas
+    oConfigFile="$ConfigFile"
+    ConfigFile=
 else
     set_pman_vars "$merge_dir"
 fi
@@ -377,6 +380,9 @@ if [ -z "$loaded_config" -o -n "$chdir" -o -n "$ConfigFile" -o -n "$ConfigBranch
     load_config
     set_pman_vars "$merge_dir"
     load_branches current
+else
+    # restaurer ConfigFile précédent
+    ConfigFile="$oConfigFile"
 fi
 resolve_should_push quiet