diff --git a/UpdatePTUDevCtrl/git/git_client.cpp b/UpdatePTUDevCtrl/git/git_client.cpp index b23d7a3..5f23b66 100644 --- a/UpdatePTUDevCtrl/git/git_client.cpp +++ b/UpdatePTUDevCtrl/git/git_client.cpp @@ -316,6 +316,31 @@ std::optional GitClient::gitPull() { // 6ed893f..5d9882c zg1/zone2 -> origin/zg1/zone2 // 4384d17..77045d8 zg1/zone3 -> origin/zg1/zone3 // 89d2812..36a0d74 zg1/zone5 -> origin/zg1/zone5 + // + // More exactly: + // remote: Counting objects: 382, done. + // remote: Compressing objects: 100% (203/203), done. + // remote: Total 278 (delta 177), reused 103 (delta 59) + // Receiving objects: 100% (278/278), 4.89 MiB | 539 KiB/s, done. + // Resolving deltas: 100% (177/177), completed with 40 local objects. + // From ssh://longair@pacific.mpi-cbg.de/srv/git/fiji + // 3036acc..9eb5e40 debian-release-20081030 -> origin/debian-release-20081030 + // * [new branch] debian-release-20081112 -> origin/debian-release-20081112 + // * [new branch] debian-release-20081112.1 -> origin/debian-release-20081112.1 + // 3d619e7..6260626 master -> origin/master + // + // The most important bits here are the lines like these: + // + // 3036acc..9eb5e40 debian-release-20081030 -> origin/debian-release-20081030 + // * [new branch] debian-release-20081112 -> origin/debian-release-20081112 + // + // The first line of these two shows that your remote-tracking branch + // origin/debian-release-20081030 has been advanced from the commit 3036acc to 9eb5e40. + // The bit before the arrow is the name of the branch in the remote repository. + // The second line similarly show that since we last did this, a new remote tracking + // branch has been created. (git fetch may also fetch new tags if they have appeared + // in the remote repository.) + bool found = false; for (int i=0; i < lines.size(); ++i) { if (lines.at(i).contains(m_branchName)) {