From 8bfec9de4cc7d296cc6875c551c5a1127aa5dbc0 Mon Sep 17 00:00:00 2001
From: Philippe Dosch <Philippe.Dosch@loria.fr>
Date: Mon, 24 Mar 2025 09:35:03 +0100
Subject: [PATCH] MAJ bases de git

---
 basegit.tex   |  36 ++++++++---------
 distribue.obj | 108 +++++++++++++++++++++++++-------------------------
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/basegit.tex b/basegit.tex
index cdb23cc..7a8b817 100644
--- a/basegit.tex
+++ b/basegit.tex
@@ -201,8 +201,8 @@
     contenus différents génèrent une même signature\\
     (on est alors en présence d'une \emph{collision})
   \item
-    Mais en pratique, la probabilité est infinitésimale et peut être
-    ignorée sans risque
+    Mais en pratique, les SHA-1 restent relatifs à un dépôt : la
+    probabilité est infinitésimale et peut être ignorée sans risque
   \item
     D'ailleurs, les 7 ou 8 premiers caractères d'une signature sont
     quasi systématiquement suffisants pour désigner sans ambiguïté un
@@ -212,23 +212,23 @@
 
 %======================================================================
 
-\frame{\frametitle{SHA-1}
-  \framesubtitle{Collisions et probabilités}
-  \begin{itemize}
-  \item
-    Il faudrait que $10$ milliards de programmeurs fassent $1$
-    \emph{commit} par seconde pendant presque $4$ millions d'années
-    pour qu'il y ait $50\%$ de chance qu'une collision se produise
-  \item
-    «~\emph{Il y a plus de chances que tous les membres d'une équipe
-    soient attaqués et tués par des loups dans des incidents sans
-    relation la même nuit}~»\\
-  {\tiny \hfill \emph{Documentation officielle Git,
-      \url{http://git-scm.com/book}}}
-  \end{itemize}
-}
+% \frame{\frametitle{SHA-1}
+%   \framesubtitle{Collisions et probabilités}
+%   \begin{itemize}
+%   \item
+%     Il faudrait que $10$ milliards de programmeurs fassent $1$
+%     \emph{commit} par seconde pendant presque $4$ millions d'années
+%     pour qu'il y ait $50\%$ de chance qu'une collision se produise
+%   \item
+%     «~\emph{Il y a plus de chances que tous les membres d'une équipe
+%     soient attaqués et tués par des loups dans des incidents sans
+%     relation la même nuit}~»\\
+%   {\tiny \hfill \emph{Documentation officielle Git,
+%       \url{http://git-scm.com/book}}}
+%   \end{itemize}
+% }
 
-%======================================================================
+% %======================================================================
 
 \frame{\frametitle{SHA-1}
   \framesubtitle{À retenir}
diff --git a/distribue.obj b/distribue.obj
index 35e40b8..4a5ae5c 100644
--- a/distribue.obj
+++ b/distribue.obj
@@ -1,4 +1,4 @@
-%TGIF 4.2.4-QPL
+%TGIF 4.2.5-QPL
 state(0,37,100.000,0,0,0,16,1,0,1,1,2,0,3,0,1,0,'Helvetica',0,115200,0,0,1,10,0,0,1,1,0,16,0,0,1,1,1,1,1050,1485,1,0,2880,0).
 %
 % @(#)$Header$
@@ -72,20 +72,20 @@ polygon('#99ccff','',13,[
 ]),
 box('#99ccff','',354,54,546,146,1,1,0,1,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',450,53,1,1,1,144,15,2,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,65,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',450,52,1,1,1,144,16,2,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,65,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
 attr("label=", "D\351p\364t d'Alice", 1, 0, 0,
-text('Black',450,89,1,1,1,112,22,3,18,4,0,0,0,0,-65534,112,22,0,0,"",0,0,0,0,107,'',[
-minilines(112,22,0,0,1,0,0,[
-mini_line(112,18,4,0,0,0,[
-str_block(0,112,18,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica',0,115200,112,18,4,0,-1,0,0,0,0,0,
+text('Black',450,87,1,1,1,117,25,3,20,5,0,0,0,0,-65534,117,25,0,0,"",0,0,0,0,107,'',[
+minilines(117,25,0,0,1,0,0,[
+mini_line(117,20,5,0,0,0,[
+str_block(0,117,20,5,0,-1,0,0,0,[
+str_seg('Black','Helvetica',0,115200,117,20,5,0,-1,0,0,0,0,0,
 	"D\351p\364t d'Alice")])
 ])
 ])]))
@@ -101,20 +101,20 @@ polygon('#99ccff','',13,[
 ]),
 box('#99ccff','',404,314,596,406,1,1,0,111,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',500,313,1,1,1,144,15,112,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,325,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',500,312,1,1,1,144,16,112,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,325,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
 attr("label=", "D\351p\364t de Camille", 1, 0, 0,
-text('Black',500,349,1,1,1,146,22,113,18,4,0,0,0,0,-65534,146,22,0,0,"",0,0,0,0,367,'',[
-minilines(146,22,0,0,1,0,0,[
-mini_line(146,18,4,0,0,0,[
-str_block(0,146,18,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica',0,115200,146,18,4,0,-1,0,0,0,0,0,
+text('Black',500,347,1,1,1,154,25,113,20,5,0,0,0,0,-65534,154,25,0,0,"",0,0,0,0,367,'',[
+minilines(154,25,0,0,1,0,0,[
+mini_line(154,20,5,0,0,0,[
+str_block(0,154,20,5,0,-1,0,0,0,[
+str_seg('Black','Helvetica',0,115200,154,20,5,0,-1,0,0,0,0,0,
 	"D\351p\364t de Camille")])
 ])
 ])]))
@@ -130,20 +130,20 @@ polygon('#99ccff','',13,[
 ]),
 box('#99ccff','',104,224,296,316,1,1,0,116,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',200,223,1,1,1,144,15,117,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,235,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',200,222,1,1,1,144,16,117,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,235,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
 attr("label=", "D\351p\364t de Bob", 1, 0, 0,
-text('Black',200,259,1,1,1,118,22,118,18,4,0,0,0,0,-65534,118,22,0,0,"",0,0,0,0,277,'',[
-minilines(118,22,0,0,1,0,0,[
-mini_line(118,18,4,0,0,0,[
-str_block(0,118,18,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica',0,115200,118,18,4,0,-1,0,0,0,0,0,
+text('Black',200,257,1,1,1,123,25,118,20,5,0,0,0,0,-65534,123,25,0,0,"",0,0,0,0,277,'',[
+minilines(123,25,0,0,1,0,0,[
+mini_line(123,20,5,0,0,0,[
+str_block(0,123,20,5,0,0,0,0,0,[
+str_seg('Black','Helvetica',0,115200,123,20,5,0,0,0,0,0,0,0,
 	"D\351p\364t de Bob")])
 ])
 ])]))
@@ -159,20 +159,20 @@ polygon('#99ccff','',13,[
 ]),
 box('#99ccff','',654,144,846,236,1,1,0,121,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',750,143,1,1,1,144,15,122,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,155,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',750,142,1,1,1,144,16,122,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,155,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
 attr("label=", "D\351p\364t de Dan", 1, 0, 0,
-text('Black',750,179,1,1,1,118,22,123,18,4,0,0,0,0,-65534,118,22,0,0,"",0,0,0,0,197,'',[
-minilines(118,22,0,0,1,0,0,[
-mini_line(118,18,4,0,0,0,[
-str_block(0,118,18,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica',0,115200,118,18,4,0,-1,0,0,0,0,0,
+text('Black',750,177,1,1,1,125,25,123,20,5,0,0,0,0,-65534,125,25,0,0,"",0,0,0,0,197,'',[
+minilines(125,25,0,0,1,0,0,[
+mini_line(125,20,5,0,0,0,[
+str_block(0,125,20,5,0,-1,0,0,0,[
+str_seg('Black','Helvetica',0,115200,125,20,5,0,-1,0,0,0,0,0,
 	"D\351p\364t de Dan")])
 ])
 ])]))
@@ -208,25 +208,25 @@ polygon('#99ccff','',13,[
 ]),
 box('#99ccff','',774,314,966,406,1,1,0,145,5,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',870,313,1,1,1,144,15,146,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,325,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',870,312,1,1,1,144,16,146,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,325,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
 attr("label=", "D\351p\364t central", 1, 0, 0,
-text('Black',870,338,2,1,1,114,44,147,18,4,0,0,0,0,-65534,114,44,0,0,"",0,0,0,0,356,'',[
-minilines(114,44,0,0,1,0,0,[
-mini_line(114,18,4,0,0,0,[
-str_block(0,114,18,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica',0,115200,114,18,4,0,-1,0,0,0,0,0,
+text('Black',869,337,2,1,1,129,46,147,19,4,0,0,0,0,-65534,129,46,0,0,"",0,0,0,0,356,'',[
+minilines(129,46,0,0,1,0,0,[
+mini_line(129,19,4,0,0,0,[
+str_block(0,129,19,4,0,-2,0,0,0,[
+str_seg('Black','Helvetica-Bold',1,115200,129,19,4,0,-2,0,0,0,0,0,
 	"D\351p\364t central")])
 ]),
-mini_line(91,18,4,0,0,0,[
-str_block(0,91,18,4,0,0,0,0,0,[
-str_seg('Black','Helvetica',0,115200,91,18,4,0,0,0,0,0,0,0,
+mini_line(109,19,4,0,0,0,[
+str_block(0,109,19,4,0,-1,0,0,0,[
+str_seg('Black','Helvetica-Bold',1,115200,109,19,4,0,-1,0,0,0,0,0,
 	"sur serveur")])
 ])
 ])]))
-- 
GitLab