wip

Author: ekump

.github/actions/clippy-annotation-reporter/action.yml

@@ -11,6 +11,10 @@ inputs:
     description: 'Comma-separated list of clippy rules to track'
     required: false
     default: 'unwrap_used,expect_used,todo,unimplemented,panic,unreachable'
+  base-branch:
+    description: 'Base branch to compare against'
+    required: false
+    default: 'origin/main'
 
 runs:
   using: 'composite'
@@ -19,6 +23,13 @@ runs:
       shell: bash
       run: rustup install stable && rustup default stable
 
+    - name: Fetch all branches
+      shell: bash
+      run: |
+        git fetch --all
+        echo "Available branches:"
+        git branch -a
+
     - name: Build annotation reporter
       shell: bash
       run: |
@@ -33,5 +44,6 @@ runs:
           --rules "${{ inputs.allow-annotation-rules }}" \
           --repo "${{ github.repository }}" \
           --pr "${{ github.event.number }}"
+          --base-branch "$BASE_BRANCH"
       env:
         GITHUB_TOKEN: ${{ inputs.github-token }}

.github/actions/clippy-annotation-reporter/src/main.rs

@@ -323,13 +323,23 @@ fn analyze_annotations(
 
 /// Get file content from a specific branch
 fn get_file_content(file: &str, branch: &str) -> Result<String> {
+    println!("Attempting to get content of '{}' from branch '{}'", file, branch);
+
     let output = Command::new("git")
         .args(["show", &format!("{}:{}", branch, file)])
         .output()
-        .context("Failed to execute git show command")?;
+        .context(format!("Failed to execute git show command for {}", file))?;
 
     if !output.status.success() {
         let stderr = String::from_utf8_lossy(&output.stderr);
+        println!("Git command error output: {}", stderr);
+
+        // Try alternative branch reference formats
+        if !branch.starts_with("origin/") && !branch.starts_with("refs/") {
+            println!("Trying with 'origin/' prefix...");
+            return get_file_content(file, &format!("origin/{}", branch));
+        }
+
         anyhow::bail!("Git show command failed: {}", stderr);
     }