| af8ffbe | Shawn O. Pearce | 05 November 2006, 07:28:25 UTC | Remove SIMPLE_PROGRAMS and make git-daemon a normal program. Some platforms (Solaris in particular) appear to require -lz as part of the link line for git-daemon, due to it linking against sha1_file.o and that module requiring inflate/deflate support. So its time to retire SIMPLE_PROGRAMS and move its last remaining member into the standard PROGRAMS list, allowing it to link against all libraries used by the rest of Git. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:41:05 UTC |
| bf8675d | Shawn O. Pearce | 05 November 2006, 07:27:07 UTC | Use ULONG_MAX rather than implicit cast of -1. At least one (older) version of the Solaris C compiler won't allow 'unsigned long x = -1' without explicitly casting -1 to a type of unsigned long. So instead use ULONG_MAX, which is really the correct constant anyway. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:41:02 UTC |
| 6f9f3b2 | Junio C Hamano | 04 November 2006, 10:28:53 UTC | apply: handle "traditional" creation/deletion diff correctly. We deduced a GNU diff output that does not use /dev/null convention as creation (deletion) diff correctly by looking at the lack of context and deleted lines (added lines), but forgot to reset the new (old) name field properly. This was a regression when we added a workaround for --unified=0 insanity. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 November 2006, 10:35:17 UTC |
| ba158a3 | Andy Parkins | 02 November 2006, 11:11:56 UTC | git-clone documentation didn't mention --origin as equivalent of -o Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 02:03:47 UTC |
| 44b27ec | Andy Parkins | 02 November 2006, 11:12:44 UTC | Minor grammar fixes for git-diff-index.txt "what you are going to commit is" doesn't need the "is" and does need a comma. "can trivially see" is an unecessary split infinitive and "easily" is a more appropriate adverb. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 November 2006, 02:03:31 UTC |
| 866cae0 | Johannes Schindelin | 03 November 2006, 02:02:17 UTC | link_temp_to_file: call adjust_shared_perm() only when we created the directory | 03 November 2006, 02:02:17 UTC |
| e23ed9a | Nicolas Pitre | 01 November 2006, 22:34:47 UTC | pack-objects doesn't create random pack names Documentation for pack-objects seems to be out of date in this regard. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 01 November 2006, 23:09:39 UTC |
| 91c23e4 | Junio C Hamano | 31 October 2006, 23:56:58 UTC | link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 October 2006, 23:56:58 UTC |
| 9dad9d2 | Junio C Hamano | 31 October 2006, 02:58:03 UTC | revision traversal: --unpacked does not limit commit list anymore. This is needed to gain smaller latency back. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 October 2006, 02:58:03 UTC |
| 744f498 | Jan Harkes | 31 October 2006, 01:37:49 UTC | Continue traversal when rev-list --unpacked finds a packed commit. When getting the list of all unpacked objects by walking the commit history, we would stop traversal whenever we hit a packed commit. However the fact that we found a packed commit does not guarantee that all previous commits are also packed. As a result the commit walkers did not show all reachable unpacked objects. Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 October 2006, 01:47:36 UTC |
| 173a9cb | Edgar Toernig | 31 October 2006, 01:39:17 UTC | Use memmove instead of memcpy for overlapping areas Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 October 2006, 01:39:17 UTC |
| 8d63d95 | Junio C Hamano | 31 October 2006, 00:07:54 UTC | quote.c: ensure the same quoting across platforms. We read a byte from "char *" and compared it with ' ' to decide if it needs quoting to protect textual output. With a platform where char is unsigned char that would give different result. Signed-off-by: Junio C Hamano <junkio@cox.net> | 31 October 2006, 00:07:54 UTC |
| 4903161 | Junio C Hamano | 30 October 2006, 23:29:53 UTC | Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif" Otherwise "make CFLAGS=-DDEBUG=1" is cumbersome to run. Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 October 2006, 23:29:53 UTC |
| d6b7e0b | Jakub Narebski | 26 October 2006, 10:26:44 UTC | gitweb: Check git base URLs before generating URL from it Check if each of git base URLs in @git_base_url_list is true before appending "/$project" to it to generate project URL. This fixes the error that for default configuration for gitweb in Makefile, with GITWEB_BASE_URL empty (and "++GITWEB_BASE_URL++" being "" in gitweb.cgi), we had URL of "/$project" in the summary view. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 October 2006, 09:12:56 UTC |
| f8a5da6 | Christian Couder | 27 October 2006, 05:00:57 UTC | Documentation: add git in /etc/services. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 October 2006, 09:10:52 UTC |
| e2b1d1c | Christian Couder | 27 October 2006, 04:59:18 UTC | Documentation: add upload-archive service to git-daemon. This patch minimaly documents the upload-archive service, hoping that someone with better knowledge will improve upon. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 October 2006, 09:10:41 UTC |
| a8ebdb9 | Rene Scharfe | 26 October 2006, 21:32:41 UTC | git-cherry: document limit and add diagram This patch adds the diagram from the long usage string of git-cherry to its documentation, and documents the third option. I changed some of the + to - in order to save the reader from wondering where they might fit into the picture. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 October 2006, 01:53:18 UTC |
| ac1a1f9 | Junio C Hamano | 27 October 2006, 01:45:52 UTC | Merge branch 'jc/combined' into maint * jc/combined: combine-diff: honour --no-commit-id combine-diff: fix hunk_comment_line logic. combine-diff: a few more finishing touches. | 27 October 2006, 01:45:52 UTC |
| fb8e23f | Jakub Narebski | 26 October 2006, 20:21:02 UTC | diff-format.txt: Correct information about pathnames quoting in patch format Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 October 2006, 01:34:18 UTC |
| 4415278 | Junio C Hamano | 26 October 2006, 09:05:59 UTC | combine-diff: honour --no-commit-id Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 October 2006, 09:05:59 UTC |
| 7a8ac59 | Junio C Hamano | 26 October 2006, 09:05:05 UTC | combine-diff: fix hunk_comment_line logic. We forgot that the last element of sline[] is a sentinel without the actual line. *BLUSH* Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 October 2006, 09:05:05 UTC |
| d5f6a01 | Junio C Hamano | 26 October 2006, 07:05:04 UTC | combine-diff: a few more finishing touches. "new file" and "deleted file" were already reported in the original code, but the logic was not as transparent as it could have. This uses a few variables and more comments to clarify the flow. The rule is: (1) if a path exists in the merge result when no parent had it, we report "new" (otherwise it came from the parents, as opposed to have added by the evil merge). (2) if the path does not exist in the merge result, it is "deleted". Since we can say "new" and "deleted", there is no reason not to follow the /dev/null convention. This fixes it. Appending function name after @@@ ... @@@ is trivial, so implement it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 October 2006, 08:18:49 UTC |
| 0ac3056 | Junio C Hamano | 26 October 2006, 08:15:42 UTC | Documentation: clarify refname disambiguation rules. Nobody should create ambiguous refs (i.e. have tag "foobar" and branch "foobar" at the same time) that need to be disambiguated with these rules to keep sanity, but the rules are there so document them. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 October 2006, 08:15:42 UTC |
| 0074aba | Jakub Narebski | 26 October 2006, 03:44:49 UTC | diff-format.txt: Combined diff format documentation supplement Update example combined diff format to the current version $ git diff-tree -p -c fec9ebf16c948bcb4a8b88d0173ee63584bcde76 and provide complete first chunk in example. Document combined diff format headers: how "diff header" look like, which of "extended diff headers" are used with combined diff and how they look like, differences in two-line from-file/to-file header from non-combined diff format, chunk header format. It should be noted that combined diff format was designed for quick _content_ inspection and renames would work correctly to pick which blobs from each tree to compare but otherwise not reflected in the output (the pathnames are not shown). [jc: with minimum copyediting] Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 October 2006, 07:15:01 UTC |
| d9c04ba | Christian Couder | 26 October 2006, 04:33:07 UTC | Remove --syslog in git-daemon inetd documentation examples. It is useless because --inetd implies --syslog. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 October 2006, 05:35:20 UTC |
| 119550a | J. Bruce Fields | 26 October 2006, 02:43:47 UTC | Documentation: updates to "Everyday GIT" Remove the introduction: I think it should be obvious why we have this. (And if it isn't obvious then we've got other problems.) Replace reference to git whatchanged by git log. Miscellaneous style and grammar fixes. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 October 2006, 03:01:57 UTC |
| 84ab7b6 | Junio C Hamano | 25 October 2006, 21:38:24 UTC | Documentation/SubmittingPatches: 3+1 != 6 Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 October 2006, 21:38:24 UTC |
| 70da769 | Petr Baudis | 25 October 2006, 00:28:55 UTC | xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines This removes the '#' and '(' tests and adds a '$' test instead although I have no idea what it is actually good for - but hey, if that's what GNU diff does... Pasky only went and did as Junio sayeth. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 October 2006, 19:57:33 UTC |
| 6e7d76b | Junio C Hamano | 25 October 2006, 06:14:30 UTC | Update cherry documentation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 October 2006, 19:56:37 UTC |
| d47107d | Junio C Hamano | 25 October 2006, 18:33:08 UTC | Refer to git-rev-parse:Specifying Revisions from git.txt The brief list given in "Symbolic Identifiers" section of the main documentation is good enough for overview, but help the reader to find a more comrehensive list as needed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 October 2006, 18:33:08 UTC |
| ddaf731 | Tuncer Ayaz | 25 October 2006, 10:03:06 UTC | git-fetch.sh printed protocol fix We have supported https:// protocol for some time and in 1.4.3 added ftp:// protocol. The transfer were still reported to be over http. [jc: Tuncer used substring parameter substitution ${remote%%:*} but I am deferring it to a later day. We should replace colon-expr with substring substitution after everybody's shell can grok it someday, but we are not in a hurry. ] Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 October 2006, 18:26:48 UTC |
| a4e3bdd | Junio C Hamano | 25 October 2006, 06:55:46 UTC | RPM package re-classification. Grabbing anything that had *arch* in its name into git-arch package was a wrong idea and we lost git-archive from git-core by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net> | 25 October 2006, 07:58:33 UTC |
| 04d2445 | Junio C Hamano | 24 October 2006, 08:29:27 UTC | Documentation: note about contrib/. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 October 2006, 22:16:38 UTC |
| 9ffd652 | Eric Wong | 24 October 2006, 09:50:37 UTC | git-svn: fix symlink-to-file changes when using command-line svn 1.4.0 I incorrectly thought this was hopelessly broken in svn 1.4.0, but now it's just broken in that the old method didn't work. It looks like svn propdel and svn propset must be used now and the (imho) more obvious svn rm --force && svn add no longer works. "make -C t full-svn-test" should now work. Signed-off-by: Eric Wong <normalperson@yhbt.net> Acked-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 October 2006, 22:15:51 UTC |
| 2eb10ac | Gerrit Pape | 24 October 2006, 20:00:37 UTC | Set $HOME for selftests Set HOME environment variable to test trash directory and export for selftests. This fixes the git-svn selftests with nonexistent or not readable home, as found in at least one automated build system: http://buildd.debian.org/fetch.cgi?&pkg=git-core&ver=1%3A1.4.2.3-2&arch=alpha&stamp=1161537466&file=log Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 October 2006, 21:38:46 UTC |
| a153adf | Petr Baudis | 24 October 2006, 00:39:14 UTC | gitweb: Fix setting $/ in parse_commit() If the commit couldn't have been read, $/ wasn't restored to \n properly, causing random havoc like git_get_ref_list() returning the ref names with trailing \n. Aside of potential confusion in the body of git_search(), no other $/ surprises are hopefully hidden in the code. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 October 2006, 02:21:05 UTC |
| 83543a2 | Junio C Hamano | 24 October 2006, 01:26:05 UTC | daemon: do not die on older clients. In the older times, the clients did not say which host they were trying to connect, and the code we recently added did not quite handle the older clients correctly. Noticed by Simon Arlott. Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 October 2006, 01:26:05 UTC |
| 67aef03 | Jim Meyering | 23 October 2006, 20:22:25 UTC | xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header. This removes trailing blanks from git-generated diff headers the same way a similar patch did that for GNU diff: http://article.gmane.org/gmane.comp.gnu.utils.bugs/13839 That is, it removes trailing blanks on the hunk header line that shows the function name. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 October 2006, 21:33:54 UTC |
| 810799e | Jim Meyering | 23 October 2006, 13:59:48 UTC | git-clone: honor --quiet I noticed that a cron-launched "git-clone --quiet" was generating progress output to standard error -- and thus always spamming me. The offending output was due to git-clone invoking git-read-tree with its undocumented -v option. This change turns off "-v" for --quiet. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 October 2006, 21:31:52 UTC |
| 0cc6d34 | Santi Béjar | 23 October 2006, 16:42:14 UTC | Documentation for the [remote] config Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 October 2006, 20:19:49 UTC |
| 2bb10fe | Alexandre Julliard | 23 October 2006, 16:26:39 UTC | prune-packed: Fix uninitialized variable. The dryrun variable was made local instead of static by the previous commit, and local variables aren't initialized to zero. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 October 2006, 20:19:18 UTC |
| 0abc026 | Junio C Hamano | 23 October 2006, 03:28:10 UTC | pager: default to LESS=FRSX not LESS=FRS Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 October 2006, 03:28:10 UTC |
| 2eb53e6 | J. Bruce Fields | 22 October 2006, 23:01:23 UTC | Make prune also run prune-packed Both the git-prune manpage and everday.txt say that git-prune should also prune unpacked objects that are also found in packs, by running git prune-packed. Junio thought this was "a regression when prune was rewritten as a built-in." So modify prune to call prune-packed again. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> | 22 October 2006, 23:39:58 UTC |
| 474a90f | Karl Hasselström | 22 October 2006, 18:46:36 UTC | git-vc: better installation instructions Provide some more detailed installation instructions, for the elisp-challenged among us. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 October 2006, 23:38:32 UTC |
| 300454f | Jakub Narebski | 21 October 2006, 15:53:09 UTC | gitweb: Do not esc_html $basedir argument to git_print_tree_entry In git_tree, rename $base variable (which is passed as $basedir argument to git_print_tree_entry) to $basedir. Do not esc_html $basedir, as it is part of file_name ('f') argument in link and not printed. Add '/' at the end only if $basedir is not empty (it is empty for top directory) and doesn't end in '/' already. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 October 2006, 20:24:37 UTC |
| e7fb022 | Jakub Narebski | 21 October 2006, 15:52:19 UTC | gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2) Code should be aligned the same way, regardless of tab size. Use tabs for indent, but spaces for align. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 October 2006, 19:56:41 UTC |
| 5ea0921 | Lars Hjemli | 22 October 2006, 11:30:24 UTC | Fix usagestring for git-branch Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 October 2006, 19:26:21 UTC |
| fc61e31 | Rene Scharfe | 21 October 2006, 18:51:04 UTC | git-merge: show usage if run without arguments Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 October 2006, 19:15:55 UTC |
| 0b92f1a | Lars Hjemli | 20 October 2006, 21:24:32 UTC | Fix typo in show-index.c Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 October 2006, 23:50:36 UTC |
| 96a035d | Junio C Hamano | 20 October 2006, 23:37:49 UTC | pager: default to LESS=FRS Recent change to paginate "git diff" by default is often irritating when you do not have any change (or very small change) in your working tree. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 October 2006, 23:37:49 UTC |
| b507b46 | Linus Torvalds | 20 October 2006, 02:26:08 UTC | git-apply: prepare for upcoming GNU diff -u format change. The latest GNU diff from CVS emits an empty line to express an empty context line, instead of more traditional "single white space followed by a newline". Do not get broken by it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 October 2006, 04:28:06 UTC |
| 6b09c78 | pclouds@gmail.com | 19 October 2006, 03:04:55 UTC | Add revspec documentation for ':path', ':[0-3]:path' and git-describe Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 October 2006, 04:43:30 UTC |
| 8a83157 | pclouds@gmail.com | 19 October 2006, 01:34:41 UTC | Reject hexstring longer than 40-bytes in get_short_sha1() Such a string can never be a valid object name. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 October 2006, 04:21:50 UTC |
| 1a3b55c | Nicolas Pitre | 18 October 2006, 19:56:22 UTC | reduce delta head inflated size Supposing that both the base and result sizes were both full size 64-bit values, their encoding would occupy only 9.2 bytes each. Therefore inflating 64 bytes is way overkill. Limit it to 20 bytes instead which should be plenty enough for a couple years to come. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 October 2006, 04:18:42 UTC |
| 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 |
