delta/git.git/builtin/diff.c, branch jk/robustify-parse-commit

cmd_diff(): make it obvious which cases are exclusive of each other

2013-05-28T16:25:01+00:00

At first glance the OBJ_COMMIT, OBJ_TREE, and OBJ_BLOB cases look like
they might be mutually exclusive.  But the OBJ_COMMIT case doesn't end
the loop iteration with "continue" like the other two cases, but
rather falls through.  So use if...else if...else construct to make it
more obvious that only the last two cases are mutually exclusive.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

cmd_diff(): rename local variable "list" -> "entry"

2013-05-28T16:25:00+00:00

It's not a list, it's an array entry.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

cmd_diff(): use an object_array for holding trees

2013-05-28T16:25:00+00:00

Change cmd_diff() to use a (struct object_array) for holding the trees
that it accumulates, rather than rolling its own equivalent.

Incidentally, this change removes a hard-coded limit of 100 trees in
combined diff, not that it matters in practice.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

builtin_diff_tree(): make it obvious that function wants two entries

2013-05-28T16:25:00+00:00

Instead of accepting an array and using exactly two elements from the
array, take two single (struct object_array_entry *) arguments.

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano

Merge branch 'kb/preload-index-more'

2012-11-20T18:32:10+00:00

Use preloadindex in more places, which has a nice speedup on systems
with slow stat calls (and even on Linux).

* kb/preload-index-more:
  update-index/diff-index: use core.preloadindex to improve performance

update-index/diff-index: use core.preloadindex to improve performance

2012-11-02T15:38:29+00:00

'update-index --refresh' and 'diff-index' (without --cached) don't honor
the core.preloadindex setting yet. Porcelain commands using these (such as
git [svn] rebase) suffer from this, especially on Windows.

Use read_cache_preload to improve performance.

Additionally, in builtin/diff.c, don't preload index status if we don't
access the working copy (--cached).

Results with msysgit on WebKit repo (2GB in 200k files):

                | update-index | diff-index | rebase
----------------+--------------+------------+---------
msysgit-v1.8.0  |       9.157s |    10.536s | 42.791s
+ preloadindex  |       9.157s |    10.536s | 28.725s
+ this patch    |       2.329s |     2.752s | 15.152s
+ fscache [1]   |       0.731s |     1.171s |  8.877s

[1] https://github.com/kblees/git/tree/kb/fscache-v3

Thanks-to: Albert Krawczyk 
Signed-off-by: Karsten Blees 
Signed-off-by: Jeff King

Move setup_diff_pager to libgit.a

2012-10-29T07:08:30+00:00

This is used by diff-no-index.c, part of libgit.a while it stays in
builtin/diff.c. Move it to diff.c so that we won't get undefined
reference if a program that uses libgit.a happens to pull it in.

While at it, move check_pager from git.c to pager.c. It makes more
sense there and pager.c is also part of libgit.a

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Jeff King

Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

2012-09-11T17:53:40+00:00

* tr/void-diff-setup-done:
  diff_setup_done(): return void

Merge branch 'jk/maint-null-in-trees' into maint-1.7.11

2012-09-10T22:24:54+00:00

"git diff" had a confusion between taking data from a path in the
working tree and taking data from an object that happens to have
name 0{40} recorded in a tree.

* jk/maint-null-in-trees:
  fsck: detect null sha1 in tree entries
  do not write null sha1s to on-disk index
  diff: do not use null sha1 as a sentinel value

Merge branch 'jk/maint-null-in-trees'

2012-08-27T18:54:28+00:00

We do not want a link to 0{40} object stored anywhere in our objects.

* jk/maint-null-in-trees:
  fsck: detect null sha1 in tree entries
  do not write null sha1s to on-disk index
  diff: do not use null sha1 as a sentinel value