diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-11-25 18:10:33 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-11-25 18:18:15 +0100 |
| commit | f8ce24a835cae8c623e2936bec2618a8855c605b (patch) | |
| tree | d4c1d392579e24285381613a4ac1b7cc2d6b6fae /git/test/fixtures/diff_f | |
| parent | 65747a216c67c3101c6ae2edaa8119d786b793cb (diff) | |
| parent | 9004e3a1cf33110f2cbc458f1dc3259c930ad9b4 (diff) | |
| download | GitPython-f8ce24a835cae8c623e2936bec2618a8855c605b.tar.gz GitPython-f8ce24a835cae8c623e2936bec2618a8855c605b.zip | |
-#######->WARNING<-####### Directory structure changed, see commit message
If you use git-python as a submodule of your own project, which alters the sys.path to import it,
you will have to adjust your code to take the changed directory structure into consideration.
Previously, you would put the path
./git-python/lib
into your syspath. All modules moved one level up into the 'git' subdirectory, which means that the 'git-python' directory
now contains the 'git' root package. To allow git to be found, add ./git-python into your path.
To finalize your update, run the following commands
git submodule update --init --recursive
As there will be left-over directories, consider running git-clean
Diffstat (limited to 'git/test/fixtures/diff_f')
| -rw-r--r-- | git/test/fixtures/diff_f | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/git/test/fixtures/diff_f b/git/test/fixtures/diff_f new file mode 100644 index 00000000..48a49256 --- /dev/null +++ b/git/test/fixtures/diff_f @@ -0,0 +1,15 @@ +diff --git a/lib/grit/diff.rb b/lib/grit/diff.rb +index 537955bb86a8ceaa19aea89e75ccbea5ce6f2698..00b0b4a67eca9242db5f8991e99625acd55f040c 100644 +--- a/lib/grit/diff.rb ++++ b/lib/grit/diff.rb +@@ -27,6 +27,10 @@ module Grit + while !lines.empty? + m, a_path, b_path = *lines.shift.match(%r{^diff --git a/(\S+) b/(\S+)$}) + ++ if lines.first =~ /^old mode/ ++ 2.times { lines.shift } ++ end ++ + new_file = false + deleted_file = false + |
