aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'maint'Junio C Hamano2007-05-03
|\ | | | | | | | | | | | | | | | | | | | | * maint: gitweb: use decode_utf8 directly posix compatibility for t4200 Document 'opendiff' value in config.txt and git-mergetool.txt Allow PERL_PATH="/usr/bin/env perl" Make xstrndup common diff.c: fix "size cache" handling. http-fetch: Disable use of curl multi support for libcurl < 7.16.
| * gitweb: use decode_utf8 directlyIsmail Dönmez2007-05-03
| | | | | | | | | | | | | | | | Using decode() tries to decode data that is already UTF-8 and borks, but decode_utf8 from Encode.pm has a built-in safety against that. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * posix compatibility for t4200Bryan Larsen2007-05-03
| | | | | | | | | | | | | | | | Fix t4200 so that it also works on OS X by not relying on gnu extensions to sed. Signed-off-by: Bryan Larsen <bryan@larsen.st> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Document 'opendiff' value in config.txt and git-mergetool.txtArjen Laarhoven2007-05-03
| | | | | | | | | | Signed-off-by: Arjen Laarhoven <arjen@yaph.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Allow PERL_PATH="/usr/bin/env perl"Bryan Larsen2007-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | There is a mechanism PERL_PATH in the Makefile to specify path to Perl binary, but sometimes it is convenient to let 'env' figure out where Perl comes from, with PERL_PATH="/usr/bin/env perl". Allowing this would make things easier to MacPorts, where we wish to work with the MacPorts perl if it is installed, but fall back to the system perl if it isn't. Signed-off-by: Bryan Larsen <bryan@larsen.st> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make xstrndup commonDaniel Barkalow2007-05-03
| | | | | | | | | | | | | | | | | | | | This also improves the implementation to match how strndup is specified (by GNU): if the length given is longer than the string, only the string's length is allocated and copied, but the string need not be null-terminated if it is at least as long as the given length. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * diff.c: fix "size cache" handling.Junio C Hamano2007-05-03
| | | | | | | | | | | | | | | | | | We broke the size-cache handling when we changed the function signature of sha1_object_info() in 21666f1a. We obviously wanted to cache the size we obtained when sha1_object_info() succeeded, not when it failed. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * http-fetch: Disable use of curl multi support for libcurl < 7.16.Alexandre Julliard2007-05-03
| | | | | | | | | | | | | | | | | | | | curl_multi_remove_handle() is broken in libcurl < 7.16, in that it doesn't correctly update the active handles count when a request is aborted. This causes the transfer to hang forever waiting for the handle count to become less than the number of active requests. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | blame: use .mailmap unconditionallyJunio C Hamano2007-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There really isn't any point in turning off .mailmap. The number of mailmap lookups are bounded by number of lines in the target file, and the real blame processing is much more expensive. If it turns out to be too costly, we should optimize the mailmap lookup itself, instead of avoiding the call. If the author information of commits of the project are relatively clean, .mailmap would have only small number of entries, and the overhead of looking it up will not be high. On the other hand, if the author information is really screwed up that a good .mailmap needs to be maintained to run shortlog, giving uncleaned names in blame output is not helpful at all either. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-05-02
|\ \ | |/ | | | | | | | | * maint: cvsserver: Handle re-added files correctly Fix compilation of test-delta
| * Merge branch 'maint' of git://repo.or.cz/git/fastimport into maintJunio C Hamano2007-05-02
| |\ | | | | | | | | | | | | * 'maint' of git://repo.or.cz/git/fastimport: Teach import-tars about GNU tar's @LongLink extension.
| * | cvsserver: Handle re-added files correctlyFrank Lichtenheld2007-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't unconditionally assign revision 1.1 to newly added files. In case the file did exist in the past and was deleted we need to honor the old revision number. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Fix compilation of test-deltaMartin Koegler2007-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code used write_in_full() without pulling its declarations from the header file. When header is included, usage[] collides with usage() function. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Don't use seq in tests, not everyone has itShawn O. Pearce2007-05-02
| | | | | | | | | | | | | | | | | | | | | For example Mac OS X lacks the seq command. So we cannot use it there. A good old while loop works just as good. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Reuse fixup_pack_header_footer in index-packShawn O. Pearce2007-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now that fast-import is using a "library function" to handle correcting its packfile's object count and trailing SHA-1 we should reuse the same function in index-pack, to reduce the size of the code we must maintain. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Create pack-write.c for common pack writing codeDana L. How2007-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include a generalized fixup_pack_header_footer() in this new file. Needed by git-repack --max-pack-size feature in a later patchset. [sp: Moved close(pack_fd) to callers, to support index-pack, and changed name to better indicate it is for packfiles.] Signed-off-by: Dana L. How <danahow@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | | Merge branch 'gfi-maint' into gfi-masterShawn O. Pearce2007-05-02
|\ \ \ | | |/ | |/| | | | | | | * gfi-maint: Teach import-tars about GNU tar's @LongLink extension.
| * | Teach import-tars about GNU tar's @LongLink extension.Johannes Schindelin2007-05-02
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extension allows GNU tar to process file names in excess of the 100 characters defined by the original tar standard. It does this by faking a file, named '././@LongLink' containing the true file name, and then adding the file with a truncated name. The idea is that tar without this extension will write out a file with the long file name, and write the contents into a file with truncated name. Unfortunately, GNU tar does a lousy job at times. When truncating results in a _directory_ name, it will happily use _that_ as a truncated name for the file. An example where this actually happens is gcc-4.1.2, where the full path of the file WeThrowThisExceptionHelper.java truncates _exactly_ before the basename. So, we have to support that ad-hoc extension. This bug was noticed by Chris Riddoch on IRC. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
* | GIT v1.5.2-rc1v1.5.2-rc1Junio C Hamano2007-04-30
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'maint'Junio C Hamano2007-04-30
|\ \ | |/ | | | | | | | | | | | | | | | | * maint: GIT v1.5.1.3 send-email documentation: clarify --smtp-server git.7: Mention preformatted html doc location Clarify SubmittingPatches Checklist git-svn: Add 'find-rev' command Fix symlink handling in git-svn, related to PerlIO
| * GIT v1.5.1.3v1.5.1.3Junio C Hamano2007-04-30
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * send-email documentation: clarify --smtp-serverJari Aalto2007-04-30
| | | | | | | | | | | | | | | | It can be either hostname/address, or a full path to a local executable. Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git.7: Mention preformatted html doc locationJari Aalto2007-04-30
| | | | | | | | | | Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Clarify SubmittingPatches ChecklistJari Aalto2007-04-30
| | | | | | | | | | | | | | | | Separate things to be checked when making commits, and things to be checked when sending patches. Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-svn: Add 'find-rev' commandAdam Roben2007-04-30
| | | | | | | | | | | | | | | | | | This patch adds a new 'find-rev' command to git-svn that lets you easily translate between SVN revision numbers and git tree-ish. Signed-off-by: Adam Roben <aroben@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix symlink handling in git-svn, related to PerlIOJunio C Hamano2007-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After reading the leading contents from a symlink data obtained from subversion, which we expect to begin with 'link ', the code forked to hash the remainder (which should match readlink() result) using git-hash-objects, by redirecting its STDIN from the filehandle we read that 'link ' from. This was Ok with Perl on modern Linux, but on Mac OS, the read in the parent process slurped more than we asked for in stdio buffer, and the child did not correctly see the "remainder". This attempts to fix the issue by using lower level sysseek and sysread instead of seek and read to bypass the stdio buffer. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Eric Wong <normalperson@yhbt.net> Acked-by: Seth Falcon <sethfalcon@gmail.com>
* | Include mailmap.h in mailmap.c to catch mailmap interface changesAlex Riesen2007-04-30
| | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Remove pointless calls to access(2) when checking for .mailmapAlex Riesen2007-04-30
| | | | | | | | | | | | | | | | | | | | read_mailmap already returns not 0 in case of error, and nothing seem to be interested in it. It also is silent about the fact (read_mailmap being to chatty would justify the call to access, but there is no point for it to be and it isn't). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix read_mailmap to handle a caller uninterested in repo abbreviationAlex Riesen2007-04-30
| | | | | | | | | | | | | | | | The only such a caller builtin-blame.c would pass NULL as the place where to store the abbreviation. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Use strlcpy instead of strncpy in mailmap.cAlex Riesen2007-04-30
| | | | | | | | | | | | | | | | | | strncpy does not NUL-terminate output in case of output buffer too short, and map_email prototype (and usage) does not allow for figuring out what the length of the name is. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/attr'Junio C Hamano2007-04-29
|\ \ | | | | | | | | | | | | | | | * jc/attr: Add 'filter' attribute and external filter driver definition. Add 'ident' conversion.
| * | Add 'filter' attribute and external filter driver definition.Junio C Hamano2007-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The interface is similar to the custom low-level merge drivers. First you configure your filter driver by defining 'filter.<name>.*' variables in the configuration. filter.<name>.clean filter command to run upon checkin filter.<name>.smudge filter command to run upon checkout Then you assign filter attribute to each path, whose name matches the custom filter driver's name. Example: (in .gitattributes) *.c filter=indent (in config) [filter "indent"] clean = indent smudge = cat Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Add 'ident' conversion.Junio C Hamano2007-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'ident' attribute set to path squashes "$ident:<any bytes except dollor sign>$" to "$ident$" upon checkin, and expands it to "$ident: <blob SHA-1> $" upon checkout. As we have two conversions that affect checkin/checkout paths, clarify how they interact with each other. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Make sure test-genrandom and test-chmtime are builtas part of the main build.Junio C Hamano2007-04-29
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Make macros to prevent double-inclusion in headers consistent.Junio C Hamano2007-04-29
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Apply mailmap in git-blame output.Junio C Hamano2007-04-29
| | | | | | | | | | | | | | | | | | | | | This makes git-blame to use the same mailmap used by git-shortlog. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Split out mailmap handling out of shortlogJunio C Hamano2007-04-29
| | | | | | | | | | | | | | | | | | | | | | | | This splits out a few functions to deal with mailmap from shortlog and makes it a bit more usable from other programs. Most notably, it does not clobber input e-mail address anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | blame -s: suppress author name and time.Junio C Hamano2007-04-29
| | | | | | | | | | | | | | | | | | | | | With this "git blame -b -s HEAD~n..HEAD" becomes a nicer way to review the result of recent changes in context. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAILJosh Triplett2007-04-29
| | | | | | | | | | | | | | | | | | | | | | | | Some other programs get the user's email address from $EMAIL, so fall back to that if we don't have a Git-specific email address. Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge commit 'gfi/master'Junio C Hamano2007-04-29
|\ \ \ | | | | | | | | | | | | * commit 'gfi/master':
| * \ \ Merge branch 'gfi-maint' into gfi-masterShawn O. Pearce2007-04-28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * gfi-maint: Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes
* | \ \ \ Merge branch 'maint'Junio C Hamano2007-04-29
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * maint: http.c: Fix problem with repeated calls of http_init Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation Fix import-tars fix. Update .mailmap with "Michael" Do not barf on too long action description Catch empty pathnames in trees during fsck Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes git-svn: Added 'find-rev' command git shortlog documentation: add long options and fix a typo
| * | | http.c: Fix problem with repeated calls of http_initJulian Phillips2007-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling http_init after calling http_cleanup causes a segfault. This is due to the pragma_header curl_slist being freed but not being set to NULL. The subsequent call to http_init tries to setup the slist again, but it now points to an invalid memory location. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentationJosh Triplett2007-04-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Fix import-tars fix.Junio C Hamano2007-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This heeds advice from our resident Perl expert to make sure the script is not confused with a string that ends with /\n Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Update .mailmap with "Michael"Junio C Hamano2007-04-29
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Do not barf on too long action descriptionJunio C Hamano2007-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reflog message is primarily about easier identification, and leaving truncated entry is much better than dying. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maintJunio C Hamano2007-04-28
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * 'maint' of git://repo.or.cz/git/fastimport: Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes
| | * | Merge commit 'jc/maint' into gfi-maintShawn O. Pearce2007-04-28
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'jc/maint': (35 commits) Update git-http-fetch documentation Update git-local-fetch documentation Update git-http-push documentation Update -L documentation for git-blame/git-annotate Update git-grep documentation Update git-fmt-merge documentation Document additional options for git-fetch Removing -n option from git-diff-files documentation Start preparing for 1.5.1.3 Sanitize @to recipients. git-svn: Ignore usernames in URLs in find_by_url Document --dry-run and envelope-sender for git-send-email. Allow users to optionally specify their envelope sender. Ensure clean addresses are always used with Net::SMTP Validate @recipients before using it for sendmail and Net::SMTP. Perform correct quoting of recipient names. Change the scope of the $cc variable as it is not needed outside of send_message. Debugging cleanup improvements Prefix Dry- to the message status to denote dry-runs. Document --dry-run parameter to send-email. ...
| | * | | Don't allow empty pathnames in fast-importShawn O. Pearce2007-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | riddochc on #git noticed corruption caused by import-tars. This was fixed in the prior commit by Dscho, but fast-import was wrong to have allowed a tree to be created with an empty string as the filename. No operating system allows this, and Git itself doesn't accept this into the index. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 21:51:46 +0000