Git development
 help / color / mirror / Atom feed
* Bug in diff header generation
@ 2007-03-02 12:53 Matthias Kestenholz
  2007-03-02 22:05 ` Johannes Schindelin
  0 siblings, 1 reply; 2+ messages in thread
From: Matthias Kestenholz @ 2007-03-02 12:53 UTC (permalink / raw)
  To: git

Hello,

I've encountered a small error in the diff header generation when
diffing against files which are not tracked by git:


[13:49] mk@crap ~/Projects/git > git diff git.c ~/bin/viname|head
diff --git a/git.c b/home/mk/bin/viname
old mode 100644
new mode 100755
index 008e016..b64857e
--- a/git.c
+++ b/home/mk/bin/viname
@@ -1,416 +1,106 @@
-#include "builtin.h"
-#include "exec_cmd.h"
-#include "cache.h"
[13:49] mk@crap ~/Projects/git > git diff HEAD:git.c ~/bin/viname|head
diff --git a/home/mk/bin/viname b/home/mk/bin/viname
index 008e016..b64857e 100755
--- a/home/mk/bin/viname
+++ b/home/mk/bin/viname
@@ -1,416 +1,106 @@
-#include "builtin.h"
-#include "exec_cmd.h"
-#include "cache.h"
-#include "quote.h"
-


When a revision is specified, git-diff prints a/home/mk/bin/viname
instead of a/git.c

Because of my final exams I've got no time to look into it right now.


Matthias

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: Bug in diff header generation
  2007-03-02 12:53 Bug in diff header generation Matthias Kestenholz
@ 2007-03-02 22:05 ` Johannes Schindelin
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2007-03-02 22:05 UTC (permalink / raw)
  To: Matthias Kestenholz; +Cc: git

Hi,

On Fri, 2 Mar 2007, Matthias Kestenholz wrote:

> [13:49] mk@crap ~/Projects/git > git diff HEAD:git.c ~/bin/viname|head
> diff --git a/home/mk/bin/viname b/home/mk/bin/viname

This is intended behaviour. You don't want a Git object name as a file 
specifier, because you cannot edit a Git object.

Hth,
Dscho

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-03-02 22:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-02 12:53 Bug in diff header generation Matthias Kestenholz
2007-03-02 22:05 ` Johannes Schindelin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox