From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3881 invoked by alias); 23 Nov 2014 19:01:13 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 33779 Received: (qmail 17621 invoked from network); 23 Nov 2014 19:01:10 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=fGHbKwOn1/3l8JX644TAbb5R0trgYaY3DH+pePrORoM=; b=vF5LSWQkDh2mO9Q5NMjxExGNoWLhXFCRWWfa8BCHlZO4/x486MR5Pd3F+PW9QybfHg tmDwd+3wgiUg3HHmuFD8Yhjxq8WzSGaMJFjHYSQvqJxISjnrdZbBg23pj6C+STIJP/id uUTK+IXp9pQyDxqJzBYovbOv8IYhHuup027OrzSm3oIgUX/L7QVJFxhrZjEn2CSWKFrf gJY/jP2vh3tKxXa0PMAz1AikM5Spb8a2tv+rZfG6RXJs7QEZ8ZF8gVPsXwhgIpF3sQ9C yBeLMM/oL7WW1SiiR+PrCDSGjPr52/NlS1zlsDGyf1MI4Nl/Q06qMa0jw8dqL/Xd1/w1 HLqg== MIME-Version: 1.0 X-Received: by 10.107.165.19 with SMTP id o19mr14655208ioe.1.1416769268380; Sun, 23 Nov 2014 11:01:08 -0800 (PST) In-Reply-To: <54722A8C.10007@eastlink.ca> References: <930.1416260160@thecus.kiddle.eu> <42F4E5F2-97E7-4803-87CB-B1C67CD943B2@kba.biglobe.ne.jp> <15511.1416528068@thecus.kiddle.eu> <546E9224.7090709@eastlink.ca> <546EA58F.7010101@eastlink.ca> <141120222353.ZM10495@torch.brasslantern.com> <546F7646.7080108@eastlink.ca> <141121204545.ZM11623@torch.brasslantern.com> <141121214351.ZM12585@torch.brasslantern.com> <5470BE8D.5030009@eastlink.ca> <089E69C3-7394-4EB6-A321-D542D881C60E@macports.org> <547209BD.4070605@eastlink.ca> <54722A8C.10007@eastlink.ca> Date: Sun, 23 Nov 2014 20:01:08 +0100 Message-ID: Subject: Re: trouble with debugging binary From: Mikael Magnusson To: Ray Andrews Cc: zsh workers Content-Type: text/plain; charset=UTF-8 On Sun, Nov 23, 2014 at 7:42 PM, Ray Andrews wrote: > On 11/23/2014 10:12 AM, Mikael Magnusson wrote: >> >> >> If you think "git pull" downloads patches and applies them locally, >> you are completely mistaken :). > > > I'm thinking that git does everything with 'patches', although > they might not be called that. Nevermind tho, I'm reading the > doc, and will understand it all in time. Anyway, what I meant > was that if I patch something here by hand, and then 'pull' , > *and* that same patch has been applied upstream, > will git recognize the local patch as kosher, or will it complain that > the file has been locally changed. > > Trying it, I see that git does *not* see the patch as kosher and > demands that I 'stash' it. git is very fussy, just as it should be. Ah, that makes sense :). Yes, if you have anything *uncommitted*, git will never touch it unless you specify an option that sounds like --force or --hard or so. Note though that pull will create merge commits for you if you have committed stuff locally, which will make you end up with a fork of zsh. What you may want to do if you have a few local patches is to use git pull --rebase and it'll move your commits on top of upstream each time (by generating patches, updating the tree, and then applying them again). I would recommend doing this rather than carrying uncommitted changes around in a stash forever. You can set the pull.rebase git option in your zsh repo to true to make it the default too. What I usually do is just 'git fetch', inspect the history with 'git log ..@{u}' (or paste the range output from fetch), and if there's anything I care about, I manually run 'git rebase'. >> I'm actually a bit confused about what you consider the 'normal' diff >> format, almost nobody uses anything other than the unified format. > > ... just 'diff' with no switches. Now that I try 'diff -u' I see what you > mean--that's what I normally see, I just didn't know how to produce > that format, now I do. It sure is easier to read. It's also a bit safer in that the extra context lets 'patch' detect in more cases whether the patch has already been applied, and prevents you from applying it twice (eg, if it only contains additions, the <> format will happily add them in at the specified line number forever). -- Mikael Magnusson