1. Stefan Saasen
  2. git

Commits

Show all
Author Commit Message Date Builds
Shawn O. Pearce
Merge branch 'gfi-maint' into gfi-master * gfi-maint: Teach import-tars about GNU tar's @LongLink extension.
Johannes Schindelin
Teach import-tars about GNU tar's @LongLink extension. 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.…
Martin Koegler
Fix compilation of test-delta 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>
Junio C Hamano
GIT v1.5.2-rc1 Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v1.5.2-rc1
Junio C Hamano
Merge branch 'maint' * 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
Junio C Hamano
GIT v1.5.1.3 Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v1.5.1.3
Alex Riesen
Include mailmap.h in mailmap.c to catch mailmap interface changes Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Alex Riesen
Remove pointless calls to access(2) when checking for .mailmap 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>
Alex Riesen
Fix read_mailmap to handle a caller uninterested in repo abbreviation 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>
Alex Riesen
Use strlcpy instead of strncpy in mailmap.c 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>
Jari Aalto
send-email documentation: clarify --smtp-server 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>
Jari Aalto
git.7: Mention preformatted html doc location Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jari Aalto
Clarify SubmittingPatches Checklist 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>
Adam Roben
git-svn: Add 'find-rev' command 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>
Junio C Hamano
Fix symlink handling in git-svn, related to PerlIO 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 …
Junio C Hamano
Merge branch 'jc/attr' * jc/attr: Add 'filter' attribute and external filter driver definition. Add 'ident' conversion.
Junio C Hamano
Make sure test-genrandom and test-chmtime are builtas part of the main build. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Make macros to prevent double-inclusion in headers consistent. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Apply mailmap in git-blame output. This makes git-blame to use the same mailmap used by git-shortlog. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Split out mailmap handling out of shortlog 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>
Junio C Hamano
blame -s: suppress author name and time. 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>
Josh Triplett
Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL 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>
Junio C Hamano
Merge commit 'gfi/master' * commit 'gfi/master':
Junio C Hamano
Merge branch 'maint' * 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 '…
Julian Phillips
http.c: Fix problem with repeated calls of http_init 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>
Josh Triplett
Add missing reference to GIT_COMMITTER_DATE in git-commit-tree documentation Signed-off-by: Josh Triplett <josh@freedesktop.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Fix import-tars fix. 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>
Junio C Hamano
Update .mailmap with "Michael" Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Do not barf on too long action description 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>
Junio C Hamano
Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint * 'maint' of git://repo.or.cz/git/fastimport: Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes
  1. Prev
  2. Next