From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Feb 2010 05:53:54 +0000 (-0800)
Subject: Merge branch 'maint-1.6.5' into maint
X-Git-Tag: v1.6.6.2~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e33cc592deae8132936eea119554799e1039bc0f?ds=inline;hp=-c

Merge branch 'maint-1.6.5' into maint

* maint-1.6.5:
blame: prevent a segv when -L given start > EOF
---

e33cc592deae8132936eea119554799e1039bc0f
diff --combined builtin-blame.c
index 6408ec8ee6,4094f3c061..10f7eacf6e
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@@ -2365,7 -2365,6 +2365,7 @@@ parse_done
  			die_errno("cannot stat path '%s'", path);
  	}
  
 +	revs.disable_stdin = 1;
  	setup_revisions(argc, argv, &revs, NULL);
  	memset(&sb, 0, sizeof(sb));
  
@@@ -2433,7 -2432,7 +2433,7 @@@
  	if (top < 1)
  		top = lno;
  	bottom--;
- 	if (lno < top)
+ 	if (lno < top || lno < bottom)
  		die("file %s has only %lu lines", path, lno);
  
  	ent = xcalloc(1, sizeof(*ent));