From d375eddda0b407b29ce0f7d29a582623cef20a89 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 8 Apr 2021 12:16:35 -0400 Subject: etc/committer: Use git plumbing instead of porcelain. * etc/committer.scm.in (diff-info): Use "git diff-files" instead of "git diff". (old-sexp): Use "git cat-file" instead of "git show". Signed-off-by: Ricardo Wurmus --- etc/committer.scm.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/committer.scm.in b/etc/committer.scm.in index 801b5d195e..cc713dcdcd 100755 --- a/etc/committer.scm.in +++ b/etc/committer.scm.in @@ -89,8 +89,7 @@ (define* (hunk->patch hunk #:optional (port (current-output-port))) (define (diff-info) "Read the diff and return a list of values." (let ((port (open-pipe* OPEN_READ - "git" "diff" - "--no-color" + "git" "diff-files" "--no-prefix" ;; Only include one context line to avoid lumping in ;; new definitions with changes to existing @@ -154,8 +153,9 @@ (define (old-sexp hunk) corresponding to the top-level definition containing the staged changes." ;; TODO: We can't seek with a pipe port... (let* ((port (open-pipe* OPEN_READ - "git" "show" (string-append "HEAD:" - (hunk-file-name hunk)))) + "git" "cat-file" "-p" (string-append + "HEAD:" + (hunk-file-name hunk)))) (contents (get-string-all port))) (close-pipe port) (call-with-input-string contents -- cgit v1.2.3