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=-2.7 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, 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 8B3D81F461 for ; Mon, 15 Jul 2019 18:31:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729590AbfGOSa7 (ORCPT ); Mon, 15 Jul 2019 14:30:59 -0400 Received: from mail-io1-f45.google.com ([209.85.166.45]:37185 "EHLO mail-io1-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729277AbfGOSa7 (ORCPT ); Mon, 15 Jul 2019 14:30:59 -0400 Received: by mail-io1-f45.google.com with SMTP id q22so35699687iog.4 for ; Mon, 15 Jul 2019 11:30:58 -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=PjI+to5rbstRUGaBjDSGHL5J6TYsqIWVK2SCaMAWlZI=; b=FTqLqj8jmgEcc+m8BHx0merOn5G/bxZUhkvb0LYx3hZzyJonGgjadxujkVHnfNuzlq kUGNSG9i1okuvrPEJfYjsjfmr0B6PbU2SKVWFPARZUX/V4KiICdLpaaSkq1BS3Op2Lqj CQ8bv4L+TybjM++ii/WrYc6/xsA26oXcPEXKMFB2L2kYb2nfefOYphc25Le4023CRH4j UCW/x4DSIoktCJKyISyGd5uEBetkhGxUjQJhmCTX9anKynTFn7rgFShgPVNnajR9g09H tYvcMZE2pIjQD+S6WBqxNRs+qJUl6LTD1N1KvRif7Y+1oyfm0JVzdsXyqSLyqt90J6gs npJQ== 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=PjI+to5rbstRUGaBjDSGHL5J6TYsqIWVK2SCaMAWlZI=; b=lO6selRAXZOIdyTctUO7ClJxdByR7AYhLhsDqjHIGNhrTYCOiWDQ+AJRz1VFgSdmWU RxhQxT31Z7OYndr/S1TVJU1kENt0ZKq4WniW5atrYaM4JaS21tPMyuWPVZstXOSUhRwW 2HayNbr1MR17RTpmymPtcM0LEOmUn6IKIjz2w4xmO2Nx1jjcn0QKhujUDQ7NeXeIOTiU UWfT+yutvt75NuLK1hb1OAR/zX94TEoqxrYYLf0XLmcLf1jHu7vmOa+CrE7WsMDpqLyd oP/ujQN6idjdO2E7mxBicF5wnwMEyq1wzrqxCCLc17cXjxVrneq/Ks4sY5U7pUj1yqlB 4AlA== X-Gm-Message-State: APjAAAWF/qgnrHTCGo4kVge5zE2VombWYVj4VWvWXLd+ecG6d/HSPauQ 6+Ix22ucsW58f+fMBBOsZBDRGLYNcXf8AOTzYdggTHN4 X-Google-Smtp-Source: APXvYqwNMGTMtKC49KgkEdy6V+GfuOoUgAU5QGxwjlElhhDKu9DN3ERMmr40btQOXWrx4I95RY36qNnKTf7LjUR4EIo= X-Received: by 2002:a5d:9d58:: with SMTP id k24mr25862582iok.116.1563215458091; Mon, 15 Jul 2019 11:30:58 -0700 (PDT) MIME-Version: 1.0 From: Danny Lin Date: Tue, 16 Jul 2019 02:30:44 +0800 Message-ID: Subject: [BUG] Branches before "git subtree add --squash" are pushed via "git subtree push" To: git develop Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Say we have a repository with "master" and "sub" branches like below: A---B---C---D---E---F master / X---Y X---Y sub where commits A and B include changes in subdirectory "sub", commit C removes subdirectory "sub", commit D is generated by "git subtree add -P sub Y", and commits E and F also include changes in subdirectory "sub". We'd get this if we run "git subtree push -P sub . sub" on master at F: X---Y---E'--F' sub (after push) On the other hand, if we have simliar trees except that commit D is generated by "git subtree add --squash -P sub Y": A---B---C---D---E---F master / Y' X---Y sub We'd expect to get this when we run "git subtree push -P sub . sub" on master at F: X---Y---E'--F' sub (after push, expected) But actually we get this (in Git 2.22.0): A---B---C---D'--E'--F' sub (after push, actual) / X---Y This seems to be a side effect of 2.7.0 -> 2.7.1 in which a change is made to include merged branches in "git subtree push", but mistakenly causes branches before "git subtree add --squash" be included.