public inbox for linux-acpi@vger.kernel.org
 help / color / mirror / Atom feed
From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
To: Carlos Corbacho <carlos@strangeworlds.co.uk>
Cc: Len Brown <lenb@kernel.org>,
	linux-acpi@vger.kernel.org,
	Randy Dunlap <randy.dunlap@oracle.com>,
	Mattia Dongili <malattia@linux.it>
Subject: Re: [PATCH 0/5] Laptop driver documentation changes for 2.6.25
Date: Sat, 9 Feb 2008 21:53:26 -0200	[thread overview]
Message-ID: <20080209235326.GA6553@khazad-dum.debian.net> (raw)
In-Reply-To: <200802092204.32858.carlos@strangeworlds.co.uk>

On Sat, 09 Feb 2008, Carlos Corbacho wrote:
> On Saturday 09 February 2008 18:22:17 Henrique de Moraes Holschuh wrote:
> > BTW Carlos, sending a git diff would have resulted in much smaller diffs
> > (since git diff can do renames instead of add/delete) :)  I believe all of
> > us can deal just fine with git diffs, so it makes sense to use them in
> > these cases.
> 
> I don't quite know what you mean here - experimenting in a tree here, git-diff 
> doesn't produce any noticeable difference after using git-mv - unless this is 
> a bug with StackedGit being unable to handle renames/ moves properly?

Randy sent you a much better email than mine about it, but here it goes:

hmh@thorin:/tmp/f$ git init 
Initialized empty Git repository in .git/
hmh@thorin:/tmp/f$ cp /var/log/Xorg.0.log .
hmh@thorin:/tmp/f$ git add .
hmh@thorin:/tmp/f$ git commit -m "initial commit"
Created initial commit 4e5f9c4: initial commit
 1 files changed, 1260 insertions(+), 0 deletions(-)
 create mode 100644 Xorg.0.log
hmh@thorin:/tmp/f$ git mv Xorg.0.log Xorg.1.log
hmh@thorin:/tmp/f$ git commit -m "move commit"
 Created commit ed5f8d0: move commit
 2 files changed, 1260 insertions(+), 1260 deletions(-)
 delete mode 100644 Xorg.0.log
 create mode 100644 Xorg.1.log
hmh@thorin:/tmp/f$ git diff HEAD^.. -M       
diff --git a/Xorg.0.log b/Xorg.1.log
similarity index 100%
rename from Xorg.0.log
rename to Xorg.1.log

The key is that -M (or -C for that matter).  To be even more clear:
hmh@thorin:/tmp/f$ git diff HEAD^.. | wc
   2532   20098  134766
hmh@thorin:/tmp/f$ git diff HEAD^.. -M | wc
   4      13     103

So I really should have mentioned -M when I talked about git diffs :-(

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh

  reply	other threads:[~2008-02-09 23:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-09  1:31 [PATCH 0/5] Laptop driver documentation changes for 2.6.25 Carlos Corbacho
2008-02-09  1:32 ` [PATCH 1/5] Documentation - Create laptops sub-directory Carlos Corbacho
2008-02-09  1:32 ` [PATCH 3/5] sony-laptop - Move sony-laptop.txt to Documentation/laptops Carlos Corbacho
2008-02-09  1:32 ` [PATCH 4/5] sonypi - Move sonypi.txt " Carlos Corbacho
2008-02-09  1:32 ` [PATCH 5/5] acer-wmi - Add documentation Carlos Corbacho
2008-02-09  1:49 ` [PATCH 0/5] Laptop driver documentation changes for 2.6.25 Carlos Corbacho
2008-02-09  9:12   ` Len Brown
2008-02-09 18:22     ` Henrique de Moraes Holschuh
2008-02-09 22:04       ` Carlos Corbacho
2008-02-09 23:53         ` Henrique de Moraes Holschuh [this message]
2008-02-10  8:09     ` Mattia Dongili
2008-02-09  4:09 ` Randy Dunlap
2008-02-11 19:23 ` Randy Dunlap
2008-02-11 19:29   ` Carlos Corbacho
2008-03-03 22:27     ` Randy Dunlap
2008-03-04  8:21       ` Bart Samwel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080209235326.GA6553@khazad-dum.debian.net \
    --to=hmh@hmh.eng.br \
    --cc=carlos@strangeworlds.co.uk \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=malattia@linux.it \
    --cc=randy.dunlap@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox