From ee48b991e1ceff2fec2ecffcc8586b93d5934873 Mon Sep 17 00:00:00 2001
From: HangerThem <f.borisjuk@gmail.com>
Date: Mon, 3 Aug 2026 18:10:01 +0200
Subject: [PATCH] Hopefully finally correct pass through for git info

---
 components/layout/Sidebar.tsx | 10 ++++-----
 next.config.ts                |  2 +-
 utils/git.ts                  | 40 ++---------------------------------
 3 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/components/layout/Sidebar.tsx b/components/layout/Sidebar.tsx
index f86f8a3..fa643e1 100644
--- a/components/layout/Sidebar.tsx
+++ b/components/layout/Sidebar.tsx
@@ -3,7 +3,7 @@ import { NotepadText } from 'lucide-react'
 import { NavLinks } from '@/components/layout/NavLinks'
 import { siBluesky, siGithub, siMatrix, siTelegram, type SimpleIcon } from 'simple-icons'
 import { ExternalLink } from '@/components/ui/ExternalLink'
-import { getGitCommitHash, getGitOriginUrl } from '@/utils/git'
+import { getGitCommitHash } from '@/utils/git'
 
 type SocialLink = {
   icon: SimpleIcon
@@ -29,10 +29,10 @@ const socialLinks: SocialLink[] = [
   },
 ]
 
-export async function Sidebar() {
-  const gitCommitHash = (await getGitCommitHash())?.substring(0, 7)
-  const gitOriginUrl = await getGitOriginUrl()
+const gitCommitHash = await getGitCommitHash()
+const gitOriginUrl = process.env.GIT_ORIGIN_URL
 
+export async function Sidebar() {
   return (
     <aside className="hidden lg:block w-64 shrink-0 px-4 bg-fg/5">
       <div className="sticky top-0 flex flex-col h-screen gap-4 py-4">
@@ -60,7 +60,7 @@ export async function Sidebar() {
           <div className="text-xs text-fg-dim mt-2 mx-auto">
             <span>Commit: </span>
             <ExternalLink href={gitOriginUrl + '/commit/' + gitCommitHash}>
-              {gitCommitHash}
+              {gitCommitHash.slice(0, 7)}
             </ExternalLink>
           </div>
         )}
diff --git a/next.config.ts b/next.config.ts
index 985069c..19e8448 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -5,7 +5,7 @@ const nextConfig: NextConfig = {
     qualities: [75, 100],
   },
   env: {
-    GIT_COMMIT_HASH: process.env.GIT_COMMIT_HASH,
+    GIT_COMMIT_HASH: process.env.SOURCE_COMMIT,
     GIT_ORIGIN_URL: process.env.GIT_ORIGIN_URL,
   },
 }
diff --git a/utils/git.ts b/utils/git.ts
index dd20d69..f3a148d 100644
--- a/utils/git.ts
+++ b/utils/git.ts
@@ -1,6 +1,6 @@
 /**
- * Get the current git commit hash.
- * @returns The current git commit hash, or null if it cannot be determined.
+ * Get the current Git commit hash.
+ * @returns The current Git commit hash, or null if it cannot be determined.
  */
 export async function getGitCommitHash(): Promise<string | null> {
   if (process.env.GIT_COMMIT_HASH) {
@@ -17,39 +17,3 @@ export async function getGitCommitHash(): Promise<string | null> {
     return null
   }
 }
-
-/**
- * Get the git origin URL.
- * @returns The git origin URL, or null if it cannot be determined.
- */
-export async function getGitOriginUrl(): Promise<string | null> {
-  const envUrl = process.env.GIT_ORIGIN_URL
-  if (envUrl) return normalizeGitUrl(envUrl)
-
-  try {
-    const { exec } = await import('child_process')
-    const url = await new Promise<string>((res, rej) => {
-      exec('git config --get remote.origin.url', (err, stdout) =>
-        err ? rej(err) : res(stdout.trim()),
-      )
-    })
-    return normalizeGitUrl(url)
-  } catch {
-    return null
-  }
-}
-
-/**
- * Normalize a git URL to a standard format.
- * @param url The git URL to normalize.
- * @returns The normalized git URL.
- */
-function normalizeGitUrl(url: string): string {
-  if (url.startsWith('ssh://')) {
-    return url
-      .replace(/^ssh:\/\/git@/, 'https://')
-      .replace(/\.git$/, '')
-      .replace(/:\d+/, '')
-  }
-  return url
-}