[PATCH v3 11/11] contrib: cc-cmd: ignore chunks with no original lines

2013-04-19 Thread Felipe Contreras
Suggested-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
 contrib/cc-cmd/git-cc-cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/cc-cmd/git-cc-cmd b/contrib/cc-cmd/git-cc-cmd
index 9a2d2fd..02841c4 100755
--- a/contrib/cc-cmd/git-cc-cmd
+++ b/contrib/cc-cmd/git-cc-cmd
@@ -125,7 +125,7 @@ class Commits
   end
 
   def get_blame(source, start, offset, from)
-return unless source
+return unless source and offset
 File.popen(['git', 'blame', '--incremental', '-C',
'-L', '%u,+%u' % [start, offset],
'--since', $since, from + '^',
-- 
1.8.2.1.790.g4588561

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v3 11/11] contrib: cc-cmd: ignore chunks with no original lines

2013-04-19 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes:

 Suggested-by: Junio C Hamano gits...@pobox.com
 Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
 ---
  contrib/cc-cmd/git-cc-cmd | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/contrib/cc-cmd/git-cc-cmd b/contrib/cc-cmd/git-cc-cmd
 index 9a2d2fd..02841c4 100755
 --- a/contrib/cc-cmd/git-cc-cmd
 +++ b/contrib/cc-cmd/git-cc-cmd
 @@ -125,7 +125,7 @@ class Commits
end
  
def get_blame(source, start, offset, from)
 -return unless source
 +return unless source and offset

I do not think a separate patch at the end is a good idea for a
fix-up like this, even if to give credit to others.

Just squashing it in to the original would help reviewers; that way,
they do not have to wonder why is this broken and later notice
ah, it is fixed at the end.

I do not know if that is an offset, though.  It is the offset
for the end of the block relative to its beginning, but people
usually call that the size of the block, I think.

  File.popen(['git', 'blame', '--incremental', '-C',
 '-L', '%u,+%u' % [start, offset],
 '--since', $since, from + '^',
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html