mgit 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTg0NzVjMDFlNDEzNjNjZGE0ZjQ3ZGZhNGFlZjA0MDUxZGNlMDZmNw==
+    Nzc1OTY5YThjMGNhNWI3NGQyYjEwYzA4NGVlMDM1YjIyZTlhMWZiNg==
   data.tar.gz: !binary |-
-    NGYxNWRlMjA4NTJiYjk5MTUwOWRkOThmYzEwMWFmMjNlYmQ3MDJmNQ==
+    ZjcyZjUwMjRlOWUzMDQ1YmU5YmJhMDU0ODVlZmRhYzZiYzUyMTJkNQ==
 SHA512:
   metadata.gz: !binary |-
-    MjNlM2NiZjExMzQ5MzdjMWEzZTAxZDFmYmVmNDQ0YmQyZjk2ZjQ3ZmMyY2Yz
-    ODYyYWQzZTM4OTk3NjhlMjUwZDZiYmJkNDg0MDIyMTc2ZWQ0OTQwNGFkMjE4
-    ZjI3M2Y0YmJmNDU3OTg1NmJkYWYzY2VmYTQxZGNkMDkzODA4Yjg=
+    YmNjMzk1ZjI5Yjc1NTRhZDkxZGVkZGIzNmU5MTIxZDYzYjNkYzBiZDQzYjkx
+    YjUxYTI1MjBjMGViNjc5YTA1ZDcxMTVjN2M3YjEwOTkzZjlmNmRlOTBmYTdl
+    YzVhNGJhNDEzYzkzZWY2MGRhYTY2YTBkZDM1NGFmZThlMWYzNGQ=
   data.tar.gz: !binary |-
-    ZTQyMGI2ZjNmZjY5ZDRlNzA3YTQxMzkwOWJmZmFjNjNmNGM2MDc5Y2RkNmZl
-    ZGNmN2JkNmUyZTcyYjQ1YmJmMzI2YzA0MGY2NDIzMWZlNmVkYThkMTE2M2Rl
-    ZWFlN2QyMzEzMmZiY2I0NmUzYWY3NjJhMDA2ODBjMGI3YjdmYTE=
+    MjNjYzkxNDY3NzQ3ZWNiMGU5ZDE3NjJjYzM1ZjUzMDFmOTU2ZDUxYjFmMjcx
+    ZjA1N2QxMTRiMTQzZTdjMDg3MDZmZGIwYjliNDc2MGU5ZTYzNTMwZGFhZGM4
+    MWY5NTI5MTYyYTQ4NzUzYWQ4OGYyOGUyMDhjZGY5NGQ5Nzg3OTQ=

data/lib/mgit/commands/ffmerge.rb

@@ -26,7 +26,7 @@ module MGit
     end
 
     def description
-      'merge all upstream tracking branches that can be fast-forwarded'
+      'merge all upstream tracking branches that can be fast-forwardeded'
     end
 
     register_command :ffmerge

data/lib/mgit/commands/status.rb

@@ -32,6 +32,7 @@ module MGit
       flags << 'Index'.red if fs.include?(:index)
       flags << 'Dirty'.red if fs.include?(:dirty)
       flags << 'Untracked'.yellow if fs.include?(:untracked)
+      flags << 'Detached'.yellow if fs.include?(:detached)
 
       if fs.include?(:diverged)
         ds = repo.divergence

data/lib/mgit/repository.rb

@@ -24,7 +24,11 @@ module MGit
         when '??'
           flags << :untracked
         when '##'
-          flags << :diverged
+          if /## ([\w,\/]+)\.\.\.([\w,\/]+) \[(\w+) (\d+)\]/ =~ s
+            flags << :diverged
+          elsif /## HEAD \(no branch\)/ =~ s
+            flags << :detached
+          end
         end
       end
       flags
@@ -48,9 +52,12 @@ module MGit
 
   private
   
+    def status
+      @status ||= `git status --short --branch --ignore-submodules`.split("\n") 
+    end
+
     def status_lines
       Dir.chdir(path) do
-        status = `git status --short --branch --ignore-submodules`.split("\n")
         status.each do |s|
           yield s
         end

data/lib/mgit/version.rb

@@ -1,3 +1,3 @@
 module MGit
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mgit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - FlavourSys Technology GmbH