git/diff.c, branch v1.6.3.1

Fix a bunch of pointer declarations (codestyle)

2009-05-01T22:17:31Z

Essentially; s/type* /type */ as per the coding guidelines. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano

Allow users to un-configure rename detection

2009-04-12T05:22:00Z

I told people on the kernel mailing list to please use "-M" when sending me rename patches, so that I can see what they do while reading email rather than having to apply the patch and then look at the end result. I also told them that if they want to make it the default, they can just add [diff] renames to their ~/.gitconfig file. And while I was thinking about that, I wanted to also check whether you can then mark individual projects to _not_ have that default in the per-repository .git/config file. And you can't. Currently you cannot have a global "enable renames by default" and then a local ".. but not for _this_ project". Why? Because if somebody writes [diff] renames = no we simply ignore it, rather than resetting "diff_detect_rename_default" back to zero. Fixed thusly. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'

2009-03-28T07:42:31Z

* jc/maint-1.6.0-diff-borrow-carefully: diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged

Merge branch 'js/maint-diff-temp-smudge'

2009-03-26T07:27:30Z

* js/maint-diff-temp-smudge: Smudge the files fed to external diff and textconv

diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged

2009-03-22T22:26:07Z

When the index says that the file in the work tree that corresponds to the blob object that is used for comparison is known to be unchanged, "diff" reads from the file and applies convert_to_git(), instead of inflating the object, to feed the internal diff engine with, because an earlier benchnark found that it tends to be faster to use this optimization. However, the index can lie when the path is marked as assume-unchanged. Disable the optimization for such paths. Signed-off-by: Junio C Hamano

Smudge the files fed to external diff and textconv

2009-03-22T22:03:59Z

When preparing temporary files for an external diff or textconv, it is easier on the external tools, especially when they are implemented using platform tools, if they are fed the input after convert_to_working_tree(). This fixes msysGit issue 177. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-1.6.0-keep-pack'

2009-03-11T20:49:56Z

* jc/maint-1.6.0-keep-pack: is_kept_pack(): final clean-up Simplify is_kept_pack() Consolidate ignore_packed logic more has_sha1_kept_pack(): take "struct rev_info" has_sha1_pack(): refactor "pretend these packs do not exist" interface git-repack: resist stray environment variable

Remove unused function scope local variables

2009-03-08T04:52:17Z

These variables were unused and can be removed safely: builtin-clone.c::cmd_clone(): use_local_hardlinks, use_separate_remote builtin-fetch-pack.c::find_common(): len builtin-remote.c::mv(): symref diff.c::show_stats():show_stats(): total diffcore-break.c::should_break(): base_size fast-import.c::validate_raw_date(): date, sign fsck.c::fsck_tree(): o_sha1, sha1 xdiff-interface.c::parse_num(): read_some Signed-off-by: Benjamin Kramer Signed-off-by: Junio C Hamano

Merge branch 'al/ansi-color'

2009-03-05T23:41:19Z

* al/ansi-color: builtin-branch.c: Rename branch category color names Clean up use of ANSI color sequences

Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking

2009-03-04T08:56:51Z

Signed-off-by: Keith Cascio Signed-off-by: Junio C Hamano