projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix read-cache.c collission check logic.
[git.git]
/
show-diff.c
diff --git
a/show-diff.c
b/show-diff.c
index
bc3791a
..
1286dd1
100644
(file)
--- a/
show-diff.c
+++ b/
show-diff.c
@@
-5,7
+5,7
@@
*/
#include "cache.h"
*/
#include "cache.h"
-static void show_differences(char *name,
+static void show_differences(char *name,
void *old_contents, unsigned long long old_size)
{
static char cmd[1000];
void *old_contents, unsigned long long old_size)
{
static char cmd[1000];
@@
-31,9
+31,9
@@
static void show_diff_empty(struct cache_entry *ce)
int c = 0;
printf("--- %s\n", ce->name);
int c = 0;
printf("--- %s\n", ce->name);
- printf("+++
%s\n", ce->name
);
+ printf("+++
/dev/null\n"
);
p = old;
p = old;
- end = old + size;
+ end = old + size;
while (p < end)
if (*p++ == '\n')
lines ++;
while (p < end)
if (*p++ == '\n')
lines ++;
@@
-44,7
+44,7
@@
static void show_diff_empty(struct cache_entry *ce)
if (startline) {
putchar('-');
startline = 0;
if (startline) {
putchar('-');
startline = 0;
- }
+ }
putchar(c);
if (c == '\n')
startline = 1;
putchar(c);
if (c == '\n')
startline = 1;