GNU bug report logs - #72942
Setting 'zdiff3' in global gitconfig causes guix pull to fail

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix; Reported by: guix@HIDDEN; dated Sun, 1 Sep 2024 21:48:04 UTC; Maintainer for guix is bug-guix@HIDDEN.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 1 Sep 2024 21:47:14 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 01 17:47:14 2024
Received: from localhost ([127.0.0.1]:40862 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1sksPh-0008E8-6g
	for submit <at> debbugs.gnu.org; Sun, 01 Sep 2024 17:47:14 -0400
Received: from lists.gnu.org ([209.51.188.17]:44670)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <guix@HIDDEN>) id 1skp75-0000hw-J2
 for submit <at> debbugs.gnu.org; Sun, 01 Sep 2024 14:15:48 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <guix@HIDDEN>) id 1skp67-0007uS-8o
 for bug-guix@HIDDEN; Sun, 01 Sep 2024 14:14:47 -0400
Received: from mout-p-103.mailbox.org ([2001:67c:2050:0:465::103])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256)
 (Exim 4.90_1) (envelope-from <guix@HIDDEN>) id 1skp65-0008IW-BS
 for bug-guix@HIDDEN; Sun, 01 Sep 2024 14:14:47 -0400
Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (No client certificate requested)
 by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4Wxg5V13zvz9t0f
 for <bug-guix@HIDDEN>; Sun,  1 Sep 2024 20:14:38 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alethk.it; s=MBO0001; 
 t=1725214478;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding;
 bh=0N9NQqkSPHAAWCzTnntfkceYu2VFIVtNcDDDzo8oK0A=;
 b=s12JUNX2Zf0wMhBJGMsxg2P+Ch7KYIqraekx02Sa97PqKwIMafVkH9JYOL3qhIhUJOP8ob
 uJJgSw/BUkVmo0ofw9PjfyIC0iI0g6cSqPiyFJ8pvpUg12uHY33I1s3SqyWgV7xfRY85Ly
 thovys62SAiWvdcjqW+MhhJcPAoFwKrYG1w45CES9pna6JTZDyu9kTWw/+tKpypE9ZkA19
 l0YHQgTSi4KwpN38gGuFD7RIg/fhbJp7hvJpE4CoReAApHo2l62nvRdkSFg7/wx3dNJYEE
 TM9w4D2+PLrUvSz5sYoiOx2Tz93tXSSpYRZrUuMzpg4ET/bYAtlN7R/p+cqQ7w==
Message-ID: <bd7f7978-51dd-40c0-8a8f-7e9a76ad339f@HIDDEN>
Date: Sun, 1 Sep 2024 20:14:36 +0200
MIME-Version: 1.0
To: bug-guix@HIDDEN
Content-Language: en-US
From: guix@HIDDEN
Subject: Setting 'zdiff3' in global gitconfig causes guix pull to fail
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Received-SPF: pass client-ip=2001:67c:2050:0:465::103;
 envelope-from=guix@HIDDEN; helo=mout-p-103.mailbox.org
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
 T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
X-Mailman-Approved-At: Sun, 01 Sep 2024 17:47:03 -0400
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

A minimal log:

hint: Consider installing the `glibc-locales' package and defining 
`GUIX_LOCPATH', along these lines: guix install glibc-locales export 
GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" See the "Application 
Setup" section in the manual, for more info. Updating channel 'guix' 
from Git repository at 'https://git.savannah.gnu.org/git/guix.git'... 
receiving objects 34% [################################# ] indexing 
objects 31% [############################### ] guix pull: error: Git 
error: unknown style 'zdiff3' given for 'merge.conflictstyle'





Acknowledgement sent to guix@HIDDEN:
New bug report received and forwarded. Copy sent to bug-guix@HIDDEN. Full text available.
Report forwarded to bug-guix@HIDDEN:
bug#72942; Package guix. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sun, 12 Jan 2025 05:45:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.