Received: (at submit) by debbugs.gnu.org; 8 Aug 2018 14:43:42 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Aug 08 10:43:42 2018 Received: from localhost ([127.0.0.1]:45206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1fnPgc-0002r8-3a for submit <at> debbugs.gnu.org; Wed, 08 Aug 2018 10:43:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <chealer@HIDDEN>) id 1fnPgY-0002qs-Jq for submit <at> debbugs.gnu.org; Wed, 08 Aug 2018 10:43:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <chealer@HIDDEN>) id 1fnPgS-0007zO-Fi for submit <at> debbugs.gnu.org; Wed, 08 Aug 2018 10:43:33 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:50573) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <chealer@HIDDEN>) id 1fnPgS-0007z6-Bl for submit <at> debbugs.gnu.org; Wed, 08 Aug 2018 10:43:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <chealer@HIDDEN>) id 1fnPgQ-0003f3-WC for bug-diffutils@HIDDEN; Wed, 08 Aug 2018 10:43:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <chealer@HIDDEN>) id 1fnPgP-0007xg-TF for bug-diffutils@HIDDEN; Wed, 08 Aug 2018 10:43:31 -0400 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]:39322) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <chealer@HIDDEN>) id 1fnPgP-0007wz-LS for bug-diffutils@HIDDEN; Wed, 08 Aug 2018 10:43:29 -0400 Received: by mail-lj1-x241.google.com with SMTP id l15-v6so1921880lji.6 for <bug-diffutils@HIDDEN>; Wed, 08 Aug 2018 07:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=DoiGwFbKnyBEoe0NfFYJsiyH45xMsQAQlOG4gYyMnY4=; b=XmUjjZx6PyGTYQy3SngH5JOcOnFfpqG6Cor8ZXzLWxfO2jVxxOddRN2VeI3ZHiQISd Vhjnt9HIyj4nmt/78asgwZbXeG0utqvkqQRZ9WDh0Qp6RTxhpzrlEQg3kl3wfwsymcQ7 wA0lIv6WEsNo7+Eet4o3+7xTTw5Kyc3AvHJncb4Y4HWksyyIE00Aj4OTZuZeG9r+HYgn F0h4dxw2auhgHc34wdyLfsuTiUyCSbZyG28R5G04+QbTNZa+SimMy5LuwREwMqKDVSty 1f0Iz1Y0R2+QdZYgk/HhaNAx3GXihaQKIMqOO21XCkeaNZexgegJ2CymN2Y2f5TBIttC FkJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=DoiGwFbKnyBEoe0NfFYJsiyH45xMsQAQlOG4gYyMnY4=; b=Att+M1SIQbDlNqcbgKbEijrFOGdfz/7xo4LPBlFucy2/9yxse4ovYuvJPcBmAb5oks gopOge728ceCr53frUvG67+iqMNq55yO1qVxn5ubVbdjhZu5gfaxBP2tbVC7yCLXirmf TY0g0PJtx5BGPeE2Q6fhbCDUPzmuZKsj8DMbzG5qOaEfxZXVVcKyhyUTnW5mZYY2/LQN L6N31RLg4jTkCnsk+L0GDfupgs7pLEuSrrlO4dR68LIyqNzW//yordksJf9tBFfbRuNI 2fvj9Di0qVveGPzb2NPFCKh2Iie2bzYDXmGymvK+YeOtQ3Z+szOAsKhABtDFyC0/L5Gd aLnQ== X-Gm-Message-State: AOUpUlFO4ZoAYj9PSONiefHztG+axmHIiNKxnlQJaaZnGdLE90zqpib3 IZXS/gMlt34yfyLLLNZZIUaoTk0s+co17fkrX2kqiu36 X-Google-Smtp-Source: AA+uWPwj04kQ4sDJrttQqQ+Ulr57T37jk8b1csMK8TBKxZ0jW/LALhWsVtceN4eRBE5gBlX4ozraOsQdOID0V7Tr9Ts= X-Received: by 2002:a2e:5519:: with SMTP id j25-v6mr2425566ljb.124.1533739408293; Wed, 08 Aug 2018 07:43:28 -0700 (PDT) MIME-Version: 1.0 From: Philippe Cloutier <chealer@HIDDEN> Date: Wed, 8 Aug 2018 10:43:17 -0400 Message-ID: <CANA_mJKGmNAiwXaFOfV1H1Q-vtea_sswZFcsOoyMpgW6aw70EA@HIDDEN> Subject: Context and unified hunk formats not fully documented - no mention of --show-c-function / --show-function-line effect on headers To: bug-diffutils@HIDDEN Content-Type: text/plain; charset="UTF-8" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit 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: -5.0 (-----) Severity: normal The info documentation describes headers of these formats: Context: https://www.gnu.org/software/diffutils/manual/html_node/Context-Format.html Unified: https://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html It assumes that none of the following options was activated: --show-c-function: https://www.gnu.org/software/diffutils/manual/html_node/C-Function-Headings.html --show-function-line: https://www.gnu.org/software/diffutils/manual/html_node/Specified-Headings.html When they are activated, the format of the header of some hunks is not documented. For example, a unified format hunk header can be "@@ -5,8 +5,10 @@ defmodule Quicksort do", as shown in the second diff on https://kennyballou.com/blog/2015/10/art-manually-edit-hunks/ This is confusing, and may cause users to think a patch generated by diff is broken.
Philippe Cloutier <chealer@HIDDEN>
:bug-diffutils@HIDDEN
.
Full text available.bug-diffutils@HIDDEN
:bug#32400
; Package diffutils
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.