Commits

Author Commit Message Labels Comments Date
Junio C Hamano
GIT 0.99.8b Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v0.99.8b
Junio C Hamano
Merge branch 'fixes'
Junio C Hamano
clone-pack: use create_symref() instead of raw symlink. This was the last instance of symlink() in coreish part. Signed-off-by: Junio C Hamano <junkio@cox.net>
Christian Meder
Some typos and light editing of various manpages Typos, light editing and clarifications. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
upload-pack: Do not choke on too many heads request. Cloning from a repository with more than 256 refs (heads and tags included) will choke, because upload-pack has a built-in limit of feeding not more than MAX_NEEDS (currently 256) heads to underlying git-rev-list. This is a problem when cloning a repository with many tags, like http://www.linux-mips.org/pub/scm/linux.git, which has 290+ tags. This commit introduces a new flag, --all, to git-rev-…
Santi_Béjar
[PATCH] Quote the missing GIT_DIR. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jonas Fonseca
[PATCH] Fix symbolic ref validation Use the correct buffer when validating 'ref: refs/...' Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen
[PATCH] hold_index_file_for_update should not unlink failed to open .lock files atexit Set up atexit only if the .lock-file was opened successfully. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix diff-filter All-Or-None mark. When we updated the marker for new files from 'N' to 'A', we forgot to notice that the letter is already taken by the All-Or-None mark. Change the All-Or-None marker to '*' to resolve this conflict. git-diff-tree -r --diff-filter='R*' -M shows all the changes (not just renames) that are contained in commits that have renames, in comparison with: git-diff-tree -r --diff-filter='R' -M shows th…
Junio C Hamano
Add missing documentation. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Remove useless use of sed in git-format-patch. There was a leftover use of sed that attempted to remove the commit ID output from git-diff-tree, which turned into an expensive no-op when git-diff-tree output header format changed about three months ago. Drop it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Leave an empty line between log and sign-off. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Remove unused external-diff script. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'fixes'
Daniel Barkalow
[PATCH] Limit the number of requests outstanding in ssh-fetch. This completes fetches if there are more than 100 outstanding requests and there are more to prefetch. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Avoid compiler warning. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Make sure get_sha1 does not accept ambiguous sha1 prefix (again). The earlier fix incorrectly dropped the code the original had to ensure the found SHA1 is at least unique within the same pack. Restore the check. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
GIT 0.99.8a Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v0.99.8a
Junio C Hamano
git-pull: do not barf on -a flag meant for git-fetch. Signed-off-by: Junio C Hamano <junkio@cox.net>
Jonas Fonseca
[PATCH] Random documentation fixes The fixes focuses on improving the HTML output. Most noteworthy: - Fix the Makefile to also make various *.html files depend on included files. - Consistently use 'NOTE: ...' instead of '[ ... ]' for additional info. - Fix ending '::' for description lists in OPTION section etc. - Fix paragraphs in description lists ending up as preformated text. - Always use listingblocks (preform…
Junio C Hamano
Error message from get_sha1() on ambiguous short SHA1. Unlike cases where "no such object exists", the case where specified prefix is ambiguous would confuse the user if we say "no such commit" or such. Give an extra error message from the uniqueness check if there are more than one objects that match the given prefix. Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen
[PATCH] Enable and fix support for base less merges. Let the merge strategies handle the base less case if they are able to do it. It also fixes git-resolve.sh to die if no common ancestors exists, instead of doing the wrong thing. Furthermore, it contains a small independent fix for git-merge.sh and a fix for a base less code path in gitMergeCommon.py. With this it's possible to use git merge -s recursive 'merge message' A B to do a base less …
Junio C Hamano
Make sure get_sha1 does not accept ambiguous sha1 prefix. The original code did not even check alternates, and was confused if an unpacked object was uniquely found when there was another object that shares the same prefix in the pack. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix minor DOS in rev-list. A carefully crafted pathname can be used to disrupt downstream git-pack-objects that uses 'git-rev-list --objects' output. Prevent this. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
GIT 0.99.8 GIT already did everything I wanted it to do since mid 0.99.7, and it has almost everything I want it to have now, except a couple of minor tweaks and enhancements. Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v0.99.8
Eric W. Biederman
[PATCH] Update git-clone documentation The documentation for git-clone is behind the actual command. I have been getting tired of reading the shell script to see what the arguments are so here is an update of the actual documentation. Signed-off-by: Eric Biederman <ebiederman@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Handle really trivial case inside git-merge. Using Linus' --trivial option, this handles really trivial case inside git-merge itself, without using any strategy modules. A 'really trivial case' is: - we are merging one branch into the current branch; - there is only one merge base between the branches; - there is no file-level merge required. Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds
read-tree: --trivial This adds an option --trivial to restrict 3-way 'read-tree -m -u' to happen only if there is no file-level merging required. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen
[PATCH] Teach git-ls-files about '--' to denote end of options. Useful if you have a file whose name starts with a dash. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen
[PATCH] Teach the recursive merge strategy about renames. It will now merge cases where a file was renamed in one branch and modified in the other branch cleanly. We also detect a couple of conflict cases now that wasn't detected before. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next