aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* consolidate two copies of new style object header parsing code.Junio C Hamano2006-09-01
| | | | | | | | | | | | Also while we are at it, remove redundant typename[] array from unpack_sha1_header. The only reason it is different from the type_names[] array in object.c module is that this code cares about the subset of object types that are valid in a loose object, so prepare a separate array of boolean that tells us which types are valid, and share the name translation with the others. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: Fix howto/revert-branch-rebase.html generationSergey Vlasov2006-09-01
| | | | | | | | | The rule for howto/*.html used "$?", which expands to the list of all newer prerequisites, including asciidoc.conf added by another rule. "$<" should be used instead. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* fmt-merge-msg: fix off-by-one bugJohannes Schindelin2006-09-01
| | | | | | | | Thanks to the recent malloc()->xmalloc() change, and XMALLOC_POISON, this bug was found. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-rev-list(1): group options; reformat; document more optionsJonas Fonseca2006-09-01
| | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2006-09-01
|\ | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix some bugs in the new cherry-picking code gitk: Improve responsiveness while reading and layout out the graph gitk: Update preceding/following tag info when creating a tag gitk: Add a menu item for cherry-picking commits gitk: Fix a couple of buglets in the branch head menu items gitk: Add a context menu for heads gitk: Add a row context-menu item for creating a new branch gitk: Recompute ancestor/descendent heads/tags when rereading refs gitk: Minor cleanups
| * gitk: Fix some bugs in the new cherry-picking codePaul Mackerras2006-08-28
| | | | | | | | | | When inserting the new commit row for the cherry-picked commit, we weren't advancing the selected line (if there is one), and we weren't updating commitlisted properly.
| * gitk: Improve responsiveness while reading and layout out the graphPaul Mackerras2006-08-16
| | | | | | | | | | | | | | | | | | | | | | | | This restructures layoutmore so that it can take a time limit and do limited amounts of graph layout and graph optimization, and return 1 if it exceeded the time limit before finishing everything it could do. Also getcommitlines reads at most half a megabyte each time, to limit the time it spends parsing the commits to about a tenth of a second. Also got rid of the unused ncmupdate variable while I was at it. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * gitk: Update preceding/following tag info when creating a tagPaul Mackerras2006-08-08
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * gitk: Add a menu item for cherry-picking commitsPaul Mackerras2006-08-06
| | | | | | | | | | | | | | | | | | | | | | This does a git-cherry-pick -r to cherry-pick the commit that was right-clicked on to the head of the current branch. This would work better with some minor changes to the git-cherry-pick script. Along the way, this changes desc_heads to record the names of the descendent heads rather than their IDs. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * gitk: Fix a couple of buglets in the branch head menu itemsPaul Mackerras2006-08-02
| | | | | | | | | | | | | | This fixes a silly typo (an extra a) and fixes the condition for asking for confirmation of removing a branch. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * gitk: Add a context menu for headsPaul Mackerras2006-08-02
| | | | | | | | | | | | | | | | | | This menu allows you to check out a branch and to delete a branch. If you ask to delete a branch that has commits that aren't on any other branch, gitk will prompt for confirmation before doing the deletion. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * gitk: Add a row context-menu item for creating a new branchPaul Mackerras2006-08-02
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * gitk: Recompute ancestor/descendent heads/tags when rereading refsPaul Mackerras2006-08-02
| | | | | | | | | | | | | | | | | | We weren't updating the desc_heads, desc_tags and anc_tags arrays when rereading the set of heads/tags/etc. The tricky thing to get right here is restarting the computation correctly when we are only half-way through it. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * gitk: Minor cleanupsPaul Mackerras2006-07-18
| | | | | | | | | | | | Removed some unnecessary quotes and globals, updated copyright notice. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | Constness tightening for move/link_temp_to_file()Junio C Hamano2006-09-01
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | gitweb: Fix git_blameAneesh Kumar K.V2006-08-31
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Include config.mak.autogen in the doc MakefileJonas Fonseca2006-08-31
| | | | | | | | | | | | | | | | ... to install documentation relative to the path set with configure's --prefix option. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Use xmalloc instead of mallocJonas Fonseca2006-08-31
| | | | | | | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git(7): move gitk(1) to the list of porcelain commandsJonas Fonseca2006-08-31
| | | | | | | | | | Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | t5710: fix two thinkos.Junio C Hamano2006-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The intention of the test seems to be to build a long chain of clones that locally borrow objects from their parents and see the system give up dereferencing long chains. There were two problems: (1) it did not test the right repository; (2) it did not build a chain long enough to trigger the limitation. I do not think it is a good test to make sure the limitation the current implementation happens to have still exists, but that is a topic at a totally different level. At least this fixes the broken test. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge early part of branch 'jc/daemon'Junio C Hamano2006-08-31
|\ \
| * | daemon: prepare for multiple services.Junio C Hamano2006-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an infrastructure to selectively enable and disable more than one services in git-daemon. Currently upload-pack service, which serves the git-fetch-pack and git-peek-remote clients, is the only service that is defined. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Extend parse_difftree_raw_line to save commit infoJakub Narebski2006-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend parse_difftree_raw_line to save commit info from when git-diff-tree is given only one <tree-ish>, for example when fed from git-rev-list using --stdin option. git-diff-tree outputs a line with the commit ID when applicable. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Separate printing of git_tree row into git_print_tree_entryJakub Narebski2006-08-31
| | | | | | | | | | | | | | | | | | | | | | | | This is preparation for "tree blame" (similar to what ViewVC shows) output, i.e. for each entry give commit where it was changed. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Move git-ls-tree output parsing to parse_ls_tree_lineJakub Narebski2006-08-31
| | | | | | | | | | | | | | | | | | | | | Add new subroutine parse_ls_tree_line and use it in git_tree. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | use do() instead of require() to include configurationDennis Stosberg2006-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When run under mod_perl, require() will read and execute the configuration file on the first invocation only. On every subsequent invocation, all configuration variables will be reset to their default values. do() reads and executes the configuration file unconditionally. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Remove forgotten call to git_to_hashDennis Stosberg2006-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Aug 27th, Jakub Narebski sent a patch which removed the git_to_hash() function and this call to it. The patch did not apply cleanly and had to be applied manually. Removing the last chunk has obviously been forgotten. See: commit 0aea33762b1262d11fb43eda9f3fc152b5622cca and message <200608272345.26722.jnareb@gmail.com> Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | log-tree.c: cleanup a bit append_signoff()Franck Bui-Huu2006-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch clean up append_signoff() by moving specific code that looks up for "^[-A-Za-z]+: [^@]+@" pattern into a function. It also stops the primary search when the cursor oversteps 'buf + at' limit. This patch changes slightly append_signoff() behaviour too. If we detect any Signed-off-by pattern during the primary search, we needn't to do a pattern research after. Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Remove uneeded #includeJohannes Schindelin2006-08-29
| | | | | | | | | | | | | | | Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Makefile: fix typoJohannes Schindelin2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | We checked NO_SETENV instead of NO_UNSETENV to decide if unsetenv is available. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | unpack-objects: remove unused variable "eof"Johannes Schindelin2006-08-29
| | | | | | | | | | | | | | | Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-fsck-objects: lacking default references should not be fatalLinus Torvalds2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment added says it all: if we have lost all references in a git archive, git-fsck-objects should still work, so instead of dying it should just notify the user about that condition. This change was triggered by me just doing a "git-init-db" and then populating that empty git archive with a pack/index file to look at it. Having git-fsck-objects not work just because I didn't have any references handy was rather irritating, since part of the reason for running git-fsck-objects in the first place was to _find_ the missing references. However, "--unreachable" really doesn't make sense in that situation, and we want to turn it off to protect anybody who uses the old "git prune" shell-script (rather than the modern built-in). The old pruning script used to remove all objects that were reported as unreachable, and without any refs, that obviously means everything - not worth it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Check if pack directory exists prior to descending into itMatthias Kestenholz2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warning: git-repack: line 42: cd: .git/objects/pack: No such file or directory This happens only, when git-repack -a is run without any packs in the repository. Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Add local time and timezone to git_print_authorshipJakub Narebski2006-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add local time (hours and minutes) and local timezone to the output of git_print_authorship command, used by git_commitdiff. The code was taken from git_commit subroutine. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Add diff tree, with links to patches, to commitdiff viewJakub Narebski2006-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added/uncommented git_difftree_body invocation in git_commitdiff. Added anchors (via 'id' attribute) to patches in patchset. git_difftree_body is modified to link to patch anchor when called from git_commitdiff, instead of link to blobdiff. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: git_print_log: signoff line is non-empty lineJakub Narebski2006-08-28
| | | | | | | | | | | | | | | | | | | | | | | | This correct minor error in git_print_log that didn't add final empty line when requested, if commit log ended with signoff. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Add author information to commitdiff viewJakub Narebski2006-08-28
| | | | | | | | | | | | | | | | | | | | | | | | Add subroutine git_print_authorship to print author and date of commit, div.author_date style to CSS, and use them in git_commitdiff. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Do not remove signoff lines in git_print_simplified_logJakub Narebski2006-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove '-remove_signoff => 1' option to git_print_log call in the git_print_simplified_log subroutine. This means that in "log" and "commitdiff" views (git_log and git_commitdiff subroutines) signoff lines will be shown. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Make git_print_log generic; git_print_simplified_log uses itJakub Narebski2006-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Collapse git_print_log and git_print_simplified_log into one subroutine git_print_log. git_print_simplified_log now simply calls git_print_log with proper options. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | gitweb: Use --git-dir parameter instead of setting $ENV{'GIT_DIR'}Dennis Stosberg2006-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to run gitweb under mod_perl's Apache::Registry. It needs a fairly new git version, with --git-dir=<path> parameter to git wrapper, i.e. post v1.4.2-rc2-g6acbcb9 version. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add --relative-date option to the revision interfaceJonas Fonseca2006-08-28
| | | | | | | | | | | | | | | | | | | | | Exposes the infrastructure from 9a8e35e98793af086f05d1ca9643052df9b44a74. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'gl/web'Junio C Hamano2006-08-28
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gl/web: (46 commits) gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree paramete gitweb: Remove git_to_hash function gitweb: Remove unused git_get_{preceding,following}_references gitweb: Fix typo in git_patchset_body gitweb: Fix typo in git_difftree_body gitweb: blobs defined by non-textual hash ids can be cached gitweb: Improve comments about gitweb features configuration gitweb: Remove workaround for git-diff bug fixed in f82cd3c gitweb: Remove creating directory for temporary files gitweb: Remove git_diff_print subroutine gitweb: git_blobdiff_plain is git_blobdiff('plain') gitweb: Use git-diff-tree or git-diff patch output for blobdiff gitweb: Change here-doc back for style consistency in git_blobdiff gitweb: Always display link to blobdiff_plain in git_blobdiff gitweb: Add invisible hyperlink to from-file/to-file diff header gitweb: Parse two-line from-file/to-file diff header in git_patchset_body gitweb: Allow for pre-parsed difftree info in git_patchset_body gitweb: Add support for hash_parent_base parameter for blobdiffs gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header gitweb: Add git_get_rev_name_tags function ...
| * | gitweb: Use @diff_opts, default ('M'), as git-diff and git-diff-tree parameteJakub Narebski2006-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new global configuration variable @diff_opts, which holds additional options (parameters) to git-diff and git-diff-tree, usually dealing rename/copying detection. Default value is '-M', taken from git_commit subroutine. Description of options and their approximate cost by Junio C Hamano. Changes: * git_commitdiff, git_blobdiff and git_blobdiff_plain now use '-M' instead of '-M', '-C' * git-diff now uses the same options as git-diff-tree * git_comittdiff_plain now uses '-M' instead of '-B' and is now rename-aware * git_rss uses now '-M' instead of () Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | gitweb: Remove git_to_hash functionJakub Narebski2006-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove git_to_hash function, which was to translate symbolic reference to hash, and it's use in git_blobdiff. We don't try so hard to guess filename if it was not provided. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | gitweb: Remove unused git_get_{preceding,following}_referencesJakub Narebski2006-08-27
| | | | | | | | | | | | | | | | | | | | | | | | Remove unused (and with errors in implementation) git_get_{preceding,following}_references subroutines. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | gitweb: Fix typo in git_patchset_bodyJakub Narebski2006-08-27
| | | | | | | | | | | | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | gitweb: Fix typo in git_difftree_bodyJakub Narebski2006-08-26
| | | | | | | | | | | | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | gitweb: blobs defined by non-textual hash ids can be cachedJakub Narebski2006-08-26
| | | | | | | | | | | | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | gitweb: Improve comments about gitweb features configurationJakub Narebski2006-08-26
| | | | | | | | | | | | | | | Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | gitweb: Remove workaround for git-diff bug fixed in f82cd3cJakub Narebski2006-08-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove workaround in git_blobdiff for error in git-diff (showing reversed diff for diff of blobs), corrected in commit f82cd3c Fix "git diff blob1 blob2" showing the diff in reverse. which is post 1.4.2-rc2 commit. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-24 16:32:18 +0000