Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
soramimi committed Jun 17, 2024
1 parent 5fdf913 commit e01c249
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 25 deletions.
10 changes: 0 additions & 10 deletions src/GitDiff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ class GitDiff::LookupTable {

// GitDiff

// GitPtr GitDiff::git()
// {
// return objcache->git();
// }

GitPtr GitDiff::git(Git::SubmoduleItem const &submod)
{
return global->mainwindow->git(submod);
Expand Down Expand Up @@ -365,11 +360,6 @@ GitCommitTree::GitCommitTree(GitObjectCache *objcache)
{
}

// GitPtr GitCommitTree::git()
// {
// return objcache->git();
// }

QString GitCommitTree::lookup_(GitPtr g, QString const &file, GitTreeItem *out)
{
int i = file.lastIndexOf('/');
Expand Down
1 change: 0 additions & 1 deletion src/GitDiff.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ class GitDiff {

using MapList = std::list<LookupTable>;

// GitPtr git();
GitPtr git(const Git::SubmoduleItem &submod);

static void AddItem(Git::Diff *item, QList<Git::Diff> *diffs);
Expand Down
3 changes: 0 additions & 3 deletions src/GitObjectManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,6 @@ Git::CommitID GitObjectCache::getCommitIdFromTag(GitPtr g, QString const &tag)
return commit_id;
}




bool GitCommit::parseCommit(GitPtr g, GitObjectCache *objcache, Git::CommitID const &id, GitCommit *out)
{
*out = {};
Expand Down
10 changes: 0 additions & 10 deletions src/GitObjectManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,6 @@ class GitObjectManager {
void loadIndexes(GitPtr g);
QString findObjectPath(GitPtr g, const Git::CommitID &id);
bool loadObject(GitPtr g, const Git::CommitID &id, QByteArray *out, Git::Object::Type *type);
// GitPtr git()
// {
// return g->dup();
// }
// GitPtr git(Git::SubmoduleItem const &submod)
// {
// GitPtr g2 = g->dup();
// g2->setWorkingRepositoryDir(g->workingDir(), submod.path, g->sshKey());
// return g2;
// }
void init();
public:
GitObjectManager();
Expand Down
4 changes: 3 additions & 1 deletion src/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2708,7 +2708,6 @@ void MainWindow::onShowFileList(const ExchangeData &data)
*/
void MainWindow::clearFileList(RepositoryWrapperFrame *frame)
{
showFileList(FilesListType::SingleList);
frame->unstagedFileslistwidget()->clear();
frame->stagedFileslistwidget()->clear();
frame->fileslistwidget()->clear();
Expand Down Expand Up @@ -3886,6 +3885,8 @@ void MainWindow::addFileObjectData(ExchangeData const &data, CallType calltype)
return;
}

clearFileList(data.frame);

for (ObjectData const &obj : data.object_data) {
QListWidgetItem *item = newListWidgetFileItem(obj);
switch (data.files_list_type) {
Expand Down Expand Up @@ -5708,6 +5709,7 @@ QString MainWindow::abbrevCommitID(const Git::CommitItem &commit)
*/
void MainWindow::doLogCurrentItemChanged(RepositoryWrapperFrame *frame)
{
showFileList(FilesListType::SingleList);
clearFileList(frame);

Git::CommitItem const *commit = selectedCommitItem(frame);
Expand Down

0 comments on commit e01c249

Please sign in to comment.