diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-09-30 09:58:31 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-09-30 09:58:31 +0100 |
| commit | cb89d428b7f1e830693f7445cd801649ddbdf55a (patch) | |
| tree | ec624651dea92c1ab6f7d29bbc7a2587c34b91a3 /guix-qa-frontpage/manage-patch-branches.scm | |
| parent | 7ba5a91aa38d144e686c0fe6027602d1205c42f4 (diff) | |
| download | qa-frontpage-cb89d428b7f1e830693f7445cd801649ddbdf55a.tar qa-frontpage-cb89d428b7f1e830693f7445cd801649ddbdf55a.tar.gz | |
Use --ignore-whitespace when applying patches
Diffstat (limited to 'guix-qa-frontpage/manage-patch-branches.scm')
| -rw-r--r-- | guix-qa-frontpage/manage-patch-branches.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/guix-qa-frontpage/manage-patch-branches.scm b/guix-qa-frontpage/manage-patch-branches.scm index 0ce9d4b..7764375 100644 --- a/guix-qa-frontpage/manage-patch-branches.scm +++ b/guix-qa-frontpage/manage-patch-branches.scm @@ -203,7 +203,7 @@ (name (assoc-ref patch "name")) (id (assoc-ref patch "id"))) - (simple-format #t "Running git am --empty=drop --3way \"~A.patch\" (~A)\n" id name) + (simple-format #t "Running git am --ignore-whitespace --empty=drop --3way \"~A.patch\" (~A)\n" id name) (let ((patch-file (simple-format #f "~A.patch" id))) (call-with-output-file patch-file @@ -218,7 +218,15 @@ (let* ((code output (invoke/capture-output - "git" "am" "--empty=drop" "--3way" patch-file)) + "git" "am" + "--empty=drop" + ;; As seen in #66110, there's potentially + ;; something going wrong in Patchwork when + ;; handling carriage return characters that need + ;; to be included in the diff, but this option + ;; seems to work around that + "--ignore-whitespace" + "--3way" patch-file)) (new-results `(((id . ,id) (name . ,name) |