aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* git-fetch: auto-following tags.Junio C Hamano2006-01-07
| | | | | | | | | | | 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>
* Make GIT-VERSION-GEN tolerate missing git describe commandJohn Ellson2006-01-05
| | | | | | | | | | | | | | | | | | 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>
* Merge fixes up to GIT 1.0.7Junio C Hamano2006-01-05
|\ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * GIT 1.0.7v1.0.7Junio C Hamano2006-01-05
| |\ | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Fix git-symbolic-ref typo in git.txt.Jon Loeliger2006-01-05
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * git: grok 'help' to mean '--help'.Andreas Ericsson2006-01-05
| | | | | | | | | | | | | | | | | | | | | 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>
| | * Documentation/git-svnimport: document -T and -t switches correctlyEric Wong2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * svnimport: support repositories requiring SSL authenticationEric Wong2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * t3300: skip when filesystem does not like TAB in filenames.Junio C Hamano2006-01-05
| | | | | | | | | | | | | | | | | | | | | Instead of checking Cygwin explicitly, see if the filesystem lets us create funny filenames. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * format-patch/commit: Quote single quote in the author name properly.Junio C Hamano2006-01-05
| | | | | | | | | | | | | | | | | | Noticed by Kyle McMartin. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * git-fetch --tags: reject malformed tags.Junio C Hamano2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Wrap synopsis lines and use [verse] to keep formattingJonas Fonseca2006-01-05
| | | | | | | | | | | | | | | | | | | | | 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>
| | * use GIT_DIR instead of /var/tmpAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * trivial: check, if t/trash directory was successfully createdAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * trivial: .gitignore precompiled python modulesAlex Riesen2006-01-05
| | | | | | | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * trivial: use git-repo-config to detect how to run tests in the test repositoryAlex Riesen2006-01-05
| | | | | | | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * trivial: use git-repo-config to detect if the test can be run on the repositoryAlex Riesen2006-01-05
| | | | | | | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * trivial: remove the dots at the end of file names from merge-one-fileAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | | | | | | 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>
| | * trivial: clarify, what are the config's user.name and user.email aboutAlex Riesen2006-01-05
| | | | | | | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * trivial: typo in git-commit.shAlex Riesen2006-01-05
| | | | | | | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * use result of open(2) to check for presenceAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * fix potential deadlock in create_one_fileAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * trivial: O_EXCL makes O_TRUNC redundantAlex Riesen2006-01-05
| | | | | | | | | | | | | | | Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * trivial: retval of waitpid is not errnoAlex Riesen2006-01-05
| | | | | | | | | | | | | | | | | | | | | ...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>
| | * Fix nasty approxidate bugLinus Torvalds2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * AIX compile fix for repo-config.cAmos Waterland2006-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * git-init-db(1): Describe --shared and the idempotent nature of init-dbJonas Fonseca2006-01-05
| | | | | | | | | | | | | | | | | | | | | 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>
| | * ?alloc: do not return NULL when asked for zero bytesJunio C Hamano2005-12-29
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * code comments: spellJunio C Hamano2005-12-29
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Documentation: spell.Junio C Hamano2005-12-29
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Fix skipping merge-order test with NO_OPENSSL=1.Gerrit Pape2005-12-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge fixes up to GIT 1.0.6Junio C Hamano2005-12-27
|\ \ \ | |/ /
| * | GIT 1.0.6v1.0.6Junio C Hamano2005-12-27
| |\ \ | | |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Do not mark tags fetched via --tags flag as mergeableJunio C Hamano2005-12-27
| | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix bogus tests on rev-list output.Junio C Hamano2005-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Guard a test against wc that pads its output with whitespaceJunio C Hamano2005-12-27
| | | | | | | | | | | | | | | | | | Spotted by Johannes. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * copy_fd: close ifd on errorSam Ravnborg2005-12-27
| | | | | | | | | | | | | | | | | | | | | 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>
* | | send-pack/receive-pack: allow errors to be reported back to pusher.Junio C Hamano2005-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Makefile: use git-describe to mark the git version.Junio C Hamano2005-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | git-describe: documentation.Junio C Hamano2005-12-27
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-describe: still prefer annotated tag under --all and --tagsJunio C Hamano2005-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | git-describe: --tags and --abbrevJunio C Hamano2005-12-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>
* | | git-describe: use find_unique_abbrev()Junio C Hamano2005-12-27
| | | | | | | | | | | | | | | | | | | | | 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>
* | | git-describe: really prefer tags only.Junio C Hamano2005-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Add a "git-describe" commandLinus Torvalds2005-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge fixes up to GIT 1.0.5Junio C Hamano2005-12-26
|\ \ \ | |/ /
| * | GIT 1.0.5v1.0.5Junio C Hamano2005-12-26
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor fixes. Starting from this one I won't be touching debian/ directory since the official maintainer seems to be reasonably quick to package up things. The packaging procedure used there seems to be quite different from what I have, so I'd like to avoid potential confusion and reduce work by the official maintainer and myself. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Handle symlinks graciouslyJohannes Schindelin2005-12-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * t5300: avoid false failures.Junio C Hamano2005-12-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * avoid asking ?alloc() for zero bytes.Junio C Hamano2005-12-26
| | | | | | | | | | | | | | | | | | | | | | | | Avoid asking for zero bytes when that change simplifies overall logic. Later we would change the wrapper to ask for 1 byte on platforms that return NULL for zero byte request. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-19 14:55:33 +0000