development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
66677 commits 6 branches 951 tags 442 MiB
Commit graph

707 commits

Author SHA1 Message Date
Johannes Schindelin 7b3f5daabc merge-recur: Fix compiler warning with -pedantic 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-07-27 19:39:15 -07:00
Johannes Schindelin 5d3afe05d9 merge-recur: Remove dead code 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-07-27 19:39:15 -07:00
Johannes Schindelin bd669986f7 merge-recur: Get rid of debug code 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-07-27 19:39:15 -07:00
Johannes Schindelin 5a75361340 merge-recur: Convert variable names to lower_case 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-07-27 19:39:15 -07:00
Johannes Schindelin 3af244caa8 Cumulative update of merge-recursive in C 
This contains mainly three sorts of fixes:

- get rid of small wrapper functions
- reuse the diff_filespec structure when sha1, mode & path are needed
- Junio's pedantic updates

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-07-27 19:39:15 -07:00
Junio C Hamano bf6d324e73 Merge branch 'lt/unitype' into js/c-merge-recursive 
* lt/unitype:
  builtin-prune.c: forgot TYPE => OBJ changes.
  Remove TYPE_* constant macros and use object_type enums consistently.
 2006-07-13 23:38:40 -07:00
Johannes Schindelin 6d297f8137 Status update on merge-recursive in C 
This is just an update for people being interested. Alex and me were
busy with that project for a few days now. While it has progressed nicely,
there are quite a couple TODOs in merge-recursive.c, just search for "TODO".

For impatient people: yes, it passes all the tests, and yes, according
to the evil test Alex did, it is faster than the Python script.

But no, it is not yet finished. Biggest points are:

- there are still three external calls
- in the end, it should not be necessary to write the index more than once
  (just before exiting)
- a lot of things can be refactored to make the code easier and shorter

BTW we cannot just plug in git-merge-tree yet, because git-merge-tree
does not handle renames at all.

This patch is meant for testing, and as such,

- it compile the program to git-merge-recur
- it adjusts the scripts and tests to use git-merge-recur instead of
  git-merge-recursive
- it provides "TEST", a script to execute the tests regarding -recursive
- it inlines the changes to read-cache.c (read_cache_from(), discard_cache()
  and refresh_cache_entry())

Brought to you by Alex Riesen and Dscho

Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-07-13 23:10:19 -07:00