summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-08-15Fix detection of ipv6 on SolarisLibravatar Dennis Stosberg1-0/+1
The configuration script detects whether linking with -lsocket is necessary but doesn't add -lsocket to LIBS. This lets the ipv6 test fail. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-15Look for sockaddr_storage in sys/socket.hLibravatar Dennis Stosberg1-2/+4
On Solaris and the BSDs the definition of "struct sockaddr_storage" is not available from "netinet/in.h". On Solaris "sys/socket.h" is enough, at least OpenBSD needs "sys/types.h", too. Using "sys/types.h" and "sys/socket.h" seems to be a more portable way. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-15Solaris has strlcpy() at least since version 8Libravatar Dennis Stosberg1-1/+0
See http://docs.sun.com/app/docs/doc/816-3321/6m9k23sjk?a=view Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14git-apply --reverse: simplify reverse option.Libravatar Junio C Hamano1-16/+12
Having is_reverse in each patch did not make sense. This will hopefully simplify the work needed to introduce reversible binary diff format. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14t4116 apply --reverse testLibravatar Junio C Hamano1-0/+46
The binary patch test needs to be made more careful not to have the postimage blob in the repository in which the patch is applied Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14Make sha1flush void and remove conditional return.Libravatar David Rientjes1-2/+2
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14Make upload_pack void and remove conditional return.Libravatar David Rientjes1-6/+5
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14Make track_tree_refs void.Libravatar David Rientjes1-2/+1
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14Make pack_objects void.Libravatar David Rientjes1-2/+1
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14Make fsck_dir void.Libravatar David Rientjes1-3/+2
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14Make checkout_all void.Libravatar David Rientjes1-2/+1
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14Make show_entry voidLibravatar David Rientjes1-6/+6
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14Make pprint_tag void and cleans up call in cmd_cat_file.Libravatar David Rientjes1-4/+5
Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14Remove combine-diff.c::uninteresting()Libravatar Junio C Hamano1-9/+2
A patch from David Rientjes made me realize we do not have to have this function -- just call diff_unmodified_pair() directly. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14read-cache.c cleanupLibravatar David Rientjes1-7/+3
Removes conditional returns. Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14http-push.c cleanupLibravatar David Rientjes1-4/+1
Removes conditional return. Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14diff.c cleanupLibravatar David Rientjes1-3/+1
Removes conditional return. Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14builtin-push.c cleanupLibravatar David Rientjes1-4/+2
Removes conditional return in builtin-push.c Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14builtin-grep.c cleanupLibravatar David Rientjes1-3/+1
Removes conditional return. Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14blame.c return cleanupLibravatar David Rientjes1-4/+1
Removes conditional from return Signed-off-by: David Rientjes <rientjes@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: configurable home link stringLibravatar Yasushi SHOJI2-1/+6
I've always found difficult to figure out git URL for clone from gitweb URL because git:// and http:// are different on many site including kernel.org. I've found this enhancement at http://dev.laptop.org/git when I was on git channel, and thought that it'd be nice if all public gitweb site show it's git URL on its page. This patch allow us to change the home link string. The current default is "projects" as we all see on gitweb now. ie. kernel.org might set this variable to "git://git.kernel.org/pub/scm/" Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: Separate printing difftree in git_commit into git_difftree_bodyLibravatar Jakub Narebski2-95/+146
Separate printing difftree in git_commit into separate git_difftree_body subroutine. Add support for "C" (copied) status. For "M" and "C" add parameter 'fp' (filename parent) to the "diff" link; currently not supported by git_blobdiff ("blobdiff" action). Reindented, realigned, added comments. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: True fix: Support for the standard mime.types map in gitwebLibravatar Jakub Narebski1-1/+4
True fix for error in mimetype_guess, error introduced in original commit 2d00737489b8c61ed616b261c7c9bd314e2b0b41 and later fixed temporarily by commenting out the line that caused error in commit 57bd4d3523efecf60197040cad34154aff4ddf80. Gitweb now supports mime.types map $mimetypes_file relative to project. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: Skip comments in mime.types like fileLibravatar Jakub Narebski1-0/+1
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: Change appereance of marker of refs pointing to given objectLibravatar Jakub Narebski2-9/+47
Change git_get_references to include type of ref in the %refs value, which means putting everything after 'refs/' as a ref name, not only last part of the name. Instead of separating refs pointing to the same object by " / " separator, use anonymous array reference to store all refs pointing to given object. Use 'git-ls-remote .' if $projectroot/$project/info/refs does not exist. (Perhaps it should be used always.) Refs are now in separate span elements. Class is dependent on the ref type: currently known classes are 'tag', 'head', 'remote', and 'ref' (last one for HEAD and other refs in the main directory). There is encompassing span element of class refs, just in case of unknown ref type. This might be considered cleaner separating of git_get_references into filling %refs hash only, and not taking part in formatting ref marker. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: Separate finding project owner into git_get_project_ownerLibravatar Jakub Narebski1-18/+32
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: Separate main part of git_history into git_history_bodyLibravatar Jakub Narebski1-36/+60
Separates main part of git_history into git_history_body subroutine, and makes output more similar to git_shortlog. Adds "diff to current" link only for history of regular file (blob). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_bodyLibravatar Jakub Narebski2-16/+23
Separate printing of perhaps shortened title (subject) in git_shortlog_body and git_tags_body into format_subject_html. While at it, remove presentation element <b>...</b> used to format title (subject) and move formatting to CSS. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: Separate ref parsing in git_get_refs_list into parse_refLibravatar Jakub Narebski1-35/+45
Note that for each ref there are usually two calls to git subroutines: first to get the type of ref, second to parse ref if ref is of commit or tag type. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-14gitweb: Great subroutines renamingLibravatar Jakub Narebski1-125/+125
Rename some of subroutines to better reflect what they do. Some renames were not performed because subroutine name reflects hash key. Subroutines name guideline: * git_ prefix for subroutines related to git commands, git repository, or to gitweb actions * git_get_ prefix for inner subroutines calling git command or reading some file in the repository and returning some output * parse_ prefix for subroutines parsing some text (or reading and parsing some text) into hash or list * format_ prefix for subroutines formatting, post-processing or generating some HTML/text fragment * _get_ infix for subroutines which return result * _print_ infix for subroutines which print fragment of output * _body suffix for subroutines which outputs main part (body) of related action (usually table) * _nav suffix for subroutines related to navigation bars * _div suffix for subroutines returning or printing div element * subroutine names should not be based on how the result is obtained, as this might change easily Renames performed: - git_get_referencing => format_ref_marker - git_get_paging_nav => format_paging_nav - git_read_head => git_get_head_hash - git_read_hash => git_get_hash_by_ref - git_read_description => git_get_project_description - git_read_projects => git_get_projects_list - read_info_ref => git_get_references - git_read_refs => git_get_refs_list - date_str => parse_date - git_read_tag => parse_tag - git_read_commit => parse_commit - git_blob_plain_mimetype => blob_mimetype - git_page_nav => git_print_page_nav - git_header_div => git_print_header_div Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-13Merge branch 'maint'Libravatar Junio C Hamano1-1/+5
* maint: sample commit-msg hook: no silent exit on duplicate Signed-off-by lines Fix regex pattern in commit-msg
2006-08-13Fix type of combine-diff.c::show_patch_diff()Libravatar Junio C Hamano1-7/+5
The other function, show_raw_diff() is void and no callers use return value from neither. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-13sample commit-msg hook: no silent exit on duplicate Signed-off-by linesLibravatar Luben Tuikov1-1/+5
git-commit would silently exit if duplicate Signed-off-by lines were found. Users of git-commit would not know it, unless they checked '$?'. This patch makes git-commit actually print out a message that nothing was commited since duplicate Signed-off-lines were found. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-13Fix regex pattern in commit-msgLibravatar Luben Tuikov1-1/+1
Between the count and the line output, some uniq(1) versions put a TAB character, not a space. Make sure both are handled. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-08-12Merge branch 'jc/upload-pack'Libravatar Junio C Hamano1-55/+44
2006-08-12Merge branch 'jc/racy-delay'Libravatar Junio C Hamano1-4/+71
2006-08-12Merge branch 'th/diff-extra'Libravatar Junio C Hamano3-14/+13
2006-08-12Merge branch 'jc/pack-objects'Libravatar Junio C Hamano4-13/+42
2006-08-12Merge branch 'js/read-tree'Libravatar Junio C Hamano4-825/+874
2006-08-12Merge branch 'js/http-mb'Libravatar Junio C Hamano1-42/+7
2006-08-12Merge branch 'js/color-diff'Libravatar Junio C Hamano3-7/+177
2006-08-12Merge branch 'jn/web'Libravatar Junio C Hamano1-7/+7
2006-08-12Merge branch 'lt/web'Libravatar Junio C Hamano6-1297/+1258
2006-08-12Merge branch 'jn/conf'Libravatar Junio C Hamano5-37/+229
2006-08-12Merge branch 'jc/grep'Libravatar Junio C Hamano3-13/+85
2006-08-12Merge branch 'mk/rename'Libravatar Junio C Hamano11-141/+166
2006-08-12Merge branch 'ml/pager'Libravatar Junio C Hamano2-1/+6
2006-08-12GIT 1.4.2Libravatar Junio C Hamano1-1/+1
2006-08-12Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-26/+121
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Show the currently checked-out head in bold font gitk: Allow the user to set some colors
2006-08-12t/t4013: fix futzing with the version string.Libravatar Junio C Hamano1-2/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>