From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 904181F487 for ; Fri, 3 Apr 2020 19:53:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727950AbgDCTxK (ORCPT ); Fri, 3 Apr 2020 15:53:10 -0400 Received: from mail-ot1-f66.google.com ([209.85.210.66]:33216 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727627AbgDCTxK (ORCPT ); Fri, 3 Apr 2020 15:53:10 -0400 Received: by mail-ot1-f66.google.com with SMTP id 22so8639934otf.0 for ; Fri, 03 Apr 2020 12:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YTrXgF2NxpT7lFgnSPTQXv9s/FutMCTv9r92CfY9oms=; b=iD6HqiUUuyi6FjQpsM+9BzlsICv9lVS7F7nT8ETUBSQTUMwkdMFYfrD5MrnDmLumuL jgQnsuT3D8HyXAORdafqfCp9Bxu4JlMCencf2dUn27wuyiUf9OvofMXiMy6AUo8qskJR GjyDUak21a66NPppId/ey6tq5WJ8CFFda7zgdbSesGLvd7KLZPqI7zeachoL2U57YcMK YDdiVRTtlDYfdZocXJWcldWNJMqYRL6wDh/jdCy5oLAAR5YxLhlKHYUXhUXPxIJhAsib 2QjtTUCVBniuG6Q/DAKgSdBR/kP3phu1ejPuTYvdjmK7p2NiKAb9q1wOnfQOiWTkgasD C4Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YTrXgF2NxpT7lFgnSPTQXv9s/FutMCTv9r92CfY9oms=; b=JUUBC2/iD5pa6XrcI76GoPy/pvL6pqOnXMKmqBKd+mUPYH9asl4uI8TZ+hgTw79g0s fMA2mM5rSUyDwcIR2PySsCRH5rDtP+L1hE2zMEbsUJloaYd0eNPfvEtSdKlLdjWHeD18 0IGmjB7Vz8DFOq98jFsLkQEt45ELpPhRCxF1v+Zj9cZg5wuQtpPLCHAfwunwezqhlHln 82JQUlsA72EDzGr4WX09t9V/50XAfpqIglVBovq+r3OU/u3gEbz1MiGm1gpuGRQwdrM8 YA7KDezgKlU1Xq1vRXR6rnqCR9jRgWYZCnNvVq0iVstZob2D4QOCIOY4OkWC7wi8W7JY lmhA== X-Gm-Message-State: AGi0PuZFaeav/cLiWaR7DdkmQERlibFSFKzQzDnQ2pvnbg8p047wMGoH XGLSfnwyYT0ad2VzQrtwralYXolTSuwh91P4MGo= X-Google-Smtp-Source: APiQypIi7cAPdCIyYsnvCgDZLYUEmS5MrVi2IpXu5e949IA+2tisT/i2AZGd+P1w4VseohscTXske0GoErqYcNFihS8= X-Received: by 2002:a4a:a88a:: with SMTP id q10mr8176490oom.17.1585943589685; Fri, 03 Apr 2020 12:53:09 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Elijah Newren Date: Fri, 3 Apr 2020 12:52:58 -0700 Message-ID: Subject: Re: [PATCH] git-rebase.txt: add another hook to the hooks section, and explain more To: Junio C Hamano Cc: Elijah Newren via GitGitGadget , Git Mailing List , Jonathan Nieder , Emily Shaffer , Phillip Wood , Johannes Schindelin Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Fri, Apr 3, 2020 at 12:35 PM Junio C Hamano wrote: > > "Elijah Newren via GitGitGadget" writes: > > > The apply backend has not traditionally called the post-commit hook, > > +while the merge backend has. In contrast, the apply backend has > > +traditionally called the post-checkout hook while the merge backend > > +has not. However, the calling of these hooks in both cases was by > > +accident of implementation rather than by design (both backends were > > +originally implemented as shell scripts and happened to invoke other > > +commands like 'git checkout' or 'git commit' that would call the > > +hooks). Both backends should have the same behavior, though it is not > > +entirely clear which, if any, is correct. We will likely remove both > > +of these hooks in the future. > > I'd phrase, instead of "remove", "stop calling from 'git rebase'". > These hooks will still be called from their intended context ;-) Makes sense; I'll update it.