summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-01-07ls-files --others --directory: testLibravatar Junio C Hamano1-6/+28
Add a test to run with --directory option. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07git-status: use ls-files --others --directory for untracked list.Libravatar Junio C Hamano1-2/+2
This shortens "Untracked files" list by using --directory option when running ls-files --others. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07ls-files --others --directory: give trailing slashLibravatar Junio C Hamano1-2/+3
This adds a trailing slash to directory names in the output when "--others --directory" option shows only untracked directories and not their contents, to make them stand out. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07ls-files --others --directory: fix a bug with index entry orderingLibravatar Junio C Hamano1-8/+5
When both howto-index.sh and howto/make-dist.txt exist under Documentation/ directory, dir_exists() mistakenly checked it without the trailing slash to see if there was something under Documentation/howto directory, and did not realize there was, because '-' sorts earlier than '/' and cache_name_pos() finds howto-index.sh, which is not under howto/ directory. This caused --others --directory to show it which was incorrect. Check the directory name with the trailing slash, because having an entry that has such as a prefix is what we are looking for. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07ls-files -o: optionally skip showing the contents in "untracked" directoriesLibravatar Linus Torvalds1-0/+22
Darrin Thompson notes that git-ls-files -o reports all the unknown files it finds in a work area. Subversion and probably other systems "simply ignore all the files and directories inside an unknown directory and just note the directory as unknown." With --directory option, ls-files --others shows untracked directories without descending into them. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-07git-fetch: auto-following tags.Libravatar Junio C Hamano2-124/+169
I added things to ls-remote so that Cogito can auto-follow tags easily and correctly a while ago, but git-fetch did not use the facility. Recently added git-describe command relies on repository keeping up-to-date set of tags, which made it much more attractive to automatically follow tags, so we do that as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05Make GIT-VERSION-GEN tolerate missing git describe commandLibravatar John Ellson1-1/+1
I think it is probably a bug that "git non_existent_command" returns its error message to stdout without an error, where "git-non_existent_command" behaves differently and does return an error. Older versions of git did not implement "git describe" and GIT-VERSION-GEN produces an empty version string if run on a system with such a git installed. The consequence is that "make rpm" fails. This patch fixes GIT-VERSION-GEN so that it works in the absence of a working "git describe" Signed-off-by: John Ellson <ellson@research.att.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05Merge fixes up to GIT 1.0.7Libravatar Junio C Hamano60-115/+202
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-05GIT 1.0.7Libravatar Junio C Hamano61-116/+203
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-27Merge fixes up to GIT 1.0.6Libravatar Junio C Hamano5-6/+9
2005-12-27GIT 1.0.6Libravatar Junio C Hamano6-7/+10
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27send-pack/receive-pack: allow errors to be reported back to pusher.Libravatar Junio C Hamano3-39/+148
This updates the protocol between git-send-pack/git-receive-pack in a backward compatible way to allow failures at the receiving end to be propagated back to the sender. Most notably, versions of git-push before this could not notice if the update hook on the receiving end refused to update the ref for its own policy reasons. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27Makefile: use git-describe to mark the git version.Libravatar Junio C Hamano3-5/+34
Note: with this commit, the GIT maintainer workflow must change. GIT-VERSION-GEN is now the file to munge when the default version needs to be changed, not Makefile. The tag needs to be pushed into the repository to build the official tarball and binary package beforehand. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27git-describe: documentation.Libravatar Junio C Hamano2-0/+82
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27git-describe: still prefer annotated tag under --all and --tagsLibravatar Junio C Hamano1-9/+25
Even though --all and --tags can be used to include non annotated tags in the reference point candidates, prefer to use annotated tags if there are more than one refs that name the same commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27git-describe: --tags and --abbrevLibravatar Junio C Hamano1-6/+27
With --tags, not just annontated tags, but also any ref under refs/tags/ are used to name the revision. The number of digits is configurable with the --abbrev=<n> option. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27git-describe: use find_unique_abbrev()Libravatar Junio C Hamano1-1/+2
Just in case 8 hexadecimal digits are not enough. We could use shorter default if we wanted to. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27git-describe: really prefer tags only.Libravatar Junio C Hamano1-4/+11
Often there are references other than annotated tags under refs/tags hierarchy that are used to "keep things just in case". default to use annotated tags only, still leaving the option to use any ref with --all flag. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-12-27Add a "git-describe" commandLibravatar Linus Torvalds2-1/+120
It shows you the most recent tag that is reachable from a particular commit is. Maybe this is something that "git-name-rev" should be taught to do, instead of having a separate command for it. Regardless, I find it useful. What it does is to take any random commit, and "name" it by looking up the most recent commit that is tagged and reachable from that commit. If the match is exact, it will just print out that ref-name directly. Otherwise it will print out the ref-name, followed by the 8-character "short SHA". IOW, with something like Junios current tree, I get: [torvalds@g5 git]$ git-describe parent refs/tags/v1.0.4-g2414721b ie the current head of my "parent" branch (ie Junio) is based on v1.0.4, but since it has a few commits on top of that, it has added the git hash of the thing to the end: "-g" + 8-char shorthand for the commit 2414721b194453f058079d897d13c4e377f92dc6. Doing a "git-describe" on a tag-name will just show the full tag path: [torvalds@g5 git]$ git-describe v1.0.4 refs/tags/v1.0.4 unless there are _other_ tags pointing to that commit, in which case it will just choose one at random. This is useful for two things: - automatic version naming in Makefiles, for example. We could use it in git itself: when doing "git --version", we could use this to give a much more useful description of exactly what version was installed. - for any random commit (say, you use "gitk <pathname>" or "git-whatchanged" to look at what has changed in some file), you can figure out what the last version of the repo was. Ie, say I find a bug in commit 39ca371c45b04cd50d0974030ae051906fc516b6, I just do: [torvalds@g5 linux]$ git-describe 39ca371c45b04cd50d0974030ae051906fc516b6 refs/tags/v2.6.14-rc4-g39ca371c and I now know that it was _not_ in v2.6.14-rc4, but was presumably in v2.6.14-rc5. The latter is useful when you want to see what "version timeframe" a commit happened in. Signed-off-by: Linus Torvalds <torvalds@osdl.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>