| e0b0830 | Markus Amsler | 12 October 2006, 22:19:35 UTC | git-imap-send: Strip smtp From_ header from imap message. Cyrus imap refuses messages with a 'From ' Header. [jc: Mike McCormack says this is fine with Courier as well.] Signed-off-by: Markus Amsler <markus.amsler@oribi.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 October 2006, 10:34:46 UTC |
| 17b96be | Andy Whitcroft | 17 October 2006, 18:08:08 UTC | add proper dependancies on the xdiff source We are not rebuilding the xdiff library when its header files change. Add dependancies for those to the main Makefile. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Acked-by: Ryan Anderson <ryan@google.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 October 2006, 20:07:13 UTC |
| 3453f86 | Junio C Hamano | 17 October 2006, 04:58:54 UTC | Merge branch 'maint' * maint: Fix hash function in xdiff library | 17 October 2006, 04:58:54 UTC |
| 9de0834 | Linus Torvalds | 17 October 2006, 02:58:54 UTC | Fix hash function in xdiff library Jim Mayering noticed that xdiff library took insanely long time when comparing files with many identical lines. This was because the hash function used in the library is broken on 64-bit architectures and caused too many collisions. http://thread.gmane.org/gmane.comp.version-control.git/28962/focus=28994 Acked-by: Davide Libenzi <davidel@xmaliserver.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 October 2006, 04:27:44 UTC |
| b32db4d | Petr Baudis | 16 October 2006, 01:00:37 UTC | svnimport: Fix broken tags being generated Currently git-svnimport generates broken tags missing the timespec in the 'tagger' line. This is a random stab at a minimal fix. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 October 2006, 05:36:35 UTC |
| 7cfb5f3 | Rene Scharfe | 15 October 2006, 12:02:18 UTC | Replace open-coded version of hash_sha1_file() Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 October 2006, 19:35:25 UTC |
| 972a915 | Rene Scharfe | 15 October 2006, 12:02:03 UTC | Make write_sha1_file_prepare() void Move file name generation from write_sha1_file_prepare() to the one caller that cares and make it a void function. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 October 2006, 19:35:07 UTC |
| 29f049a | Junio C Hamano | 15 October 2006, 06:37:41 UTC | Revert "move pack creation to version 3" This reverts commit 16854571aae6302f457c5fbee41ac64669b09595. Git as recent as v1.1.6 do not understand version 3 delta. v1.2.0 is Ok and I personally would say it is old enough, but the improvement between version 2 and version 3 delta is not bit enough to justify breaking older clients. We should resurrect this later, but when we do so we shold make it conditional. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 October 2006, 06:38:01 UTC |
| 0a24657 | Junio C Hamano | 15 October 2006, 01:25:28 UTC | Merge branch 'jc/http' * jc/http: Add WEBDAV timeout to http-fetch. | 15 October 2006, 01:25:28 UTC |
| ced78b3 | Yasushi SHOJI | 14 October 2006, 12:02:51 UTC | clone: the given repository dir should be relative to $PWD the repository argument for git-clone should be relative to $PWD instead of the given target directory. The old behavior gave us surprising success and you need a few minute to know why it worked. GIT_DIR is already exported so no need to cd into $D. And this makes $PWD for git-fetch-pack, which is the actual command to take the given repository dir, the same as git-clone. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 October 2006, 01:22:04 UTC |
| d988b82 | Johannes Schindelin | 10 October 2006, 22:33:28 UTC | cvsserver: fix "cvs diff" in a subdirectory Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 October 2006, 01:19:13 UTC |
| 0a7a9a1 | Johannes Schindelin | 10 October 2006, 22:20:43 UTC | cvsserver: Show correct letters for modified, removed and added files Earlier, cvsserver showed always an 'U', sometimes even without a space between the 'U' and the name. Now, the correct letter is shown, with a space. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 October 2006, 01:19:12 UTC |
| f7197df | Eric Wong | 14 October 2006, 22:48:35 UTC | git-svn: reduce memory usage for large commits apply_textdelta and send_stream can use a separate pool from the rest of the editor interface, so we'll use a separate SVN::Pool for them and clear the pool after each file is sent to SVN. This drastically reduces memory usage per-changeset committed, and makes large commits (and initial imports) of several thousand files possible. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 October 2006, 00:38:52 UTC |
| 6844fc8 | Christian Couder | 14 October 2006, 14:05:25 UTC | Fix tracing when GIT_TRACE is set to an empty string. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 October 2006, 19:07:05 UTC |
| 8f97778 | Rene Scharfe | 14 October 2006, 10:45:45 UTC | Make write_sha1_file_prepare() static There are no callers of write_sha1_file_prepare() left outside of sha1_file.c, so make it static. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 October 2006, 18:49:59 UTC |
| abdc3fc | Rene Scharfe | 14 October 2006, 10:45:36 UTC | Add hash_sha1_file() Most callers of write_sha1_file_prepare() are only interested in the resulting hash but don't care about the returned file name or the header. This patch adds a simple wrapper named hash_sha1_file() which does just that, and converts potential callers. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 October 2006, 18:49:52 UTC |
| ce91fc6 | Eric Wong | 14 October 2006, 09:02:37 UTC | git-svn: fix commits over svn+ssh:// Once a get_commit_editor has been called from an SVN session, RA layer operations are not allowed (well, unless you're using file:// or http(s)://). So we'll pass an alternate SVN::Ra object to our editor object for running 'check-path'. This should fix commits over svnserve (svn:// without ssh, too). Closes Debian bug #392702, thanks to Pierre Habouzit for reporting the bug. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 October 2006, 18:48:33 UTC |
| 4035b46 | Junio C Hamano | 13 October 2006, 21:20:27 UTC | t4015: work-around here document problem on Cygwin. Signed-off-by: Junio C Hamano <junio@twinsun.com> | 13 October 2006, 21:21:22 UTC |
| 23bed43 | Rene Scharfe | 12 October 2006, 16:26:34 UTC | Documentation: add missing second colons and remove a typo It takes two colons to mark text as item label. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 October 2006, 16:42:36 UTC |
| 2344d47 | Johannes Schindelin | 12 October 2006, 12:22:14 UTC | diff: fix 2 whitespace issues When whitespace or whitespace change was ignored, the function xdl_recmatch() returned memcmp() style differences, which is wrong, since it should return 0 on non-match. Also, there were three horrible off-by-one bugs, even leading to wrong hashes in the whitespace special handling. The issue was noticed by Ray Lehtiniemi. For good measure, this commit adds a test. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 October 2006, 16:30:14 UTC |
| 854de5a | Junio C Hamano | 12 October 2006, 09:57:39 UTC | apply --numstat -z: line termination fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 October 2006, 09:57:39 UTC |
| 83e9940 | Eric Wong | 12 October 2006, 01:19:55 UTC | git-svn: add a message encouraging use of SVN::* libraries I'm using svn 1.4.0-4 in Debian unstable and apparently there's a regression on the SVN side that prevents a symlink from becoming a regular file (which git supports, of course). It's not a noticeable regression for most people, but this broke the full-svn-tests target in t/Makefile for me. The SVN::* Perl libraries seem to have matured and improved over the past year, and git-svn has supported them for several months now, so with that I encourage all users to start using the SVN::* Perl libraries with git-svn. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 October 2006, 03:19:49 UTC |
| 14763e7 | Eric Wong | 11 October 2006, 23:16:02 UTC | commit: fix a segfault when displaying a commit with unreachable parents I was running git show on various commits found by fsck-objects when I found this bug. Since find_unique_abbrev() cannot find an abbreviation for an object not in the database, it will return NULL, which is bad to run strlen() on. So instead, we'll just display the unabbreviated sha1 that we referenced in the commit. I'm not sure that this is the best 'fix' for it because the commit I was trying to show was broken, but I don't think a program should segfault even if the user tries to do something stupid. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 October 2006, 01:10:38 UTC |
| b203b76 | Eric Wong | 11 October 2006, 21:53:36 UTC | git-svn: -h(elp) message formatting fixes 'graft-branches' is slightly longer than the rest of the commands, so the text was squished together in the formatted output. This patch just adds some more whitespace to make the text look more pleasant. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 October 2006, 22:24:18 UTC |
| e8f5d90 | Eric Wong | 11 October 2006, 21:53:35 UTC | Documentation/git-svn: document some of the newer features I've forgotten to document many of the features added along the way in the manpages. This fills in some holes in the documentation and adds updates some outdated information. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 October 2006, 22:24:15 UTC |
| 74a31a1 | Eric Wong | 11 October 2006, 18:53:22 UTC | git-svn: log command fixes Change the --verbose flag to more closely match svn. I was somehow under the impression that --summary included --raw diff output, but I was wrong. We now pass -r --raw --name-status as arguments if passed -v/--verbose. -r (recursive) is passed by default, since users usually want it, and accepting it causes difficulty with the -r<revision> option used by svn users. A --non-recursive switch has been added to disable this. Of course, --summary, --raw, -p and any other git-log options can still be passed directly (without --name-status). Also, several warnings about referencing undefined variables have been fixed. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 October 2006, 21:41:13 UTC |
| c35b96e | Eric Wong | 11 October 2006, 18:53:21 UTC | git-svn: multi-init saves and reuses --tags and --branches arguments This should make it much easier to track newly added tags and branches. Re-running multi-init without command-line arguments should now detect new-tags and branches. --trunk shouldn't change often, but running multi-init on it is now idempotent. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 October 2006, 21:41:11 UTC |
| 9ac13ec | Nicolas Pitre | 11 October 2006, 15:49:15 UTC | atomic write for sideband remote messages It has been a few times that I ended up with such a confusing display: |remote: Generating pack... |remote: Done counting 17 objects. |remote: Result has 9 objects. |remote: Deltifying 9 objects. |remote: 100% (9/9) done |remote: Unpacking 9 objects |Total 9, written 9 (delta 8), reused 0 (delta 0) | 100% (9/9) done The confusion can be avoided in most cases by writing the remote message in one go to prevent interleacing with local messages. The buffer declaration has been moved inside recv_sideband() to avoid extra string copies. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 October 2006, 18:13:01 UTC |
| 0503f9c | Junio C Hamano | 11 October 2006, 07:57:17 UTC | git.spec.in: perl subpackage is installed in perl_vendorlib not vendorarch Signed-off-by: Junio C Hamano <junio@hera.kernel.org> | 11 October 2006, 07:57:17 UTC |
| a057f80 | Junio C Hamano | 11 October 2006, 06:00:29 UTC | git-pull: we say commit X, not X commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 October 2006, 06:00:29 UTC |
| 9861718 | Junio C Hamano | 11 October 2006, 05:29:02 UTC | git-fetch --update-head-ok typofix Martin Waitz noticed that one of the case arms had an impossible choice. It turns out that what it was checking was redundant and the typo did not have any effect. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 October 2006, 05:29:02 UTC |
| e88ee29 | Martin Waitz | 10 October 2006, 19:16:25 UTC | paginate git-diff by default | 11 October 2006, 00:58:34 UTC |
| 4e27fb0 | Nicolas Pitre | 06 October 2006, 19:39:09 UTC | add commit count options to git-shortlog This patch does 3 things: 1) Output the number of commits along with the name for each author (nice to know for long lists spending more than a screen worth of commit lines). 2) Provide a switch (-n) to sort authors according to their number of commits instead of author alphabetic order. 3) Provide a switch (-s) to supress commit lines and only keep a summary of authors and the number of commits for each of them. And for good measure a short usage is displayed with -h. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 October 2006, 03:23:09 UTC |
| 96779be | Junio C Hamano | 10 October 2006, 02:19:45 UTC | Fix git-revert Defaulting to $replay for the sake of fixing cherry-pick was not done conditionally, which broke git-revert. Noticed by Luben. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 October 2006, 02:19:45 UTC |
| adc446f | Junio C Hamano | 08 October 2006, 19:56:19 UTC | Add WEBDAV timeout to http-fetch. Sean <seanlkml@sympatico.ca> writes: > On Sat, 07 Oct 2006 21:52:02 -0700 > Junio C Hamano <junkio@cox.net> wrote: > >> Using DAV, if it works with the server, has the advantage of not >> having to keep objects/info/packs up-to-date from repository >> owner's point of view. But the repository owner ends up keeping >> up-to-date as a side effect of keeping info/refs up-to-date >> anyway (as I do not see a code to read that information over >> DAV), so there is no point doing this over DAV in practice. >> >> Perhaps we should remove call to remote_ls() from >> fetch_indices() unconditionally, not just protected with >> NO_EXPAT and be done with it? > > That makes a lot of sense. A server really has to always provide > a objects/info/packs anyway, just to be fetchable today by clients > that are compiled with NO_EXPAT. And even for an isolated group where everybody knows that everybody else runs DAV-enabled clients, they need info/refs prepared for ls-remote and git-fetch script, which means you will run update-server-info to keep objects/info/packs up to date. Nick, do you see holes in my logic? -- >8 -- http-fetch.c: drop remote_ls() While doing remote_ls() over DAV potentially allows the server side not to keep objects/info/pack up-to-date, misconfigured or buggy servers can silently ignore or not to respond to DAV requests and makes the client hang. The server side (unfortunately) needs to run git-update-server-info even if remote_ls() removes the need to keep objects/info/pack file up-to-date, because the caller of git-http-fetch (git-fetch) and other clients that interact with the repository (e.g. git-ls-remote) need to read from info/refs file (there is no code to make that unnecessary by using DAV yet). Perhaps the right solution in the longer-term is to make info/refs also unnecessary by using DAV, and we would want to resurrect the code this patch removes when we do so, but let's drop remote_ls() implementation for now. It is causing problems without really helping anything yet. git will keep it for us until we need it next time. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 October 2006, 00:13:15 UTC |
| 9a7a62f | Jakub Narebski | 06 October 2006, 10:31:05 UTC | gitweb: Cleanup Git logo and Git logo target generation Rename $githelp_url and $githelp_label to $logo_url and $logo_label to be more obvious what they refer to; while at it add commented out previous contents (git documentation at kernel.org). Add comment about logo size. Use $cgi->a(...) to generate Git logo link; it automatically escapes attribute values when it is needed. Escape href attribute using esc_url instead of (incorrect!) esc_html. Move styling of git logo <img> element from "style" attribute to CSS via setting class to "logo". Perhaps we should set it by id rather than by class. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 October 2006, 20:36:58 UTC |
| 9cb90b8 | Rene Scharfe | 08 October 2006, 13:44:50 UTC | git-tar-tree: don't RUN_SETUP Noted by Jiri Slaby, git-tar-tree --remote doesn't need to be run from inside of a git archive. Since git-tar-tree is now only a wrapper for git-archive, which calls setup_git_directory() as needed, we should drop the flag RUN_SETUP. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 October 2006, 19:43:07 UTC |
| 7a0cf2d | Martin Waitz | 07 October 2006, 19:27:46 UTC | test-lib: separate individual test better in verbose mode. When running tests with --verbose it is difficult to see where one test starts and where it ends because everything is printed in one big lump. Fix that by printing one single newline between each test. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 October 2006, 04:33:48 UTC |
| 3de63c3 | Martin Waitz | 07 October 2006, 19:07:40 UTC | git-commit: fix coding style. git-commit.sh was using a mixture of spaces and tabs for indentation. This is changed to one tab per indentation level. No code changes. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 October 2006, 04:28:17 UTC |
| a144154 | Petr Baudis | 06 October 2006, 16:59:33 UTC | gitweb: [commit view] Do not suppress commitdiff link in root commit There's no reason for that, the commitdiff view is meaningful for the root commit as well and we link to it everywhere else. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 October 2006, 09:19:17 UTC |
| 7e0fe5c | Petr Baudis | 06 October 2006, 16:55:04 UTC | gitweb: Handle commits with empty commit messages more reasonably Currently those look very weird, you can't get easily at the commit view etc. This patch makes their title '(no commit message)'. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 October 2006, 09:16:33 UTC |
| 689b7f5 | Petr Baudis | 06 October 2006, 16:00:17 UTC | gitweb: Separate (new) and (deleted) in commitdiff by a space Currently it's pasted to the sha1 of the blob and looks ugly. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 October 2006, 09:16:22 UTC |
| 55ff35c | Petr Baudis | 06 October 2006, 13:57:52 UTC | Show snapshot link in shortlog only if have_snapsho Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 October 2006, 08:38:46 UTC |
| 847abc0 | Yasushi SHOJI | 01 October 2006, 21:21:33 UTC | gitweb: refactor decode() for utf8 conversion we already had a few place using decode() to convert perl internal encode to utf8. added a new thin wrapper to do just that. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 October 2006, 09:56:50 UTC |
| 3df1967 | Dennis Stosberg | 06 October 2006, 09:15:03 UTC | Add default values for --window and --depth to the docs Currently, you actually have to read the source to find out the default values. While at it, fix two typos and suggest that these options actually take a parameter in git-pack-objects.txt. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 October 2006, 09:53:39 UTC |
| abd6970 | Junio C Hamano | 06 October 2006, 00:54:14 UTC | cherry-pick: make -r the default And introduce -x to expose (possibly) private commit object name for people who cherry-pick between public branches. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 October 2006, 00:54:14 UTC |
| bc108f6 | Junio C Hamano | 05 October 2006, 23:36:15 UTC | git-send-email: avoid uninitialized variable warning. The code took length of $reply_to when it was not even defined, causing -w to warn. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2006, 23:36:15 UTC |
| 51a7c66 | Junio C Hamano | 23 September 2006, 19:36:01 UTC | gitweb: Make the Git logo link target to point to the homepage It provides more useful information for causual Git users than the Git docs (especially about where to get Git and such). People can override with GITWEB_CONFIG if they want to. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Petr Baudis <pasky@suse.cz> | 05 October 2006, 22:02:13 UTC |
| db94b41 | Luben Tuikov | 05 October 2006, 20:30:31 UTC | gitweb: blame: Minimize vertical table row padding Minimize vertical table row padding for blame only. I discovered this while having the browser's blame output right next to my editor's window, only to notice how much vertically stretched the blame output was. Blame most likely shows source code and is in this way more "spartan" than the rest of the tables gitweb shows. This patch makes the blame table more vertically compact, thus being closer to what you'd see in your editor's window, as well as reusing more window estate to show more information (which in turn minimizes scrolling). Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2006, 21:21:12 UTC |
| 6e0e92f | Luben Tuikov | 05 October 2006, 19:22:57 UTC | gitweb: Do not print "log" and "shortlog" redundantly in commit view Do not print "log" and "shortlog" redundantly in commit view. This is passed into the $extra argument of git_print_page_nav from git_commit, but git_print_page_nav prints "log" and "shortlog" already with the same head. Noticed by Junio. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2006, 20:05:00 UTC |
| 13f8e0b | Alexandre Julliard | 05 October 2006, 09:30:44 UTC | vc-git.el: Switch to using git-blame instead of git-annotate. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2006, 16:09:13 UTC |
| c530c5a | Alexandre Julliard | 05 October 2006, 09:29:57 UTC | git.el: Fixed inverted "renamed from/to" message. The deleted file should be labeled "renamed to" and the added file "renamed from", not the other way around (duh!) Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2006, 09:31:01 UTC |
| 9ccb64c | Junio C Hamano | 05 October 2006, 09:26:12 UTC | tar-tree deprecation: we eat our own dog food. It is silly to keep using git-tar-tree in dist target when the command gives a big deprecation warning when called. Instead, use "git-archive --format=tar" which we recommend to our users. Update gitweb's snapshot feature to use git-archive for the same reason. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2006, 09:26:12 UTC |
| 6030649 | Franck Bui-Huu | 05 October 2006, 08:42:16 UTC | Add git-upload-archive to the main git man page Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 October 2006, 08:57:18 UTC |
| c065b6e | Martin Waitz | 03 October 2006, 16:38:25 UTC | git-commit: cleanup unused function. The report() function is not used anymore. Kill it. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 October 2006, 06:58:38 UTC |
| 281e67d | Alan Chandler | 03 October 2006, 20:11:25 UTC | Fix usage string to match that given in the man page Still not managed to understand git-send-mail sufficiently well to not accidently miss of this list when I sending it to Junio Signed-off-by: Alan Chandler <alan@chandlerfamily.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 October 2006, 06:58:38 UTC |
| 604cb21 | Alan Chandler | 03 October 2006, 21:48:46 UTC | Update the gitweb/README file to include setting the GITWEB_CONFIG environment Signed-off-by: Alan Chandler <alan@chandlerfamily.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 October 2006, 06:58:38 UTC |
| 128eead | Martin Waitz | 03 October 2006, 08:03:28 UTC | gitweb: document webserver configuration for common gitweb/repo URLs. Add a small apache configuration which shows how to use apache to put gitweb and GIT repositories at the same URL. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2006, 08:09:56 UTC |
| e70866f | Luben Tuikov | 02 October 2006, 21:54:53 UTC | gitweb: Escape ESCAPE (\e) character Take a look at commit 20a3847d8a5032ce41f90dcc68abfb36e6fee9b1 using gitweb before this patch. This patch fixes this. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2006, 08:04:41 UTC |
| 54bd255 | Junio C Hamano | 03 October 2006, 05:52:57 UTC | escape tilde in Documentation/git-rev-parse.txt Fixes a failure to build the git-rev-parse manpage, seen with asciidoc 8.0.0 We would love to use nicer quoting $$~$$ but alas asciidoc 7 does not know about it. So use asciidoc.conf and define {tilde} to be ~. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de> | 03 October 2006, 08:04:19 UTC |
| b599dee | Robin Rosenberg | 03 October 2006, 00:02:15 UTC | Error in test description of t1200-tutorial Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2006, 08:02:27 UTC |
| cb626bc | Dennis Stosberg | 02 October 2006, 17:23:53 UTC | lock_ref_sha1_basic does not remove empty directories on BSD lock_ref_sha1_basic relies on errno beeing set to EISDIR by the call to read() in resolve_ref() to detect directories. But calling read() on a directory under NetBSD returns EPERM, and even succeeds for local filesystems on FreeBSD. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 October 2006, 08:02:27 UTC |
| f596157 | Junio C Hamano | 02 October 2006, 07:47:32 UTC | Merge branch 'maint' * maint: git-push: .git/remotes/ file does not require SP after colon git-mv: invalidate the removed path properly in cache-tree | 02 October 2006, 07:47:32 UTC |
| 6fe5b7f | Junio C Hamano | 02 October 2006, 07:43:52 UTC | git-push: .git/remotes/ file does not require SP after colon Although most people would have one after colon if only for readability, we never required it in git-parse-remote, so let's not require one only in git-push. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2006, 07:43:52 UTC |
| 4fddf57 | Junio C Hamano | 02 October 2006, 05:22:07 UTC | git-mv: invalidate the removed path properly in cache-tree The command updated the cache without invalidating the cache tree entries while removing an existing entry. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2006, 06:32:39 UTC |
| 7c2738c | Junio C Hamano | 02 October 2006, 04:41:46 UTC | Makefile: install and clean merge-recur, still. We advertised git-merge-recur for some time, and we planned to support it for one release after we made it the 'recursive'. However we forgot to install it nor have "make clean" clean it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 October 2006, 04:41:46 UTC |
| 1965efb | Junio C Hamano | 01 October 2006, 10:08:55 UTC | GIT 1.4.3-rc1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 October 2006, 10:08:55 UTC |
| 284fe4b | Junio C Hamano | 01 October 2006, 08:10:03 UTC | Merge branch 'maint' * maint: git-diff -B output fix. Fix git-am safety checks Fix duplicate xmalloc in builtin-add | 01 October 2006, 08:10:03 UTC |
| 69de8cc | Junio C Hamano | 01 October 2006, 06:38:24 UTC | Merge branch 'jc/gitpm' * jc/gitpm: (52 commits) Remove -fPIC which was only needed for Git.xs Git.pm: Kill Git.xs for now Revert "Make it possible to set up libgit directly (instead of from the environment)" Revert "Git.pm: Introduce fast get_object() method" Revert "Convert git-annotate to use Git.pm" Fix compilation with Sun CC pass DESTDIR to the generated perl/Makefile Eliminate Scalar::Util usage from private-Error.pm Convert git-annotate to use Git.pm Git.pm: Introduce fast get_object() method Make it possible to set up libgit directly (instead of from the environment) Work around sed and make interactions on the backslash at the end of line. Git.pm: Introduce ident() and ident_person() methods Convert git-send-email to use Git.pm Git.pm: Add config() method Use $GITPERLLIB instead of $RUNNING_GIT_TESTS and centralize @INC munging INSTALL: a tip for running after building but without installing. Perly Git: make sure we do test the freshly built one. Git.pm: Don't #define around die Git.xs: older perl do not know const char * ... | 01 October 2006, 06:38:24 UTC |
| dd0c367 | Junio C Hamano | 01 October 2006, 04:29:18 UTC | Merge branch 'jc/diff-stat' * jc/diff-stat: diff --stat: ensure at least one '-' for deletions, and one '+' for additions diff --stat=width[,name-width]: allow custom diffstat output width. diff --stat: color output. diff --stat: allow custom diffstat output width. | 01 October 2006, 04:29:18 UTC |
| 99692dc | Junio C Hamano | 01 October 2006, 04:27:51 UTC | Merge branch 'lt/web' * lt/web: gitweb: tree view: hash_base and hash are now context sensitive gitweb: History: blob and tree are first, then commitdiff, etc gitweb: Remove redundant "commit" from history gitweb: Don't use quotemeta on internally generated strings gitweb: Add snapshot to shortlog gitweb: Factor out gitweb_have_snapshot() gitweb: Remove redundant "commit" link from shortlog gitweb: "alternate" starts with shade (i.e. 1) gitweb: Add history and blame to git_difftree_body() gitweb: Remove excessively redundant entries from git_difftree_body Revert "gitweb: extend blame to show links to diff and previous" gitweb: Quote filename in HTTP Content-Disposition: header gitweb: Add git_url subroutine, and use it to quote full URLs gitweb: Split validate_input into validate_pathname and validate_refname gitweb: Use "return" instead of "return undef" for some subs gitweb: Strip trailing slashes from $path in git_get_hash_by_path gitweb: extend blame to show links to diff and previous gitweb: Remove redundant "tree" link gitweb: tree view: eliminate redundant "blob" | 01 October 2006, 04:27:51 UTC |
| 6f7ea5f | Luben Tuikov | 29 September 2006, 16:57:43 UTC | gitweb: tree view: hash_base and hash are now context sensitive In tree view, by default, hash_base is HEAD and hash is the entry equivalent. Else the user had selected a hash_base or hash, say by clicking on a revision or commit, in which case those values are used. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2006, 07:23:23 UTC |
| 82ca505 | Junio C Hamano | 29 September 2006, 09:06:24 UTC | git-diff -B output fix. Geert noticed that complete rewrite diff missed the usual a/ and b/ leading paths. Pickaxe says it never worked, ever. Embarrassing. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from bc1a5807575b2f34538d4158834da6524a4fc1f7 commit) | 30 September 2006, 05:32:16 UTC |
| 4839bd8 | Santi Béjar | 29 September 2006, 18:05:40 UTC | fetch: Reset remote refs list each time fetch_main is called This prevents the fetch of the heads again in the second call of fetch_main. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2006, 01:54:13 UTC |
| f7661ce | Junio C Hamano | 29 September 2006, 07:34:51 UTC | Remove -fPIC which was only needed for Git.xs The distinction between BASIC_ vs ALL_ is still kept, since it is not Git.xs specific -- we could face the same issue when we do other language bindings (e.g. Python). Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 September 2006, 01:52:38 UTC |
| 18b633c | Linus Torvalds | 29 September 2006, 19:36:13 UTC | Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34 It just simplifies the whole thing to say "hour = (hour % 12) + X" where X is 12 for PM and 0 for AM. It also fixes the "exact date" parsing, which didn't parse AM at all, and as such would do the same "12:30 AM" means "12:30 24-hour-format" bug. Of course, I hope that no exact dates use AM/PM anyway, but since we support the PM format, let's just get it right. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 20:04:09 UTC |
| bc1a580 | Junio C Hamano | 29 September 2006, 09:06:24 UTC | git-diff -B output fix. Geert noticed that complete rewrite diff missed the usual a/ and b/ leading paths. Pickaxe says it never worked, ever. Embarrassing. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 09:06:24 UTC |
| 21ff2bd | Robin Rosenberg | 28 September 2006, 23:28:55 UTC | Make cvsexportcommit remove files. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 07:51:05 UTC |
| 3ed74e6 | Johannes Schindelin | 28 September 2006, 15:37:39 UTC | diff --stat: ensure at least one '-' for deletions, and one '+' for additions The number of '-' and '+' is still linear. The idea is that scaled-length := floor(a * length + b) with the following constraints: if length == 1, scaled-length == 1, and the combined length of plusses and minusses should not be larger than the width by a small margin. Thus, a + b == 1 and a * max_plusses + b + a * max_minusses + b = width + 1 The solution is a * x + b = ((width - 1) * (x - 1) + max_change - 1) / (max_change - 1) Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 05:32:53 UTC |
| 5c5b2ea | Linus Torvalds | 28 September 2006, 22:07:16 UTC | diff --stat=width[,name-width]: allow custom diffstat output width. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 05:27:29 UTC |
| 6d81c5a | Luben Tuikov | 29 September 2006, 00:21:07 UTC | gitweb: History: blob and tree are first, then commitdiff, etc Reorder link display in history to be consistent with other list displays: log, shortlog, etc. We now display: blob | commitdiff blob | commitdiff | diff_to_current and tree | commitdiff Instead of the old history format where "blob" and "tree" are between "commitdiff" and "diff_to_current" if present/ applicable. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 02:04:01 UTC |
| e46b3c0 | Luben Tuikov | 29 September 2006, 00:20:23 UTC | gitweb: Remove redundant "commit" from history Remove redundant "commit" from history -- it can be had by clicking on the title of the commit. This commit makes visualization consistent with shortlog, log, etc. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 02:03:28 UTC |
| 3ea099d | Sasha Khapyorsky | 29 September 2006, 00:10:44 UTC | http/ftp: optionally ask curl to not use EPSV command If http.noEPSV config variable is defined and true, or if GIT_CURL_FTP_NO_EPSV environment variable is defined, disable using of EPSV ftp command (PASV will be used instead). This is helpful with some "poor" ftp servers which does not support EPSV mode. Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 02:02:46 UTC |
| a2a3bf7 | Luben Tuikov | 28 September 2006, 23:51:43 UTC | gitweb: Don't use quotemeta on internally generated strings Do not use quotemeta on internally generated strings such as filenames of snapshot, blobs, etc. quotemeta quotes any characters not matching /A-Za-z_0-9/. Which means that we get strings like this: before: linux\-2\.6\.git\-5c2d97cb31fb77981797fec46230ca005b865799\.tar\.gz after: linux-2.6.git-5c2d97cb31fb77981797fec46230ca005b865799.tar.gz This patch fixes this. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:58:16 UTC |
| ba6ef81 | Luben Tuikov | 28 September 2006, 23:50:09 UTC | gitweb: Add snapshot to shortlog Add snapshot to each commit-row of shortlog. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:57:00 UTC |
| de9272f | Luben Tuikov | 28 September 2006, 23:49:21 UTC | gitweb: Factor out gitweb_have_snapshot() Create gitweb_have_snapshot() which returns true of snapshot is available and enabled, else false. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:56:35 UTC |
| d1d866e | Luben Tuikov | 28 September 2006, 23:48:40 UTC | gitweb: Remove redundant "commit" link from shortlog Remove the redundant "commit" link from shortlog. It can be had by simply clicking on the entry title of the row. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:52:36 UTC |
| 6dd36ac | Luben Tuikov | 28 September 2006, 23:47:50 UTC | gitweb: "alternate" starts with shade (i.e. 1) When displaying a list of rows (difftree, shortlog, etc), the first entry is now printed shaded, i.e. alternate is initialized to 1, as opposed to non-shaded (alternate initialized to 0). This solves the problem when there is only one row to display -- it is displayed shaded to visually indicate that it is "active", part of a "list", etc. (Compare this to the trivial case of more than one entry, where the rows have alternating shade, thus suggesting being part of a "list" of "active" entries, etc.) Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:52:26 UTC |
| 77e565d | Matthias Lederhofer | 28 September 2006, 19:55:35 UTC | git-format-patch: fix bug using -o in subdirectories This was introduced by me in commit v1.4.2.1-gc08e524. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:26:09 UTC |
| a283837 | Alex Riesen | 28 September 2006, 19:12:55 UTC | do not discard constness in interp_set_entry value argument Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:25:36 UTC |
| 393d340 | Linus Torvalds | 28 September 2006, 19:14:27 UTC | Fix approxidate() to understand more extended numbers You can now say "5:35 PM yesterday", and approxidate() gets the right answer. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:25:25 UTC |
| e92a54d | Linus Torvalds | 28 September 2006, 19:12:28 UTC | Clean up approxidate() in preparation for fixes Our approxidate cannot handle simple times like "5 PM yesterday", and to fix that, we will need to add some logic for number handling. This just splits that out into a function of its own (the same way the _real_ date parsing works). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:23:25 UTC |
| 100690b | Alex Riesen | 28 September 2006, 18:48:14 UTC | fix daemon.c compilation for NO_IPV6=1 Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 September 2006, 01:22:37 UTC |
| 695dffe | Johannes Schindelin | 28 September 2006, 10:00:35 UTC | daemon: default to 256 for HOST_NAME_MAX if it is not defined Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 September 2006, 16:14:09 UTC |
| 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 |
