instead of ignoring the .git folder at multiple places, ignore it dir…

…ectly when requesting the path, otherwise the settings are stored inconsistently and might lead to an infinity loop in void RecentRepositories::load()

src/conf/RecentRepository.cpp

@@ -15,12 +15,7 @@ RecentRepository::RecentRepository(const QString &gitpath, QObject *parent)
 QString RecentRepository::gitpath() const { return mGitPath; }
 
 QString RecentRepository::name() const {
-  QString name;
-  if (mGitPath.endsWith("/.git"))
-    name = mGitPath.section('/', -mSections - 1, -2);
-  else
-    name = mGitPath.section('/', -mSections, -1);
-  return name;
+  return mGitPath.section('/', -mSections, -1);
 }
 
 void RecentRepository::increment() { ++mSections; }

src/git/Repository.cpp

@@ -152,7 +152,14 @@ Repository::Repository(git_repository *repo) : d(registerRepository(repo)) {}
 
 Repository::operator git_repository *() const { return d->repo; }
 
-QDir Repository::dir() const { return QDir(git_repository_path(d->repo)); }
+QDir Repository::dir(bool includeGitFolder) const {
+  QDir dir(git_repository_path(d->repo));
+  if (!includeGitFolder) {
+    assert(dir.dirName() == ".git");
+    assert(dir.cdUp());
+  }
+  return dir;
+}
 
 QDir Repository::workdir() const {
   return isBare() ? dir() : QDir(git_repository_workdir(d->repo));

src/git/Repository.h

@@ -71,7 +71,7 @@ class Repository {
 
   RepositoryNotifier *notifier() const { return d->notifier; }
 
-  QDir dir() const;
+  QDir dir(bool includeGitFolder = true) const;
   QDir workdir() const;
   QDir appDir() const;
 

src/ui/MainWindow.cpp

@@ -52,10 +52,7 @@ class TabName {
 public:
   TabName(const QString &path) : mPath(path) {}
 
-  QString name() const {
-    return mPath.endsWith("/.git") ? mPath.section('/', -mSections - 1, -2)
-                                   : mPath.section('/', -mSections);
-  }
+  QString name() const { return mPath.section('/', -mSections); }
 
   void increment() { ++mSections; }
   int sections() const { return mSections; }
@@ -221,7 +218,7 @@ RepoView *MainWindow::addTab(const QString &path) {
   TabWidget *tabs = tabWidget();
   for (int i = 0; i < tabs->count(); i++) {
     RepoView *view = static_cast<RepoView *>(tabs->widget(i));
-    if (path == view->repo().dir().path()) {
+    if (path == view->repo().dir(false).path()) {
       tabs->setCurrentIndex(i);
       return view;
     }
@@ -238,13 +235,13 @@ RepoView *MainWindow::addTab(const QString &path) {
 
 RepoView *MainWindow::addTab(const git::Repository &repo) {
   // Update recent repository settings.
-  QDir dir = repo.dir();
+  QDir dir = repo.dir(false);
   RecentRepositories::instance()->add(dir.path());
 
   TabWidget *tabs = tabWidget();
   for (int i = 0; i < tabs->count(); i++) {
     RepoView *view = static_cast<RepoView *>(tabs->widget(i));
-    if (dir.path() == view->repo().dir().path()) {
+    if (dir.path() == view->repo().dir(false).path()) {
       tabs->setCurrentIndex(i);
       return view;
     }
@@ -259,13 +256,7 @@ RepoView *MainWindow::addTab(const git::Repository &repo) {
           [this] { updateWindowTitle(); });
 
   emit tabs->tabAboutToBeInserted();
-
-  // NB : this seems to be useless, because overwritten by
-  // MainWindow::updateTabNames
-  QString tabTitle = dir.dirName();
-  if (tabTitle == ".git")
-    tabTitle = dir.path().section("/", -2, -2);
-  tabs->setCurrentIndex(tabs->addTab(view, tabTitle));
+  tabs->setCurrentIndex(tabs->addTab(view, dir.dirName()));
 
   Settings *settings = Settings::instance();
   bool enable =
@@ -390,7 +381,7 @@ MainWindow *MainWindow::open(const QString &path, bool warnOnInvalid) {
 MainWindow *MainWindow::open(const git::Repository &repo) {
   // Update recent repository settings.
   if (repo.isValid())
-    RecentRepositories::instance()->add(repo.dir().path());
+    RecentRepositories::instance()->add(repo.dir(false).path());
 
   // Create the window.
   MainWindow *window = new MainWindow(repo);
@@ -479,7 +470,7 @@ void MainWindow::updateTabNames() {
   QList<TabName> fullNames;
 
   for (int i = 0; i < count(); ++i) {
-    TabName name(view(i)->repo().dir().path());
+    TabName name(view(i)->repo().dir(false).path());
     names[name.name()].append(i);
     fullNames.append(name);
   }
@@ -529,15 +520,9 @@ void MainWindow::updateWindowTitle(int ahead, int behind) {
   }
 
   git::Repository repo = view->repo();
-  QDir dir = repo.dir();
+  QDir dir = repo.dir(false);
   git::Reference head = repo.head();
-  QString path;
-  if (mFullPath)
-    path = dir.path();
-  else if (dir.dirName() == ".git")
-    path = dir.path().section("/", -2, -2);
-  else
-    path = dir.dirName();
+  QString path = mFullPath ? dir.path() : dir.dirName();
   QString name = head.isValid() ? head.name() : repo.unbornHeadName();
   QString title = tr("%1 - %2").arg(path, name);
 
@@ -601,7 +586,7 @@ void MainWindow::updateWindowTitle(int ahead, int behind) {
 QStringList MainWindow::paths() const {
   QStringList paths;
   for (int i = 0; i < count(); ++i)
-    paths.append(view(i)->repo().dir().path());
+    paths.append(view(i)->repo().dir(false).path());
   return paths;
 }
 

src/ui/SideBar.cpp

@@ -352,7 +352,7 @@ class RepoModel : public QAbstractItemModel {
                 return mTabs->tabText(row);
 
               RepoView *view = static_cast<RepoView *>(mTabs->widget(row));
-              return view->repo().dir().path();
+              return view->repo().dir(false).path();
             }
 
             return tr("none");
@@ -446,7 +446,7 @@ class RepoModel : public QAbstractItemModel {
               return QVariant();
             QWidget *widget = mTabs->widget(row);
             RepoView *view = static_cast<RepoView *>(widget);
-            return view->repo().dir().path();
+            return view->repo().dir(false).path();
           }
 
           case Recent:
@@ -493,7 +493,7 @@ class RepoModel : public QAbstractItemModel {
           case Repo:
             if (mTabs->count()) {
               RepoView *view = static_cast<RepoView *>(mTabs->widget(row));
-              return view->repo().dir().path();
+              return view->repo().dir(false).path();
             }
 
             return "";