summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-01-13Documentation: git-commit -aLibravatar Junio C Hamano1-1/+3
A bit more elaboration on what "update all paths" means. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-12Documentation: clarify fetch parameter descriptions.Libravatar J. Bruce Fields1-3/+3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-11show-branch: handle [] globs as well.Libravatar Junio C Hamano1-1/+1
Earlier only '?' and '*' signalled the command that what the user has given is a glob pattern. This prevented us to say: $ git show-branch 'v0.99.[0-3]' Now we notice '[' as well, so the above would work. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-11name-rev: do not omit leading components of ref name.Libravatar Junio C Hamano2-6/+7
In a repository with mainto/1.0 (to keep maintaining the 1.0.X series) and fixo/1.0 (to keep fixes that apply to both 1.0.X series and upwards) branches, "git-name-rev mainto/1.0" answered just "1.0" making things ambiguous. Show refnames unambiguously like show-branch does. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-11update-index: work with c-quoted nameLibravatar Junio C Hamano1-1/+8
update-index --stdin did not work with c-style quoted names even though update-index --index-info did. This fixes the inconsistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-10glossary: explain "master" and "origin"Libravatar Johannes Schindelin1-0/+11
If you are a long time git user/developer, you forget that to a new git user, these words have not the same meaning as to you. [jc: with updates from J. Bruce Fields.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07mailsplit: allow empty input from stdinLibravatar Junio C Hamano1-1/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07revert/cherry-pick: handle single quote in author name.Libravatar Junio C Hamano1-0/+1
The same fix as aa66c7ec77d474b737da607d6cb2d07f56628def is needed here. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07Fix git-format-patch usage string wrt output modes.Libravatar Yann Dirson1-2/+4
--stdout was not mentionned, and the description for the case where -o was not given was thus incomplete. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07Fix typo in debug stanza of t2001Libravatar Yann Dirson1-1/+1
Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07tar-tree: finish honoring extractor's umask in git-tar-tree.Libravatar Junio C Hamano1-1/+1
Earlier commit 38ec15a973a1f075f0d94d130b0ef279562921cd forgot to apply the same principle of not forcing go-w to the base directory when specified. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07[PATCH] Compilation: zero-length array declaration.Libravatar Junio C Hamano10-12/+21
ISO C99 (and GCC 3.x or later) lets you write a flexible array at the end of a structure, like this: struct frotz { int xyzzy; char nitfol[]; /* more */ }; GCC 2.95 and 2.96 let you to do this with "char nitfol[0]"; unfortunately this is not allowed by ISO C90. This declares such construct like this: struct frotz { int xyzzy; char nitfol[FLEX_ARRAY]; /* more */ }; and git-compat-util.h defines FLEX_ARRAY to 0 for gcc 2.95 and empty for others. If you are using a C90 C compiler, you should be able to override this with CFLAGS=-DFLEX_ARRAY=1 from the command line of "make". Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07prune: do not show error from pack-redundant when no packs are found.Libravatar Junio C Hamano1-2/+1
When there is no pack yet, git-prune leaked an error message from "git-pack-redundant --all" which complained that there is no pack. Squelch the annoying message. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-06Retire debian/ directory.Libravatar Junio C Hamano16-441/+0
The official maintainer is keeping up-to-date quite well, and now the older Debian is supported with backports.org, there is no reason for me to keep debian/ directory around here. I have not been building and publishing debs since 1.0.4 anyway. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-06unpack-objects: default to quiet if stderr is not a tty.Libravatar Junio C Hamano1-0/+2
This would help cron/at jobs that run send-pack to mirror repositories. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-06Substitute "/" with $opt_s in tag names as well as branch namesLibravatar Joe English1-0/+1
In 'git cvsimport' changes "/" to "-" (or $opt_s) in branch names, but not in tag names, which is inconsistent. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-06Teach cvsexportcommit to add new filesLibravatar Yann Dirson1-2/+10
"cvs add" support was already there, but the "unknown" status returned when querying a file not yet known to cvs caused the script to abort prematurely. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05Fix git-symbolic-ref typo in git.txt.Libravatar Jon Loeliger1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05git: grok 'help' to mean '--help'.Libravatar Andreas Ericsson1-0/+5
Most other scm's understand it, most users expect it and it's an easy fix. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05Documentation/git-svnimport: document -T and -t switches correctlyLibravatar Eric Wong1-3/+3
The -T and -t switches are swapped in the documentation and actual code. I've made the documentation match the code. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05svnimport: support repositories requiring SSL authenticationLibravatar Eric Wong1-2/+4
I looked at svn-mirror to see how it did this, seems about right. "It works for me" when using it against https://svn.musicpd.org tested command-line: git-svnimport -C mpc -i -m -v \ -T mpc/trunk -b mpc/branches -t mpc/tags https://svn.musicpd.org Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05t3300: skip when filesystem does not like TAB in filenames.Libravatar Junio C Hamano1-3/+6
Instead of checking Cygwin explicitly, see if the filesystem lets us create funny filenames. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05format-patch/commit: Quote single quote in the author name properly.Libravatar Junio C Hamano2-0/+2
Noticed by Kyle McMartin. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05git-fetch --tags: reject malformed tags.Libravatar Junio C Hamano1-5/+14
When the other end was prepared with older git and has tags that do not follow the naming convention (see check-ref-format), do not barf but simply reject to copy them. Initial fix by Simon Richter, but done differently. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05Wrap synopsis lines and use [verse] to keep formattingLibravatar Jonas Fonseca16-34/+49
In addition, also fixes a few synopses to be more consistent and a gitlink. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05use GIT_DIR instead of /var/tmpLibravatar Alex Riesen1-1/+1
Not every system (will not one microsoft windows system) have /var/tmp, whereas using GIT_DIR for random temporary files is more or less established. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: check, if t/trash directory was successfully createdLibravatar Alex Riesen1-1/+1
and was successfully entered. Otherwise git-init-db will create it directly in the working directory (t/) which can be dangerous. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: .gitignore precompiled python modulesLibravatar Alex Riesen1-0/+1
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: use git-repo-config to detect how to run tests in the test repositoryLibravatar Alex Riesen2-7/+22
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: use git-repo-config to detect if the test can be run on the repositoryLibravatar Alex Riesen1-0/+8
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: remove the dots at the end of file names from merge-one-fileLibravatar Alex Riesen1-2/+2
to make the output more friendly to mouse copy-paste. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: clarify, what are the config's user.name and user.email aboutLibravatar Alex Riesen1-1/+2
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: typo in git-commit.shLibravatar Alex Riesen1-1/+1
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05use result of open(2) to check for presenceLibravatar Alex Riesen1-5/+12
Not that the stat against open race would matter much in this context, but that simplifies the code a bit. Also some diagnostics added (why the open failed) Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05fix potential deadlock in create_one_fileLibravatar Alex Riesen1-1/+2
It can happen if the temporary file already exists (i.e. after a panic and reboot). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: O_EXCL makes O_TRUNC redundantLibravatar Alex Riesen2-2/+2
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05trivial: retval of waitpid is not errnoLibravatar Alex Riesen1-1/+1
...but is used as such and passed to strerror. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05Fix nasty approxidate bugLibravatar Linus Torvalds1-1/+1
Stupid me. If approxidate ends up with a month that is ahead of the current month, it decrements the year to last year. Which is correct, and means that "last december" does the right thing. HOWEVER. It should only do so if the year is the same as the current year. Without this fix, "5 days ago" ends up being in 2004, because it first decrements five days, getting us to December 2005 (correct), but then it also ends up decrementing the year once more to turn that December into "last year" (incorrect, since it already _was_ last year). Duh. Pass me a donut. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05AIX compile fix for repo-config.cLibravatar Amos Waterland1-8/+8
AIX 5 has a /usr/include/regex.h containing this code: #ifdef _NO_PROTO extern char *regex(); extern char *regcmp(); #else /* _NO_PROTO */ extern char *regex(const char *, const char *, ...); extern char *regcmp(const char *, ...); #endif /* _NO_PROTO */ This means that repo-config.c is trying to redefine the `regex' symbol. Here is a simple patch that just uses `regexp' as the symbol name instead. Signed-off-by: Amos Waterland <apw@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05git-init-db(1): Describe --shared and the idempotent nature of init-dbLibravatar Jonas Fonseca1-2/+14
Based on the recent discussion on the mailing list. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-29?alloc: do not return NULL when asked for zero bytesLibravatar Junio C Hamano1-0/+6
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-29code comments: spellLibravatar Junio C Hamano7-7/+7
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-29Documentation: spell.Libravatar Junio C Hamano17-20/+20
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-28Fix skipping merge-order test with NO_OPENSSL=1.Libravatar Gerrit Pape1-7/+7
Move git-rev-list --merge-order usage check for 'OpenSSL not linked' after test 1; we cannot trigger this unless we try to actually use --merge-order by giving some ref, and we do not have any ref until we run the first test to create commits. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27Do not mark tags fetched via --tags flag as mergeableLibravatar Junio C Hamano1-1/+1
Otherwise "git pull --tags" would mistakenly try to merge all of them, which is never what the user wants. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27Fix bogus tests on rev-list output.Libravatar Junio C Hamano2-2/+2
These tests seem to mean checking the output with expected result, but was not doing its handrolled test helper function. Also fix the guard to workaround wc output that have whitespace padding, which was broken but not exposed because the test was not testing it ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27Guard a test against wc that pads its output with whitespaceLibravatar Junio C Hamano1-1/+1
Spotted by Johannes. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27copy_fd: close ifd on errorLibravatar Sam Ravnborg1-2/+5
In copy_fd when write fails we ought to close input file descriptor. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-26Handle symlinks graciouslyLibravatar Johannes Schindelin2-1/+86
This patch converts a stat() to an lstat() call, thereby fixing the case when the date of a symlink was not the same as the one recorded in the index. The included test case demonstrates this. This is for the case that the symlink points to a non-existing file. If the file exists, worse things than just an error message happen. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-26t5300: avoid false failures.Libravatar Junio C Hamano1-1/+7
Johannes found that the test has 1/256 chance of falsely producing an uncorrupted idx file, causing the check to detect corruption fail. Now we have 1/2^160 chance of false failure ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-26 20:33:21 +0000