fix: cargo package failed on bare commit git repo

Author: linyihai

src/cargo/ops/cargo_package.rs

@@ -87,7 +87,8 @@ struct VcsInfo {
 
 #[derive(Serialize)]
 struct GitVcsInfo {
-    sha1: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    sha1: Option<String>,
     /// Indicate whether or not the Git worktree is dirty.
     #[serde(skip_serializing_if = "std::ops::Not::not")]
     dirty: bool,
@@ -799,11 +800,13 @@ fn check_repo_state(
             .collect();
         let dirty = !dirty_src_files.is_empty();
         if !dirty || opts.allow_dirty {
-            let rev_obj = repo.revparse_single("HEAD")?;
-            Ok(GitVcsInfo {
-                sha1: rev_obj.id().to_string(),
-                dirty,
-            })
+            let sha1 = if let Ok(rev_obj) = repo.revparse_single("HEAD") {
+                Some(rev_obj.id().to_string())
+            } else {
+                None
+            };
+
+            Ok(GitVcsInfo { sha1: sha1, dirty })
         } else {
             anyhow::bail!(
                 "{} files in the working directory contain changes that were \

tests/testsuite/package.rs

@@ -1274,12 +1274,36 @@ fn issue_14354_allowing_bare_git_repo() {
         .file("src/lib.rs", "");
 
     p.cargo("package --allow-dirty")
-        .with_status(101)
         .with_stderr_data(str![[r#"
-[ERROR] revspec 'HEAD' not found; class=Reference (4); code=NotFound (-3)
+[PACKAGING] foo v0.1.0 ([ROOT]/foo)
+[PACKAGED] 4 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
+[VERIFYING] foo v0.1.0 ([ROOT]/foo)
+[COMPILING] foo v0.1.0 ([ROOT]/foo/target/package/foo-0.1.0)
+[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
         .run();
+
+    let f = File::open(&p.root().join("target/package/foo-0.1.0.crate")).unwrap();
+    validate_crate_contents(
+        f,
+        "foo-0.1.0.crate",
+        &[
+            ".cargo_vcs_info.json",
+            "Cargo.toml",
+            "Cargo.toml.orig",
+            "src/lib.rs",
+        ],
+        &[(
+            ".cargo_vcs_info.json",
+            r#"{
+  "git": {
+    "dirty": true
+  },
+  "path_in_vcs": ""
+}"#,
+        )],
+    );
 }
 
 #[cargo_test]