From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: git full diff output issues..
Date: Thu, 26 May 2005 12:19:21 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.58.0505261214140.2307@ppc970.osdl.org> (raw)
While testing my "git-apply" thing (coming along quite nicely, thanks for
asking), I've hit a case that is nasty to parse.
This is from the 2.6.12-rc4 -> 2.6.12-rc5 patch:
diff --git a/arch/um/kernel/checksum.c b/arch/um/kernel/checksum.c
deleted file mode 100644
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
new file mode 100644
--- /dev/null
+++ b/arch/um/kernel/initrd.c
@@ -0,0 +1,78 @@
and the magic here is that deleted file that was empty to begin with, so
it didn't have a patch, just a note on deletion.
Why is that nasty? Because we don't have the file _name_ in any good
format. The filename only exists int he "diff --git" header, and that one
has the space-parsing issue, which makes it less than optimal.
I'd suggest we enhance the "full diff" output for new and deleted files to
match the rename output, ie we'd give the actual filename on that line
too, to avoid any ambiguities.
So we'd change it from
deleted file mode 100644
to
deleted file mode 100644 arch/um/kernel/checksum.c
in this case..
Comments?
Linus
next reply other threads:[~2005-05-26 19:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-26 19:19 Linus Torvalds [this message]
2005-05-26 19:25 ` git full diff output issues Linus Torvalds
2005-05-26 19:36 ` Junio C Hamano
2005-05-26 19:46 ` Junio C Hamano
2005-05-26 19:53 ` Anton Altaparmakov
2005-05-26 20:33 ` Linus Torvalds
2005-05-26 20:56 ` Junio C Hamano
2005-05-26 21:09 ` Linus Torvalds
2005-05-26 21:33 ` Junio C Hamano
2005-06-05 8:46 ` Junio C Hamano
2005-06-05 15:11 ` Linus Torvalds
2005-05-26 23:34 ` Chris Wedgwood
2005-05-26 23:49 ` Linus Torvalds
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=Pine.LNX.4.58.0505261214140.2307@ppc970.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.