diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-24 23:47:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-24 23:47:48 -0800 |
| commit | ab57c8dd2abe062294eba94a1af60ba00964421c (patch) | |
| tree | 69816a3e7a1c5edf3dd653236e7b715b039cbb56 | |
| parent | d55e0fff1fadf5fcbaa71dccd03e44f3ab610b66 (diff) | |
| parent | 8fcf1ad9c68e15d881194c8544e7c11d33529c2b (diff) | |
| download | git-ab57c8dd2abe062294eba94a1af60ba00964421c.tar.gz git-ab57c8dd2abe062294eba94a1af60ba00964421c.tar.xz | |
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 .
| -rwxr-xr-x | contrib/gitview/gitview | 6 | ||||
| -rw-r--r-- | pack-objects.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview index 2cde71e30..4e3847d8b 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 be7a2008c..0287449b4 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 */ |