checkpatch: improve Gerrit Change-Id: test (44d303eb) · Commits · 戴 / test

scripts/checkpatch.pl

+10 −3

Original line number	Diff line number	Diff line
		@@ -2335,6 +2335,7 @@ sub process {
		my $is_binding_patch = -1;
		my $in_header_lines = $file ? 0 : 1;
		my $in_commit_log = 0; #Scanning lines before patch
		my $has_patch_separator = 0; #Found a --- line
		my $has_commit_log = 0; #Encountered lines before patch
		my $commit_log_lines = 0; #Number of commit log lines
		my $commit_log_possible_stack_dump = 0;
		@@ -2660,6 +2661,12 @@ sub process {
		}
		}

		# Check for patch separator
		if ($line =~ /^---$/) {
		$has_patch_separator = 1;
		$in_commit_log = 0;
		}

		# Check if MAINTAINERS is being updated. If so, there's probably no need to
		# emit the "does MAINTAINERS need updating?" message on file add/move/delete
		if ($line =~ /^\sMAINTAINERS\s\\|/) {
		@@ -2759,10 +2766,10 @@ sub process {
		"A patch subject line should describe the change not the tool that found it\n" . $herecurr);
		}

		# Check for unwanted Gerrit info
		if ($in_commit_log && $line =~ /^\s*change-id:/i) {
		# Check for Gerrit Change-Ids not in any patch context
		if ($realfile eq '' && !$has_patch_separator && $line =~ /^\s*change-id:/i) {
		ERROR("GERRIT_CHANGE_ID",
		"Remove Gerrit Change-Id's before submitting upstream.\n" . $herecurr);
		"Remove Gerrit Change-Id's before submitting upstream\n" . $herecurr);
		}

		# Check if the commit log is in a possible stack dump