summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-10-20git-clone: define die() and use it.Libravatar Dmitry V. Levin1-37/+24
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-20Merge branch 'maint'Libravatar Junio C Hamano2-2/+2
* maint: Fix typo in show-index.c pager: default to LESS=FRS
2006-10-20Fix typo in show-index.cLibravatar Lars Hjemli1-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-20pager: default to LESS=FRSLibravatar Junio C Hamano1-1/+1
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>
2006-10-19Merge branch 'maint'Libravatar Junio C Hamano2-0/+64
* maint: git-apply: prepare for upcoming GNU diff -u format change.
2006-10-19git-apply: prepare for upcoming GNU diff -u format change.Libravatar Linus Torvalds2-0/+64
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>
2006-10-19Don't use $author_name undefined when $from contains no /\s</.Libravatar Jim Meyering1-1/+1
I noticed a case not handled in a recent patch. Demonstrate it like this: $ touch new-file $ git-send-email --dry-run --from j --to k new-file 2>err new-file OK. Log says: Date: Thu, 19 Oct 2006 10:26:24 +0200 Sendmail: /usr/sbin/sendmail From: j Subject: Cc: To: k Result: OK $ cat err Use of uninitialized value in pattern match (m//) at /p/bin/git-send-email line 416. Use of uninitialized value in concatenation (.) or string at /p/bin/git-send-email line 420. Use of uninitialized value in concatenation (.) or string at /p/bin/git-send-email line 468. There's a patch for the $author_name part below. The example above shows that $subject may also be used uninitialized. That should be easy to fix, too. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-18Merge branch 'mw/pathinfo'Libravatar Junio C Hamano2-20/+85
* mw/pathinfo: gitweb: Fix search form when PATH_INFO is enabled gitweb: Document features better gitweb: warn if feature cannot be overridden. gitweb: start to generate PATH_INFO URLs. Conflicts: gitweb/README
2006-10-18Merge branch 'js/diff'Libravatar Junio C Hamano2-1/+2
* js/diff: Turn on recursive with --summary
2006-10-18Merge branch 'jc/send-email'Libravatar Junio C Hamano1-4/+23
* jc/send-email: Make git-send-email detect mbox-style patches more readily git-send-email: real name with period need to be dq-quoted on From: line git-send-email: do not drop custom headers the user prepared
2006-10-18Merge branch 'jc/grep'Libravatar Junio C Hamano5-20/+120
* jc/grep: teach revision walker about --all-match. grep --all-match
2006-10-18Merge early part of branch 'jc/diff-apply-patch'Libravatar Junio C Hamano1-2/+2
2006-10-18Merge branch 'jc/diff-numstat'Libravatar Junio C Hamano4-12/+47
* jc/diff-numstat: diff --numstat
2006-10-18Merge branch 'pb/bisect'Libravatar Junio C Hamano1-5/+6
* pb/bisect: bisect reset: Leave the tree in usable state if git-checkout failed
2006-10-18Merge branch 'mw/send-email'Libravatar Junio C Hamano1-2/+6
* mw/send-email: Add --dry-run option to git-send-email
2006-10-18Merge branch 'rs/rebase'Libravatar Junio C Hamano2-3/+16
* rs/rebase: git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase. git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
2006-10-18Merge branch 'sb/fetch'Libravatar Junio C Hamano3-18/+27
* sb/fetch: merge and resolve: Output short hashes and .. in "Updating ..." fetch: Misc output cleanup
2006-10-18Merge branch 'sk/svn'Libravatar Junio C Hamano1-39/+54
* sk/svn: git-svnimport.perl: copying directory from original SVN place
2006-10-18Merge branch 'rs/zip'Libravatar Junio C Hamano2-6/+46
* rs/zip: git-archive --format=zip: add symlink support git-archive --format=zip: use default version ID
2006-10-18Add revspec documentation for ':path', ':[0-3]:path' and git-describeLibravatar pclouds@gmail.com1-1/+15
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-18Reject hexstring longer than 40-bytes in get_short_sha1()Libravatar pclouds@gmail.com1-1/+1
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>
2006-10-18reduce delta head inflated sizeLibravatar Nicolas Pitre1-1/+1
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>
2006-10-18git-imap-send: Strip smtp From_ header from imap message.Libravatar Markus Amsler1-0/+8
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>
2006-10-17add proper dependancies on the xdiff sourceLibravatar Andy Whitcroft1-0/+2
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>
2006-10-16bisect reset: Leave the tree in usable state if git-checkout failedLibravatar Petr Baudis1-5/+6
I had local modifications in the tree and doing bisect reset required me to manually edit .git/HEAD. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-16Merge branch 'maint'Libravatar Junio C Hamano1-2/+3
* maint: Fix hash function in xdiff library
2006-10-16Fix hash function in xdiff libraryLibravatar Linus Torvalds1-2/+3
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>
2006-10-15svnimport: Fix broken tags being generatedLibravatar Petr Baudis1-1/+1
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>
2006-10-15Replace open-coded version of hash_sha1_file()Libravatar Rene Scharfe1-7/+1
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-15Make write_sha1_file_prepare() voidLibravatar Rene Scharfe1-6/+5
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>
2006-10-14Revert "move pack creation to version 3"Libravatar Junio C Hamano2-7/+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>
2006-10-14Merge branch 'jc/http'Libravatar Junio C Hamano1-257/+0
* jc/http: Add WEBDAV timeout to http-fetch.
2006-10-14clone: the given repository dir should be relative to $PWDLibravatar Yasushi SHOJI2-1/+7
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>
2006-10-14cvsserver: fix "cvs diff" in a subdirectoryLibravatar Johannes Schindelin1-1/+1
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-14cvsserver: Show correct letters for modified, removed and added filesLibravatar Johannes Schindelin1-12/+51
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>
2006-10-14git-svn: reduce memory usage for large commitsLibravatar Eric Wong1-2/+4
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>
2006-10-14Fix tracing when GIT_TRACE is set to an empty string.Libravatar Christian Couder1-1/+2
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-14Make write_sha1_file_prepare() staticLibravatar Rene Scharfe2-12/+3
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>
2006-10-14Add hash_sha1_file()Libravatar Rene Scharfe5-34/+22
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>
2006-10-14git-svn: fix commits over svn+ssh://Libravatar Eric Wong1-2/+2
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>
2006-10-13diff --numstatLibravatar Junio C Hamano4-12/+47
[jc: with documentation from Jakub] Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-13t4015: work-around here document problem on Cygwin.Libravatar Junio C Hamano1-6/+6
Signed-off-by: Junio C Hamano <junio@twinsun.com>
2006-10-12Documentation: add missing second colons and remove a typoLibravatar Rene Scharfe4-6/+6
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>
2006-10-12diff: fix 2 whitespace issuesLibravatar Johannes Schindelin2-17/+134
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>
2006-10-12apply --numstat -z: line termination fix.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-10-11git-svn: add a message encouraging use of SVN::* librariesLibravatar Eric Wong1-0/+14
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>
2006-10-11commit: fix a segfault when displaying a commit with unreachable parentsLibravatar Eric Wong1-4/+7
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>
2006-10-11git-svn: -h(elp) message formatting fixesLibravatar Eric Wong1-2/+2
'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>
2006-10-11Documentation/git-svn: document some of the newer featuresLibravatar Eric Wong1-16/+123
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>
2006-10-11gitweb: Fix search form when PATH_INFO is enabledLibravatar Petr Baudis1-0/+4
Currently that was broken. Ideal fix would make the search form use PATH_INFO too, but it's just one insignificant place so it's no big deal if we don't for now... This at least makes it work. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 22:39:00 +0000