[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libqgit2] src: Merge commit
From:       Nils Fenner <nilsfenner () web ! de>
Date:       2011-11-20 22:09:45
Message-ID: 20111120220945.77486A60D3 () git ! kde ! org
[Download RAW message or body]

Git commit d2760d4d52f28b43edc00422f680f4ccf9d9807c by Nils Fenner.
Committed on 20/11/2011 at 23:07.
Pushed by fenner into branch 'master'.

Merge commit 'c6ba9cd62e2fd219220c78cbd916f885aa1ebd2a'

Conflicts:
	src/qgitrepository.cpp

M  +8    -2    src/qgitoid.cpp
M  +7    -1    src/qgitoid.h
M  +17   -14   src/qgitrepository.cpp

http://commits.kde.org/libqgit2/d2760d4d52f28b43edc00422f680f4ccf9d9807c

diff --cc src/qgitoid.cpp
index 526ab6e,e94306e..5e432ce
--- a/src/qgitoid.cpp
+++ b/src/qgitoid.cpp
@@@ -38,15 -38,12 +38,17 @@@ QGitOId::~QGitOId(
  {
  }
  
 +bool LibQGit2::QGitOId::isValid() const
 +{
 +    return ( !d.isEmpty() && (d != QByteArray(GIT_OID_RAWSZ, '\0')) );
 +}
 +
  QGitOId QGitOId::fromString(const QByteArray& string)
  {
+     int len = qMin(string.length(), GIT_OID_HEXSZ);
      QGitOId oid;
-     git_oid_fromstr(oid.data(), string.constData());
+     oid.d.resize(len);
+     git_oid_fromstrn(oid.data(), string.constData(), len);
      return oid;
  }
  
diff --cc src/qgitrepository.cpp
index b5b2f8f,5a2860e..cc76db7
--- a/src/qgitrepository.cpp
+++ b/src/qgitrepository.cpp
@@@ -82,45 -85,45 +85,45 @@@ int QGitRepository::open(const QString
                                  QFile::encodeName(gitWorkTree));
  }
  
 -QGitRef QGitRepository::lookupRef(const QString& name)
 +QGitRef QGitRepository::lookupRef(const QString& name) const
  {
-     git_reference *ref;
+     git_reference *ref = 0;
      git_reference_lookup(&ref, data(), QFile::encodeName(name));
      return QGitRef(ref);
  }
  
 -QGitCommit QGitRepository::lookupCommit(const QGitOId& oid)
 +QGitCommit QGitRepository::lookupCommit(const QGitOId& oid) const
  {
-     git_commit *commit;
-     git_commit_lookup(&commit, data(), oid.data());
+     git_commit *commit = 0;
+     git_commit_lookup_prefix(&commit, data(), oid.data(), oid.length());
      return QGitCommit(commit);
  }
  
 -QGitTag QGitRepository::lookupTag(const QGitOId& oid)
 +QGitTag QGitRepository::lookupTag(const QGitOId& oid) const
  {
-     git_tag *tag;
-     git_tag_lookup(&tag, data(), oid.data());
+     git_tag *tag = 0;
+     git_tag_lookup_prefix(&tag, data(), oid.data(), oid.length());
      return QGitTag(tag);
  }
  
 -QGitTree QGitRepository::lookupTree(const QGitOId& oid)
 +QGitTree QGitRepository::lookupTree(const QGitOId& oid) const
  {
-     git_tree *tree;
-     git_tree_lookup(&tree, data(), oid.data());
+     git_tree *tree = 0;
+     git_tree_lookup_prefix(&tree, data(), oid.data(), oid.length());
      return QGitTree(tree);
  }
  
 -QGitBlob QGitRepository::lookupBlob(const QGitOId& oid)
 +QGitBlob QGitRepository::lookupBlob(const QGitOId& oid) const
  {
-     git_blob *blob;
-     git_blob_lookup(&blob, data(), oid.data());
+     git_blob *blob = 0;
+     git_blob_lookup_prefix(&blob, data(), oid.data(), oid.length());
      return QGitBlob(blob);
  }
  
- QGitObject QGitRepository::lookupAny(const QGitOId &id) const
 -QGitObject QGitRepository::lookupAny(const QGitOId &oid)
++QGitObject QGitRepository::lookupAny(const QGitOId &oid) const
  {
-     git_object *object;
-     git_object_lookup(&object, data(), id.data(), GIT_OBJ_ANY);
+     git_object *object = 0;
+     git_object_lookup_prefix(&object, data(), oid.data(), oid.length(), GIT_OBJ_ANY);
      return QGitObject(object);
  }
  
[prev in list] [next in list] [prev in thread] [next in thread]