From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6213 invoked by alias); 15 Jan 2015 23:20:04 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 6185 invoked by uid 89); 15 Jan 2015 23:20:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-ob0-f169.google.com Received: from mail-ob0-f169.google.com (HELO mail-ob0-f169.google.com) (209.85.214.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 15 Jan 2015 23:19:59 +0000 Received: by mail-ob0-f169.google.com with SMTP id vb8so16263133obc.0; Thu, 15 Jan 2015 15:19:57 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.60.137.161 with SMTP id qj1mr7520486oeb.13.1421363997135; Thu, 15 Jan 2015 15:19:57 -0800 (PST) Received: by 10.76.185.7 with HTTP; Thu, 15 Jan 2015 15:19:56 -0800 (PST) In-Reply-To: References: <20141223132714.GA11973@adacore.com> <20141223180802.GP12884@adacore.com> <20141224002022.GQ12884@adacore.com> Date: Thu, 15 Jan 2015 23:20:00 -0000 Message-ID: Subject: Re: Experimental branches From: "H.J. Lu" To: Cary Coutant Cc: Joel Brobecker , Binutils , gdb-patches Content-Type: text/plain; charset=UTF-8 X-IsSubscribed: yes X-SW-Source: 2015-01/txt/msg00440.txt.bz2 On Thu, Jan 15, 2015 at 3:04 PM, Cary Coutant wrote: >>> On my experimental branch, I did "git merge master", then tried to >>> push. I got this: >>> >>> remote: *** This update introduces too many new commits (136), which would >>> remote: *** trigger as many emails, exceeding the current limit (100). >>> remote: *** Contact your repository adminstrator if you really meant >>> remote: *** to generate this many commit emails. >>> remote: error: hook declined to update >>> refs/heads/users/ccoutant/two-level-line-tables >>> >>> Clearly, I don't want to generate all those commit emails. What do I do instead? >>> >> >> Can you do a rebase first? > > But I've already pushed several commits onto the upstream branch. > Everything I've read about git says don't rebase if you've already > pushed your branch upstream. > I use rebase to keep commit delta small on https://gcc.gnu.org/git/?p=gcc.git;a=shortlog;h=refs/heads/hjl/pie After my patch is checked in, rebase will just drop the same one on my branch. [hjl@gnu-18 gcc]$ git status On branch hjl/pie Your branch is up-to-date with 'origin/hjl/pie'. nothing to commit, working directory clean [hjl@gnu-18 gcc]$ git fetch Enter passphrase for key '/export/home/hjl/.ssh/id_dsa': remote: Counting objects: 1569, done. remote: Compressing objects: 100% (747/747), done. remote: Total 875 (delta 559), reused 307 (delta 117) Receiving objects: 100% (875/875), 407.12 KiB | 0 bytes/s, done. Resolving deltas: 100% (559/559), completed with 257 local objects. >From ssh://gcc.gnu.org/git/gcc b6782dd..368115c gcc-4_8-branch -> origin/gcc-4_8-branch 3147a27..2fc732e gcc-4_9-branch -> origin/gcc-4_9-branch d53441c..32cf702 master -> origin/master d53441c..32cf702 trunk -> origin/trunk [hjl@gnu-18 gcc]$ git rebase origin/master First, rewinding head to replay your work on top of it... Applying: Add --enable-default-pie Applying: Support ENABLE_DEFAULT_PIE in gcc driver Applying: Update GNU_USER_TARGET_STARTFILE_SPEC Applying: Compile GCC with -fno-PIE and link with -no-pie Applying: Don't use -fPIE when compiling crtbegin/end Applying: Add -no-pie to TOOLS_LIBS for Ada Applying: Document -no-pie Applying: Document --enable-default-pie Applying: Ignore additional messages on Linux/x86 with PIE Using index info to reconstruct a base tree... M gcc/testsuite/g++.dg/other/anon5.C Falling back to patching base and 3-way merge... No changes -- Patch already applied. [hjl@gnu-18 gcc]$ git push origin :hjl/pie Enter passphrase for key '/export/home/hjl/.ssh/id_dsa': To ssh://hjl@gcc.gnu.org/git/gcc.git - [deleted] hjl/pie [hjl@gnu-18 gcc]$ git push -u origin hjl/pie Enter passphrase for key '/export/home/hjl/.ssh/id_dsa': Counting objects: 46, done. Delta compression using up to 8 threads. Compressing objects: 100% (36/36), done. Writing objects: 100% (46/46), 6.02 KiB | 0 bytes/s, done. Total 46 (delta 38), reused 10 (delta 10) To ssh://hjl@gcc.gnu.org/git/gcc.git * [new branch] hjl/pie -> hjl/pie Branch hjl/pie set up to track remote branch hjl/pie from origin. [hjl@gnu-18 gcc]$ I use merge when I need each merge point on my branch: https://sourceware.org/git/?p=binutils-gdb.git;a=shortlog;h=refs/heads/users/hjl/linux/master -- H.J.