--- Begin Message ---
|
Subject: |
[PATCH] gnu: git: Fix checksum patch in 'patch-tests'. |
|
Date: |
Sun, 1 Apr 2018 15:03:12 +0000 |
Hi Guix Team,
First contribution to Guix project so i hope i forgot nothing in the process to
submit my patch.
There is already some patchs for "t/t9100-git-svn-basic.sh" and
"t/t9300-fast-import.sh" but they
assume than the store is always "/gnu/store".
The bellow patch is intend to correct this and lets the check phase work the
same way if a custom
store is used.
Best regards,
>From 08b8d3b9d32bd7f3f5b762541f38f95a2eb63c2a Mon Sep 17 00:00:00 2001
From: RockAndSka <address@hidden>
Date: Sun, 1 Apr 2018 16:11:30 +0200
Subject: [PATCH] gnu: git: Fix checksum patch in 'patch-tests'.
* gnu/packages/version-control.scm (git)[arguments]: In 'patch-tests'
phase, use %store-directory instead of '/gnu' to prevent tests failure
in case a custom store path is used.
---
gnu/packages/version-control.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index ba985f6..60a509e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -238,10 +238,10 @@ as well as the classic centralized workflow.")
(("\tcommit_template_commented") "\ttrue"))
;; More checksum mismatches due to odd shebangs.
(substitute* "t/t9100-git-svn-basic.sh"
- (("\"#!/gnu.*/bin/sh") "\"#!/bin/sh"))
+ (((string-append "\"#!" (%store-directory) ".*/bin/sh"))
"\"#!/bin/sh") )
(substitute* "t/t9300-fast-import.sh"
- (("\t#!/gnu.*/bin/sh") "\t#!/bin/sh")
- (("'#!/gnu.*/bin/sh") "'#!/bin/sh"))
+ (((string-append "\t#!" (%store-directory) ".*/bin/sh"))
"\t#!/bin/sh")
+ (((string-append "'#!" (%store-directory) ".*/bin/sh"))
"'#!/bin/sh"))
;; FIXME: Some hooks fail with "basename: command not found".
;; See 't/trash directory.t9164.../svn-hook.log'.
(delete-file "t/t9164-git-svn-dcommit-concurrent.sh")
--
2.7.4
--- End Message ---
--- Begin Message ---
|
Subject: |
RE: [bug#31016] [PATCH] gnu: git: Fix checksum patch in 'patch-tests'. |
|
Date: |
Fri, 06 Apr 2018 20:22:49 +0200 |
|
User-agent: |
Notmuch/0.26.1 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) |
YOANN P <address@hidden> writes:
>>We'll have to reindent it, but that's okay. Can you send an updated
>>patch?
>
> Sorry for the indentation, I indeed used my VIMorite editor and don't use
> Emacs to be able to use the indentation plugin :/
There is a script you can run to indent even if you don't use emacs.
From a git checkout, you can do:
"./etc/indent-code.el gnu/packages/version-control.scm git".
Unfortunately, "git" is currently wrongly indented at the (package ..)
level, so it would reindent the whole package instead of just the phase.
> Please find bellow the patch modified with the modifications asked ( I just
> recompiled Git with those modifications to be sure and seems ok)
Thank you! It works for me as well. Pushed as 6e0efe8cd!
signature.asc
Description: PGP signature
--- End Message ---