From: Junio C Hamano <junkio@cox.net>
Date: Sat, 25 Feb 2006 07:47:48 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~54^2~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ab57c8dd?hp=d55e0fff1fadf5fcbaa71dccd03e44f3ab610b66

Merge branch 'master' into next

* master:
fix warning from pack-objects.c
Merge branches 'jc/rev-list' and 'jc/pack-thin'
gitview: Fix the graph display .
---

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
index 2cde71e30d..4e3847d8bf 100755
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
@@ -938,8 +938,10 @@ class GitView:
 	def draw_incomplete_line(self, sha1, node_pos, out_line, in_line, index):
 		for idx, pos in enumerate(self.incomplete_line[sha1]):
 			if(pos == node_pos):
-				out_line.append((pos,
-					pos+0.5, self.colours[sha1]))
+				#remove the straight line and add a slash
+				if ((pos, pos, self.colours[sha1]) in out_line):
+					out_line.remove((pos, pos, self.colours[sha1]))
+				out_line.append((pos, pos+0.5, self.colours[sha1]))
 				self.incomplete_line[sha1][idx] = pos = pos+0.5
 			try:
 				next_commit = self.commits[index+1]
diff --git a/pack-objects.c b/pack-objects.c
index be7a2008c5..0287449b4c 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -99,7 +99,7 @@ static int reused_delta = 0;
 
 static int pack_revindex_ix(struct packed_git *p)
 {
-	unsigned int ui = (unsigned int) p;
+	unsigned long ui = (unsigned long)(long)p;
 	int i;
 
 	ui = ui ^ (ui >> 16); /* defeat structure alignment */