threads / patch / 6208

patch, 2 partsgitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')

Subject: [PATCH 1/2] gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne')

## tl;dr

2 messages between Jan 3, 2007 and Jan 3, 2007. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Jakub Narebski· Jan 3, 2007, 19:47 UTC · lore

Fix bug in git_difftree_body subroutine; it was used '!=' comparison operator for strings (file type) instead of correct 'ne'.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
 gitweb/gitweb.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to gitweb/gitweb.perl +1 −1
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 7f54834..05b3876 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2274,7 +2274,7 @@ sub git_difftree_body {
 			my $mode_chnge = "";
 			if ($diff{'from_mode'} != $diff{'to_mode'}) {
 				$mode_chnge = "<span class=\"file_status mode_chnge\">[changed";
-				if ($from_file_type != $to_file_type) {
+				if ($from_file_type ne $to_file_type) {
 					$mode_chnge .= " from $from_file_type to $to_file_type";
 				}
 				if (($from_mode_oct & 0777) != ($to_mode_oct & 0777)) {
-- 
1.4.4.3
Jakub Narebski· Jan 3, 2007, 19:47 UTC · re: Jakub Narebski · lore

[PATCH 2/2] gitweb: There can be empty patches (in git_patchset_body)

We now do not skip over empty patches in git_patchset_body (where empty means that they consist only of git diff header, and of extended diff header), so uncomment branch of code dealing with empty patches (patches which do not have even two-line from/to header)

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
 gitweb/gitweb.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to gitweb/gitweb.perl +1 −1
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 05b3876..2ead917 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -2527,7 +2527,7 @@ sub git_patchset_body {
 		print "<div class=\"diff from_file\">$patch_line</div>\n";
 
 		$patch_line = <$fd>;
-		#last PATCH unless $patch_line;
+		last PATCH unless $patch_line;
 		chomp $patch_line;
 
 		#assert($patch_line =~ m/^+++/) if DEBUG;
-- 
1.4.4.3

← back to recent threads