| c08e524 | Matthias Lederhofer | 22 September 2006, 11:12:01 UTC | format-patch: use cwd as default output directory Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 16:13:16 UTC |
| 7b40e7d | Andy Whitcroft | 25 September 2006, 11:08:13 UTC | svnimport: add support for parsing From: lines for author When commiting a non-signed off contribution you cannot just add a Signed-off-by: from the author as they did not sign it off. But if you then commit it, and necessarily sign it off yourself, the change appears to be yours. In this case it is common to use the following form: Commentry From: originator <email> Signed-of-by: me <my email> Now that we have support for parsing Signed-off-by: for author information it makes sense to handle From: as well. This patch adds a new -F which will handle From: lines in the comments. It may be used in combination with -S. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 16:12:57 UTC |
| 690d882 | Junio C Hamano | 28 September 2006, 09:31:25 UTC | Contributed bash completion support for core Git tools. This is a set of bash completion routines for many of the popular core Git tools. I wrote these routines from scratch after reading the git-compl and git-compl-lib routines available from the gitcompletion package at http://gitweb.hawaga.org.uk/ and found those to be lacking in functionality for some commands. Consequently there may be some similarities but many differences. Since these are completion routines only for tools shipped with core Git and since bash is a popular shell on many of the native core Git platforms (Linux, Mac OS X, Solaris, BSD) including these routines as part of the stock package would probably be convienent for many users. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 09:31:25 UTC |
| 2d5b459 | Junio C Hamano | 28 September 2006, 06:56:55 UTC | Merge branch 'jl/virtual' * jl/virtual: Removed memory leaks from interpolation table uses. Cleaned up git-daemon virtual hosting support. | 28 September 2006, 06:56:55 UTC |
| 51b2dd4 | Junio C Hamano | 28 September 2006, 05:17:01 UTC | Merge branch 'cc/branch-test' * cc/branch-test: Remove empty ref directories that prevent creating a ref. | 28 September 2006, 05:17:01 UTC |
| eb51ec9 | Luben Tuikov | 28 September 2006, 00:24:49 UTC | gitweb: Add history and blame to git_difftree_body() Add blame and history to Deleted files. Add blame and history to Modified or Type changed files. Add blame and history to Renamed or Copied files. This allows us to do blame->commit->blame->commit->blame->... instead of blame->commit->file->blame->commit->file->blame->... which is longer and easier to get wrong. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 04:56:59 UTC |
| 2b83ade | Junio C Hamano | 28 September 2006, 04:51:29 UTC | Merge branch 'sp/void' * sp/void: Allow git-checkout when on a non-existant branch. | 28 September 2006, 04:51:29 UTC |
| f2ce6a4 | Junio C Hamano | 28 September 2006, 04:50:42 UTC | Merge branch 'jc/whitespace' * jc/whitespace: git-apply: second war on whitespace. diff.c: second war on whitespace. | 28 September 2006, 04:50:42 UTC |
| 1ad7a06 | Junio C Hamano | 28 September 2006, 04:46:07 UTC | Merge branch 'jc/repack' * jc/repack: git-repack: allow git-repack to run in subdirectory repack: use only pack-objects, not rev-list. | 28 September 2006, 04:46:07 UTC |
| e38604e | Junio C Hamano | 28 September 2006, 04:41:24 UTC | Merge branch 'jc/deprecate-recursive' * jc/deprecate-recursive: Deprecate merge-recursive.py | 28 September 2006, 04:41:24 UTC |
| 07ccbff | Johannes Schindelin | 28 September 2006, 00:44:30 UTC | runstatus: do not recurse into subdirectories if not needed This speeds up the case when you run git-status, having an untracked subdirectory containing huge amounts of files. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 04:36:54 UTC |
| 499faed | Luben Tuikov | 28 September 2006, 00:23:25 UTC | gitweb: Remove excessively redundant entries from git_difftree_body 1) All entries on the left are blobs and clicking on them leads to blobs. No more diff or blob depending on what happened (modified or mode changed) to the file -- this goes to the right, in the "link" column. 2) Remove redundant "blob" from the link column on the right. This can now be had by clicking on the entry itself. This reduces and simplifies the code. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 04:30:01 UTC |
| 709f898 | Luben Tuikov | 28 September 2006, 00:22:03 UTC | Revert "gitweb: extend blame to show links to diff and previous" This concept is very fine, but it makes blame slow across renames and across branches, so revert it. There is a better way to do this. This reverts commit 03d06a8e26f4fbd37800d1e1125c6ecf4c104466. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 04:29:10 UTC |
| eb30aed | Jon Loeliger | 27 September 2006, 16:16:10 UTC | Removed memory leaks from interpolation table uses. Clarified that parse_extra_args()s results in interpolation table entries. Removed a few trailing whitespace occurrences. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 01:00:53 UTC |
| dd46762 | Jon Loeliger | 26 September 2006, 14:47:43 UTC | Cleaned up git-daemon virtual hosting support. Standardized on lowercase hostnames from client. Added interpolation values for the IP address, port and canonical hostname of the server as it is contacted and named by the client and passed in via the extended args. Added --listen=host_or_ipaddr option suport. Renamed port variable as "listen_port" correspondingly as well. Documented mutual exclusivity of --inetd option with --user, --group, --listen and --port options. Added compat/inet_pton.c from Paul Vixie as needed. Small memory leaks need to be cleaned up still. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 01:00:52 UTC |
| a3f5d02 | Junio C Hamano | 27 September 2006, 23:42:53 UTC | grep: fix --fixed-strings combined with expression. "git grep --fixed-strings -e GIT --and -e VERSION .gitignore" misbehaved because we did not notice this needs to grab lines that have the given two fixed strings at the same time. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 23:42:53 UTC |
| b48fb5b | Junio C Hamano | 27 September 2006, 23:27:10 UTC | grep: free expressions and patterns when done. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 23:27:10 UTC |
| 209e756 | Shawn Pearce | 27 September 2006, 15:18:49 UTC | Corrected copy-and-paste thinko in ignore executable bit test case. This test should be testing update-index --add, not git-add as the latter is implemented in terms of the former. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 19:44:02 UTC |
| 1665217 | Junio C Hamano | 27 September 2006, 19:34:37 UTC | An illustration of rev-list --parents --pretty=raw This script creates two separate histories, A and B, each of which does: (A0, B0): create fileA and subdir/fileB (A1, B1): modify fileA (A2, B2): modify subdir/fileB and then grafts them together to make B0 a child of A2. So the final history looks like (time flows from top to bottom): true parent touches subdir? A0 none yes (creates it) A1 A0 no A2 A1 yes B0 none yes (different from what's in A2) B1 B0 no B2 B1 yes "git rev-list --parents --pretty=raw B2" would give "fake" parents on the "commit " header lines while "parent " header lines show the parent as recorded in the commit object (i.e. B0 appears to have A2 as its parent on "commit " header but there is no "parent A2" header line in it). When you have path limiters, we simplify history to omit commits that do not affect the specified paths. So "git rev-list --parents --pretty=raw B2 subdir" would return "B2 B0 A2 A0" (because B1 and A1 do not touch the path). When it does so, the "commit " header lines have "fake" parents (i.e. B2 appears to have B0 as its parent on "commit " header), but you can still get the true parents by looking at "parent " header. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 19:34:37 UTC |
| 785f743 | Junio C Hamano | 27 September 2006, 01:59:41 UTC | diff --stat: color output. Under --color option, diffstat shows '+' and '-' in the graph the same color as added and deleted lines. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 09:57:37 UTC |
| a254002 | Junio C Hamano | 27 September 2006, 01:53:02 UTC | diff --stat: allow custom diffstat output width. This adds two parameters to "diff --stat". . --stat-width=72 tells that the page should fit on 72-column output. . --stat-name-width=30 tells that the filename part is limited to 30 columns. Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 09:55:08 UTC |
| 5a03e7f | Shawn Pearce | 25 September 2006, 05:24:38 UTC | Allow git-checkout when on a non-existant branch. I've seen some users get into situtations where their HEAD symbolic-ref is pointing at a non-existant ref. (Sometimes this happens during clone when the remote repository lacks a 'master' branch.) If this happens the user is unable to use git-checkout to switch branches as there is no prior commit to merge from. So instead of giving the user low-level errors about how HEAD can't be resolved and how not a single revision was given change the type of checkout to be a force and go through with the user's request anyway. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 07:43:50 UTC |
| ab41dfb | Jakub Narebski | 25 September 2006, 23:59:43 UTC | gitweb: Quote filename in HTTP Content-Disposition: header Finish work started by commit a2f3db2 (although not documented in commit message) of quoting using quotemeta the filename in HTTP -content_disposition header. Just in case filename contains end of line character. Also use consistent coding style to compute -content_disposition parameter. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 07:41:36 UTC |
| f93bff8 | Jakub Narebski | 25 September 2006, 23:58:41 UTC | gitweb: Add git_url subroutine, and use it to quote full URLs Add git_url subroutine, which does what git_param did before commit a2f3db2f5de2a3667b0e038aa65e3e097e642e7d, and is used to quote full URLs, currently only $home_link. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 07:41:35 UTC |
| 24d0693 | Jakub Narebski | 25 September 2006, 23:57:02 UTC | gitweb: Split validate_input into validate_pathname and validate_refname Split validate_input subroutine into validate_pathname which is used for $project, $file_name and $file_parent parameters, and validate_refname which is used for $hash, $hash_base, $hash_parent and $hash_parent_base parameters. Reintroduce validation of $file_name and $file_parent parameters, removed in a2f3db2f validate_pathname in addition to what validate_input did checks also for doubled slashes and NUL character. It does not check if input is textual hash, and does not check if all characters are from the following set: [a-zA-Z0-9_\x80-\xff\ \t\.\/\-\+\#\~\%]. validate_refname first check if the input is textual hash, then checks if it is valid pathname, then checks for invalid characters (according to git-check-ref-format manpage). It does not check if all charactes are from the [a-zA-Z0-9_\x80-\xff\ \t\.\/\-\+\#\~\%] set. We do not have to validate pathnames we got from git. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 07:41:35 UTC |
| dd1ad5f | Jakub Narebski | 25 September 2006, 23:56:17 UTC | gitweb: Use "return" instead of "return undef" for some subs Use "return" instead of "return undef" when subroutine can return, or always return, non-scalar (list) value. Other places are left as is. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 07:41:35 UTC |
| 4b02f48 | Jakub Narebski | 25 September 2006, 23:54:24 UTC | gitweb: Strip trailing slashes from $path in git_get_hash_by_path It also removes unused local variable $tree Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 07:41:35 UTC |
| 6591039 | Luben Tuikov | 26 September 2006, 23:45:31 UTC | gitweb: extend blame to show links to diff and previous git_blame2() now has two more columns, "Prev" and "Diff", before the "Commit" column, as follows: Prev Diff Commit Line Data SHA Diff SHA N ... ... The "Prev" column shows the SHA of the parent commit, between which this line changed. Clicking on it shows the blame of the file as of the parent commit, for that line. So clicking repeatedly on "Prev" would show you the blame of that file, from the point of view of the changes of that particular line whose "Prev" you're clicking on. The "Diff" column shows "Diff" which is a link to blobdiff between "Prev" and "Commit" commits _for that line_. So clicking on "Diff" would show you the blobdiff (HTML) between the parent commit and this commit which changed that particular line. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 07:10:17 UTC |
| 4a0641b | Yasushi SHOJI | 27 September 2006, 03:04:10 UTC | gitweb: Decode long title for link tooltips This is a simple one liner to decode long title string in perl's internal form to utf-8 for link tooltips. This is not crucial if the commit message is all in ASCII, however, if you decide to use other encoding, such as UTF-8, tooltips ain't readable any more. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 07:08:51 UTC |
| 0fa105e | Luben Tuikov | 26 September 2006, 19:45:37 UTC | gitweb: Remove redundant "tree" link In "tree" view, remove redundant "tree" link in the tree listing. It is identical to simply clicking on the tree entry itself. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 06:47:10 UTC |
| 191414c | Sergey Vlasov | 26 September 2006, 09:42:55 UTC | git-svn: Fix fetch --no-ignore-externals with GIT_SVN_NO_LIB=1 When using Subversion 1.3.1 without Perl bindings (GIT_SVN_NO_LIB=1), "git-svn fetch --no-ignore-externals" fails with errors like: Tree (.../.git/svn/git-svn/tree) is not clean: X directory_with_external In this case the 'X' lines in the "svn status" output are not a sign of unclean tree, and therefore should be ignored. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 06:43:12 UTC |
| fd28b34 | Shawn Pearce | 27 September 2006, 05:21:19 UTC | Ignore executable bit when adding files if filemode=0. If the user has configured core.filemode=0 then we shouldn't set the execute bit in the index when adding a new file as the user has indicated that the local filesystem can't be trusted. This means that when adding files that should be marked executable in a repository with core.filemode=0 the user must perform a 'git update-index --chmod=+x' on the file before committing the addition. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 September 2006, 05:42:52 UTC |
| 9c7b0b3 | Christian Couder | 26 September 2006, 05:23:37 UTC | Remove empty ref directories that prevent creating a ref. This patch also adds test cases from Linus and Junio. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 September 2006, 06:54:40 UTC |
| 4de741b | Luben Tuikov | 26 September 2006, 05:38:16 UTC | gitweb: tree view: eliminate redundant "blob" Binary and non-binary blobs: The "list" table element of tree view is identical to the "blob" link part of the link table element. I.e. clicking on "blob" is identical to clicking on the entry itself. Thus, eliminate "blob" from being shown -- the user can get identical result by simply clicking on the entry itself. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 September 2006, 06:09:55 UTC |
| 4dafd7d | Alex Riesen | 25 September 2006, 21:19:00 UTC | Use const for interpolate arguments Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 September 2006, 05:11:26 UTC |
| e8daf78 | Franck Bui-Huu | 25 September 2006, 10:31:52 UTC | git-archive: update documentation This patch documents zip backend options. It also adds git-archive command into the main git manual page. Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 September 2006, 04:17:43 UTC |
| a06f678 | Junio C Hamano | 25 September 2006, 02:49:47 UTC | Deprecate merge-recursive.py This renames merge-recursive written in Python to merge-recursive-old, and makes merge-recur as a synonym to merge-recursive. We do not remove merge-recur yet, but we will remove merge-recur and merge-recursive-old in a few releases down the road. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2006, 03:33:35 UTC |
| 8391548 | Petr Baudis | 24 September 2006, 21:57:40 UTC | gitweb: fix over-eager application of esc_html(). Contents of %diffinfo hash should be quoted upon output but kept unquoted internally. Later users of this hash expect filenames to be filenames, not HTML gibberish. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2006, 03:33:09 UTC |
| 8815788 | Shawn Pearce | 25 September 2006, 03:04:55 UTC | Allow '(no author)' in git-svn's authors file. When trying to import an SVN revision which has no author the Git user may desire to relabel '(no author)' to another name and email address with their svn.authorsfile. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2006, 03:19:28 UTC |
| f7bae37 | Shawn Pearce | 25 September 2006, 02:50:15 UTC | Allow 'svn fetch' on '(no date)' revisions in Subversion. Added --ignore-nodate to allow 'git svn fetch' to import revisions from Subversion which have '(no date)' listed as the date of the revision. By default 'git svn fetch' will crash with an error when encountering such a revision. The user may restart the fetch operation by adding --ignore-nodate if they want to continue tracking that repository. I'm not entirely sure why a centralized version control system such as Subversion permits revisions to be created with absolutely no date/time associated with it but it apparently is possible as one of the Subversion repositories that I'm tracking with 'git svn' created such a revision on '(no date)' and by '(no user)'. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2006, 03:19:22 UTC |
| d0b353b | Jeff King | 25 September 2006, 02:31:11 UTC | git-repack: allow git-repack to run in subdirectory Now that we explicitly create all tmpfiles below $GIT_DIR, there's no reason to care about which directory we're in. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2006, 03:16:23 UTC |
| 2f60e4e | Junio C Hamano | 25 September 2006, 03:00:59 UTC | Merge branch 'sk/svnimport' * sk/svnimport: git-svnimport: Parse log message for Signed-off-by: lines | 25 September 2006, 03:00:59 UTC |
| d1cb7ac | Junio C Hamano | 25 September 2006, 02:58:30 UTC | Merge early parts of branch 'np/pack' | 25 September 2006, 02:58:30 UTC |
| fd88d9c | Junio C Hamano | 24 September 2006, 21:42:01 UTC | Remove upload-tar and make git-tar-tree a thin wrapper to git-archive The command now issues a big deprecation warning message and runs git-archive command with appropriate arguments. git-tar-tree $tree_ish $base always forces $base to be the leading directory name, so the --prefix parameter passed internally to git-archive is a slash appended to it, i.e. "--prefix=$base/". Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2006, 02:55:08 UTC |
| 3d74982 | Rene Scharfe | 24 September 2006, 15:31:10 UTC | git-tar-tree: Move code for git-archive --format=tar to archive-tar.c This patch doesn't change any functionality, it only moves code around. It makes seeing the few remaining lines of git-tar-tree code easier. ;-) Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2006, 02:55:08 UTC |
| 81b84c4 | Rene Scharfe | 24 September 2006, 15:30:44 UTC | git-tar-tree: Remove duplicate git_config() call generate_tar() eventually calls write_tar_archive() which does all the "real" work and which also calls git_config(git_tar_config). We only need to do this once. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 September 2006, 02:55:07 UTC |
| b0ed9ea | Junio C Hamano | 25 September 2006, 02:53:52 UTC | Merge branch 'jc/filter-commit' * jc/filter-commit: git log: Unify header_filter and message_filter into one. Update grep internal for grepping only in head/body git-log --author and --committer are not left-anchored by default rev-list: fix segfault with --{author,committer,grep} revision traversal: --author, --committer, and --grep. revision traversal: prepare for commit log match. builtin-grep: make pieces of it available as library. | 25 September 2006, 02:53:52 UTC |
| 700899b | Junio C Hamano | 25 September 2006, 02:20:26 UTC | Merge branch 'sb/branch-attributes' * sb/branch-attributes: Add test for the default merges in fetch. fetch: get the remote branches to merge from the branch properties Add t5510 to test per branch configuration affecting git-fetch. Fetch: default remote repository from branch properties | 25 September 2006, 02:20:26 UTC |
| 043c041 | Junio C Hamano | 24 September 2006, 23:58:34 UTC | Merge branch 'jl/daemon' * jl/daemon: Add virtualization support to git-daemon | 24 September 2006, 23:58:34 UTC |
| 6cc7c36 | Santi Béjar | 23 September 2006, 20:55:35 UTC | Add test for the default merges in fetch. [jc: with minor fix-ups] Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2006, 09:00:21 UTC |
| 5372806 | Santi Béjar | 23 September 2006, 20:53:04 UTC | fetch: get the remote branches to merge from the branch properties If in branch "foo" and this in config: [branch "foo"] merge=bar "git fetch": fetch from the default repository and program the "bar" branch to be merged with pull. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2006, 07:13:49 UTC |
| 7be1d62 | Junio C Hamano | 23 September 2006, 10:40:17 UTC | Add t5510 to test per branch configuration affecting git-fetch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2006, 07:13:49 UTC |
| 648ad18 | Santi Béjar | 23 September 2006, 10:05:43 UTC | Fetch: default remote repository from branch properties If in branch "foo" and this in config: [branch "foo"] remote=bar "git fetch" = "git fetch bar" "git pull" = "git pull bar" Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2006, 07:13:49 UTC |
| d0c2503 | Junio C Hamano | 23 September 2006, 07:37:19 UTC | git-apply: second war on whitespace. This makes --whitespace={warn,error,strip} option to also notice the leading whitespace errors in addition to the trailing whitespace errors. Spaces that are followed by a tab in indent are detected as errors, and --whitespace=strip option fixes them. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2006, 07:12:44 UTC |
| 448c3ef | Junio C Hamano | 23 September 2006, 05:48:39 UTC | diff.c: second war on whitespace. This adds DIFF_WHITESPACE color class (default = reverse red) to colored diff output to let you catch common whitespace errors. - trailing whitespaces at the end of line - a space followed by a tab in the indent Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2006, 07:12:44 UTC |
| ed1795f | Randal L. Schwartz | 24 September 2006, 00:20:45 UTC | builtin-upload-archive.c broken on openbsd Looks like ctype again. Gotta be careful with that on BSD releases: $ gmake prefix=/opt/git all GIT_VERSION = 1.4.2.GIT gcc -o builtin-upload-archive.o -c -g -O2 -Wall -I/usr/local/include -DSHA1_HEADER='<openssl/sha.h>' -DNO_STRCASESTR builtin-upload-archive.c In file included from /usr/include/sys/poll.h:54, from builtin-upload-archive.c:11: /usr/include/ctype.h:68: error: syntax error before ']' token /usr/include/ctype.h:69: error: syntax error before ']' token ... /usr/include/sys/poll.h:53:1: unterminated #ifndef /usr/include/sys/poll.h:28:1: unterminated #ifndef gmake: *** [builtin-upload-archive.o] Error 1 This fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2006, 07:00:47 UTC |
| a2f3db2 | Petr Baudis | 23 September 2006, 22:18:41 UTC | gitweb: Consolidate escaping/validation of query string Consider: http://repo.or.cz/?p=glibc-cvs.git;a=tree;h=2609cb0411389325f4ee2854cc7159756eb0671e;hb=2609cb0411389325f4ee2854cc7159756eb0671e (click on the funny =__ify file) We ought to handle anything in filenames and I actually see no reason why we don't, modulo very little missing escaping that this patch hopefully also fixes. I have also made esc_param() escape [?=&;]. Not escaping [&;] was downright buggy and [?=] just feels better escaped. ;-) YMMV. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2006, 06:53:18 UTC |
| 8f41db8 | Petr Baudis | 23 September 2006, 22:25:19 UTC | Deprecate git-resolve.sh Seriously, is anyone still using this thing? It's collecting dust and blocking the name for something potentially useful like a tool for user-friendly marking of resolved conflicts or resolving index conflicts. We've loved you when Git was young, now thank you and please go away. ;-) This makes git-resolve.sh print a big deprecation warning and sleep a bit for extra annoyance. It should be removed completely after the next release. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 September 2006, 06:52:53 UTC |
| 18b0fc1 | Petr Baudis | 23 September 2006, 18:20:47 UTC | Git.pm: Kill Git.xs for now This patch removes Git.xs from the repository for the time being. This should hopefully enable Git.pm to finally make its way to master. Git.xs is not going away forever. When the Git libification makes some progress, it will hopefully return (but most likely as an optional component, due to the portability woes) since the performance boosts are really important for applications like Gitweb or Cogito. It needs to go away now since it is not really reliable in case you use it for several repositories in the scope of a single process, and that is not possible to fix without some either very ugly or very intrusive core changes. Rest in peace. (While you can.) Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2006, 21:02:40 UTC |
| 3fc8284 | Rene Scharfe | 23 September 2006, 15:06:35 UTC | Rename builtin-zip-tree.c to archive-zip.c Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2006, 21:00:32 UTC |
| 31756c5 | Rene Scharfe | 23 September 2006, 15:06:11 UTC | Remove git-zip-tree git-zip-tree can be safely removed because it was never part of a formal release. This patch makes 'git-archive --format=zip' the one and only git ZIP file creation command. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2006, 21:00:27 UTC |
| 4305730 | Nicolas Pitre | 21 September 2006, 04:05:37 UTC | many cleanups to sha1_file.c Those cleanups are mainly to set the table for the support of deltas with base objects referenced by offsets instead of sha1. This means that many pack lookup functions are converted to take a pack/offset tuple instead of a sha1. This eliminates many struct pack_entry usages since this structure carried redundent information in many cases, and it increased stack footprint needlessly for a couple recursively called functions that used to declare a local copy of it for every recursion loop. In the process, packed_object_info_detail() has been reorganized as well so to look much saner and more amenable to deltas with offset support. Finally the appropriate adjustments have been made to functions that depend on the above changes. But there is no functionality changes yet simply some code refactoring at this point. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2006, 08:51:33 UTC |
| 1685457 | Nicolas Pitre | 21 September 2006, 04:11:59 UTC | move pack creation to version 3 It's been quite a while now that GIT is able to read version 3 packs. Let's create them at last. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2006, 02:24:52 UTC |
| ae35b30 | Sasha Khapyorsky | 05 September 2006, 18:46:11 UTC | git-svnimport: Parse log message for Signed-off-by: lines This add '-S' option. When specified svn-import will try to parse commit message for 'Signed-off-by: ...' line, and if found will use the name and email address extracted at first occurrence as this commit author name and author email address. Committer name and email are extracted in usual way. Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2006, 02:24:12 UTC |
| 3d5c0cc | Robin Rosenberg | 22 September 2006, 22:35:20 UTC | Quote arguments to tr in test-lib When there are single-character filenames in the test directory, the shell tries to expand regexps meant for tr. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 September 2006, 00:00:36 UTC |
| 5c7d2cf | Petr Baudis | 22 September 2006, 23:21:20 UTC | Fix snapshot link in tree view It would just give HEAD snapshot instead of one of the particular tree. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 23:59:22 UTC |
| 74d6166 | Petr Baudis | 22 September 2006, 23:15:18 UTC | gitweb: Fix @git_base_url_list usage As it is now, that array was never used because the customurl accessor was broken and ''unless @url_list'' never happenned. Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 23:59:04 UTC |
| d726720 | Petr Baudis | 22 September 2006, 23:56:43 UTC | gitweb: Fix tree link associated with each commit log entry. The link forgot to have hb parameter and the resulting tree view failed to show the navbar for that commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 23:58:51 UTC |
| 26d0a97 | Petr Baudis | 22 September 2006, 23:00:12 UTC | Make path in tree view look nicer Based on talk on the IRC with Junio some evenings ago, I've updated the path showing in tree view to look better and sent updated patches privately, but it seems the old version ended up being used, so here's the new one again. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 23:49:36 UTC |
| f35274d | Petr Baudis | 22 September 2006, 01:19:53 UTC | gitweb: Relabel "head" as "HEAD" "head" is a reference in refs/heads/, while those labels mean HEAD, the latest revision of the default branch. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 04:21:04 UTC |
| 35329cc | Petr Baudis | 22 September 2006, 01:19:50 UTC | gitweb: Rename "plain" labels to "raw" I don't have much preference either way and as far as I'm concerned, it may go the other way as well. Consistency is what is important. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 04:18:26 UTC |
| 6ef4cb2 | Petr Baudis | 22 September 2006, 01:19:48 UTC | gitweb: Link to associated tree from a particular log item in full log view Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 04:01:28 UTC |
| 1d62be2 | Petr Baudis | 22 September 2006, 01:19:46 UTC | gitweb: Link to latest tree from the head line in heads list Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 04:00:51 UTC |
| 35749ae | Petr Baudis | 22 September 2006, 01:19:44 UTC | gitweb: Link to tree instead of snapshot in shortlog Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 03:58:50 UTC |
| cae1862 | Petr Baudis | 22 September 2006, 01:19:41 UTC | gitweb: More per-view navigation bar links Navigation bars in various views were empty or missed important items that should have been there, e.g. getting a snapshot in tree view or log of ancestry in commit view... This feeble patch attempts to consolidate that. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 03:57:43 UTC |
| 609ff26 | Petr Baudis | 21 September 2006, 23:58:40 UTC | gitweb: Link (HEAD) tree for each project from projects list Current projects list is oriented on easily getting "what's new" information. But when already using gitweb as an interface to something, I personally find myself to _much_ more frequently wanting to rather see "what's in" (or "what's new in") and it's quite annoying to have to go through the summary page (which is also rather expensive to generate) just to get there. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 September 2006, 03:56:33 UTC |
| 1d782b0 | Jakub Narebski | 21 September 2006, 16:09:12 UTC | gitweb: Make git_get_hash_by_path check type if provided Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 September 2006, 19:55:51 UTC |
| 16fdb48 | Petr Baudis | 21 September 2006, 00:05:50 UTC | Fix showing of path in tree view This patch fixes two things - links to all path elements except the last one were broken since gitweb does not like the trailing slash in them, and the root tree was not reachable from the subdirectory view. To compensate for the one more slash in the front, the trailing slash is not there anymore. ;-) I don't care if it stays there though. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 September 2006, 08:16:45 UTC |
| 053d62b | Martin Waitz | 21 September 2006, 07:48:21 UTC | gitweb: fix display of trees via PATH_INFO. When adding a / to the URL, git should display the corresponding tree object, but it has to remove the / first. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 September 2006, 08:15:23 UTC |
| 199a921 | Johannes Schindelin | 21 September 2006, 00:10:30 UTC | Document receive.denyNonFastforwards [jc: with a fix to config handling in t5400 test, which took annoyingly long to diagnose.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 September 2006, 06:32:22 UTC |
| 9edd7e4 | Johannes Schindelin | 21 September 2006, 00:07:19 UTC | receive-pack: plug memory leak in fast-forward checking code. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 September 2006, 05:37:50 UTC |
| 11031d7 | Johannes Schindelin | 20 September 2006, 23:07:54 UTC | add receive.denyNonFastforwards config variable If receive.denyNonFastforwards is set to true, git-receive-pack will deny non fast-forwards, i.e. forced updates. Most notably, a push to a repository which has that flag set will fail. As a first user, 'git-init-db --shared' sets this flag, since in a shared setup, you are most unlikely to want forced pushes to succeed. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 23:15:45 UTC |
| 7dd45e1 | Junio C Hamano | 20 September 2006, 23:11:08 UTC | sha1_name.c: understand "describe" output as a valid object name Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 23:11:08 UTC |
| e49521b | Junio C Hamano | 20 September 2006, 23:04:46 UTC | Make hexval() available to others. builtin-mailinfo.c has its own hexval implementaiton but it can share the table-lookup one recently implemented in sha1_file.c Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 23:08:14 UTC |
| 2d10c55 | Junio C Hamano | 20 September 2006, 20:21:56 UTC | git log: Unify header_filter and message_filter into one. Now we can tell the built-in grep to grep only in head or in body, use that to update --author, --committer, and --grep. Unfortunately, to make --and, --not and other grep boolean expressions useful, as in: # Things written by Junio committed and by Linus and log # does not talk about diff. git log --author=Junio --and --committer=Linus \ --grep-not --grep=diff we will need to do another round of built-in grep core enhancement, because grep boolean expressions are designed to work on one line at a time. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 20:21:56 UTC |
| 480c1ca | Junio C Hamano | 20 September 2006, 19:39:46 UTC | Update grep internal for grepping only in head/body This further updates the built-in grep engine so that we can say something like "this pattern should match only in head". This can be used to simplify grepping in the log messages. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 19:39:46 UTC |
| 49ba83f | Jon Loeliger | 20 September 2006, 01:31:51 UTC | Add virtualization support to git-daemon Signed-off-by: Jon Loeliger Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 18:15:39 UTC |
| cd0d74d | Junio C Hamano | 18 September 2006, 09:29:01 UTC | repack: use only pack-objects, not rev-list. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 18:15:32 UTC |
| a2ed6ae | Linus Torvalds | 18 September 2006, 17:07:51 UTC | git-log --author and --committer are not left-anchored by default I know that I'd prefer a rule where "--author=^Junio" would result in the grep-pattern being "^author Junio", but without the initial '^' it would be "^author .*Junio". Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 18:14:39 UTC |
| f69895f | Jeff King | 18 September 2006, 06:52:42 UTC | rev-list: fix segfault with --{author,committer,grep} We need to save the commit buffer if we're going to match against it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 18:14:39 UTC |
| bd95fcd | Junio C Hamano | 18 September 2006, 00:23:20 UTC | revision traversal: --author, --committer, and --grep. This adds three options to setup_revisions(), which lets you filter resulting commits by the author name, the committer name and the log message with regexp. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 18:14:39 UTC |
| 8ecae9b | Junio C Hamano | 17 September 2006, 22:43:40 UTC | revision traversal: prepare for commit log match. This is from a suggestion by Linus, just to mark the locations where we need to modify to actually implement the filtering. We do not have any actual filtering code yet. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 18:14:39 UTC |
| 83b5d2f | Junio C Hamano | 17 September 2006, 23:02:52 UTC | builtin-grep: make pieces of it available as library. This makes three functions and associated option structures from builtin-grep available from other parts of the system. * options to drive built-in grep engine is stored in struct grep_opt; * pattern strings and extended grep expressions are added to struct grep_opt with append_grep_pattern(); * when finished calling append_grep_pattern(), call compile_grep_patterns() to prepare for execution; * call grep_buffer() to find matches in the in-core buffer. This also adds an internal option "status_only" to grep_opt, which suppresses any output from grep_buffer(). Callers of the function as library can use it to check if there is a match without producing any output. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 18:14:38 UTC |
| 62e27f2 | Jakub Narebski | 19 September 2006, 18:47:27 UTC | gitweb: Fix thinko in git_tags and git_heads git_get_refs_list always return reference to list (and reference to hash which we ignore), so $taglist (in git_tags) and $headlist (in git_heads) are always defined, but @$taglist / @$headlist might be empty. Replaced incorrect "if (defined @$taglist)" with "if (@$taglist)" in git_tags and respectively in git_heads. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 17:26:08 UTC |
| 120ddde | Jakub Narebski | 19 September 2006, 12:33:22 UTC | gitweb: Make git_get_refs_list do work of git_get_references Make git_get_refs_list do also work of git_get_references, to avoid calling git-peek-remote twice. Change meaning of git_get_refs_list meaning: it is now type, and not a full path, e.g. we now use git_get_refs_list("heads") instead of former git_get_refs_list("refs/heads"). Modify git_summary to use only one call to git_get_refs_list instead of one call to git_get_references and two to git_get_refs_list. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 17:26:05 UTC |
| 9704d75 | Jakub Narebski | 19 September 2006, 12:31:49 UTC | gitweb: Always use git-peek-remote in git_get_references Instead of trying to read info/refs file, which might not be present (we did fallback to git-ls-remote), always use git-peek-remote in git_get_references. It is preparation for git_get_refs_info to also return references info. We should not use info/refs for git_get_refs_info as the repository is not served for http-fetch clients. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 17:24:44 UTC |
| d04d3d4 | Jakub Narebski | 19 September 2006, 19:53:22 UTC | gitweb: Require project for almost all actions Require that project (repository) is given for all actions except project_list, project_index and opml. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 16:49:39 UTC |
| cd90e75 | Jakub Narebski | 19 September 2006, 22:49:51 UTC | gitweb: Even more support for PATH_INFO based URLs Now the following types of path based URLs are supported: * project overview (summary) page of project * project/branch shortlog of branch * project/branch:file file in branch, blob_plain view * project/branch:dir/ directory listing of dir in branch, tree view The following shortcuts works (see explanation below): * project/branch: directory listing of branch, main tree view * project/:file file in HEAD (raw) * project/:dir/ directory listing of dir in HEAD * project/: directory listing of project's HEAD We use ':' as separator between branch (ref) name and file name (pathname) because valid branch (ref) name cannot have ':' inside. This limit applies to branch name only. This allow for hierarchical branches e.g. topic branch 'topic/subtopic', separate remotes tracking branches e.g. 'refs/remotes/origin/HEAD', and discriminate between head (branch) and tag with the same name. Empty branch should be interpreted as HEAD. If pathname (the part after ':') ends with '/', we assume that pathname is name of directory, and we want to show contents of said directory using "tree" view. If pathname is empty, it is equivalent to '/' (top directory). If pathname (the part after ':') does not end with '/', we assume that pathname is name of file, and we show contents of said file using "blob_plain" view. Pathname is stripped of leading '/', so we can use ':/' to separate branch from pathname. The rationale behind support for PATH_INFO based URLs was to support project web pages for small projects: just create an html branch and then use an URL like http://nowhere.com/gitweb.cgi/project.git/html:/index.html The ':/' syntax allow for working links between .html files served in such way, e.g. <a href="main.html"> link inside "index.html" would get http://nowhere.com/gitweb.cgi/project.git/html:/main.html. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 16:49:31 UTC |
| 44d2775 | Jonas Fonseca | 20 September 2006, 10:23:41 UTC | gitk(1): mention --all Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 16:00:14 UTC |
| 45ad9b5 | Jonas Fonseca | 20 September 2006, 10:15:39 UTC | Fix trivial typos and inconsistencies in hooks documentation Pointed out by Alan Chandler. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 September 2006, 15:36:12 UTC |
