diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-11-18 23:11:32 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-11-18 23:11:32 +0100 |
| commit | f1545bd9cd6953c5b39c488bf7fe179676060499 (patch) | |
| tree | 8bd4b8829768fe0195d41a3aa067aa1ac7435605 /lib/git/index/base.py | |
| parent | a1d1d2cb421f16bd277d7c4ce88398ff0f5afb29 (diff) | |
| parent | 7cf2d5fcf0a3db793678dd6ba9fc1c24d4eeb36a (diff) | |
| download | gitpython-f1545bd9cd6953c5b39c488bf7fe179676060499.tar.gz | |
Merge branch 'submodule'
Diffstat (limited to 'lib/git/index/base.py')
| -rw-r--r-- | lib/git/index/base.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/git/index/base.py b/lib/git/index/base.py index 05501ba1..05caa06d 100644 --- a/lib/git/index/base.py +++ b/lib/git/index/base.py @@ -35,7 +35,8 @@ from git.exc import ( ) from git.objects import ( - Blob, + Blob, + Submodule, Tree, Object, Commit, @@ -553,7 +554,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): for item in items: if isinstance(item, basestring): paths.append(self._to_relative_path(item)) - elif isinstance(item, Blob): + elif isinstance(item, (Blob, Submodule)): entries.append(BaseIndexEntry.from_blob(item)) elif isinstance(item, BaseIndexEntry): entries.append(item) @@ -588,7 +589,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): They are added at stage 0 - - Blob object + - Blob or Submodule object Blobs are added as they are assuming a valid mode is set. The file they refer to may or may not exist in the file system, but must be a path relative to our repository. @@ -612,6 +613,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): explicitly set. Please note that Index Entries require binary sha's. :param force: + **CURRENTLY INEFFECTIVE** If True, otherwise ignored or excluded files will be added anyway. As opposed to the git-add command, we enable this flag by default @@ -748,7 +750,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): may be absolute or relative paths, entries or blobs""" paths = list() for item in items: - if isinstance(item, (BaseIndexEntry,Blob)): + if isinstance(item, (BaseIndexEntry,(Blob, Submodule))): paths.append(self._to_relative_path(item.path)) elif isinstance(item, basestring): paths.append(self._to_relative_path(item)) @@ -775,7 +777,7 @@ class IndexFile(LazyMixin, diff.Diffable, Serializable): The path string may include globs, such as *.c. - - Blob object + - Blob Object Only the path portion is used in this case. - BaseIndexEntry or compatible type |