summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* merge-recursive: Improve the error message printed when merge(1) isn't found.Fredrik Kuivinen2006-01-291-5/+10
| | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] pre-commit sample hook: do not barf on the initial importJunio C Hamano2006-01-291-3/+10
| | | | | | | | | | | The example hook barfs on the initial import. Ideally it should produce a diff from an empty tree, but for now let's stop at squelching the bogus error message. Often an initial import involves tons of badly formatted files from foreign SCM, so not complaining about them like this patch does might actually be a better idea than enforcing the "Perfect Patch" format on them. Signed-off-by: Junio C Hamano <junkio@cox.net>
* describe: omit clearing marks on the last one.Junio C Hamano2006-01-152-5/+8
| | | | | | | | | When describing more than one, we need to clear the commit marks before handling the next one, but most of the time we are running it for only one commit, and in such a case this clearing phase is totally unnecessary. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'fixo/1.0'Junio C Hamano2006-01-159-14/+60
|\
| * diffcore-break/diffcore-rename: integer overflow.Junio C Hamano2006-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | While reviewing the end user tutorial rewrite by J. Bruce Fields, I noticed that "git-diff-tree -B -C" did not correctly break the total rewrite of Documentation/tutorial.txt. It turns out that we had integer overflow during the break score computations. Cop out by using floating point. This is not a kernel. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: git-reset - interrupted workflow.Junio C Hamano2006-01-131-1/+26
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: git-commit -aJunio C Hamano2006-01-131-1/+3
| | | | | | | | | | | | A bit more elaboration on what "update all paths" means. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Documentation: clarify fetch parameter descriptions.J. Bruce Fields2006-01-121-3/+3
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * show-branch: handle [] globs as well.Junio C Hamano2006-01-111-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>
| * name-rev: do not omit leading components of ref name.Junio C Hamano2006-01-112-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>
| * update-index: work with c-quoted nameJunio C Hamano2006-01-111-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>
| * glossary: explain "master" and "origin"Johannes Schindelin2006-01-101-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>
* | describe: do not silently ignore indescribable commitsJunio C Hamano2006-01-111-2/+3
| | | | | | | | | | | | | | We silently ignored indescribable commits without complaining. Complain and die instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add git-describe to .gitignore.Tom Prince2006-01-111-0/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT-VERSION-GEN: detect dirty tree and mark the version accordingly.Junio C Hamano2006-01-091-0/+9
| | | | | | | | | | | | | | | | | | | | If we are building from a working tree with local modifications, mark the version accordingly. Deliberately uses '-' to prevent RPM from being built from such a tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | For release tarballs, include the proper versionH. Peter Anvin2006-01-092-3/+11
| | | | | | | | | | | | | | | | | | When producing a release tarball, include a "version" file, which GIT-VERSION-GEN can then use to do the right thing when building from a tarball. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.1.0v1.1.0Junio C Hamano2006-01-0836-504/+47
|\ \
| * \ GIT 1.0.8v1.0.8Junio C Hamano2006-01-0735-492/+47
| |\ \ | | |/
| | * mailsplit: allow empty input from stdinJunio C Hamano2006-01-071-1/+4
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * revert/cherry-pick: handle single quote in author name.Junio C Hamano2006-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | | The same fix as aa66c7ec77d474b737da607d6cb2d07f56628def is needed here. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Fix git-format-patch usage string wrt output modes.Yann Dirson2006-01-071-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>
| | * Fix typo in debug stanza of t2001Yann Dirson2006-01-071-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * tar-tree: finish honoring extractor's umask in git-tar-tree.Junio C Hamano2006-01-071-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>
| | * [PATCH] Compilation: zero-length array declaration.Junio C Hamano2006-01-0710-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>
| | * prune: do not show error from pack-redundant when no packs are found.Junio C Hamano2006-01-071-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>
| | * Retire debian/ directory.Junio C Hamano2006-01-0616-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>
| | * unpack-objects: default to quiet if stderr is not a tty.Junio C Hamano2006-01-061-0/+2
| | | | | | | | | | | | | | | | | | | | | This would help cron/at jobs that run send-pack to mirror repositories. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Substitute "/" with $opt_s in tag names as well as branch namesJoe English2006-01-061-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>
| | * Teach cvsexportcommit to add new filesYann Dirson2006-01-061-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>
* | | Add a test for rebase when a change was picked upstreamYann Dirson2006-01-081-0/+53
| | | | | | | | | | | | | | | | | | | | | This test exercises the standard feature that makes rebase useful. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add a minimal test for git-cherryYann Dirson2006-01-081-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test checks that git-cherry finds the expected number of patches in two simple cases, and then tests the new limit arguments. [jc: collapsed two patches into one and added sleep to make sure the two commits would get different timestamps] Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add an optional limit to git-cherryYann Dirson2006-01-081-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to use another commit than the merge base as a limit for scanning patches. [jc: part about t3500 test omitted.] Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-daemon --base-pathPetr Baudis2006-01-072-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tommi Virtanen expressed a wish on #git to be able to use short and elegant git URLs by making git-daemon 'root' in a given directory. This patch implements this, causing git-daemon to interpret all paths relative to the given base path if any is given. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | describe: allow more than one revs to be named.Junio C Hamano2006-01-073-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | The main loop was prepared to take more than one revs, but the actual naming logic wad not (it used pop_most_recent_commit while forgetting that the commit marks stay after it's done). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | ls-files --others --directory: testJunio C Hamano2006-01-071-6/+28
| | | | | | | | | | | | | | | | | | Add a test to run with --directory option. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-status: use ls-files --others --directory for untracked list.Junio C Hamano2006-01-071-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>
* | | ls-files --others --directory: give trailing slashJunio C Hamano2006-01-071-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>
* | | ls-files --others --directory: fix a bug with index entry orderingJunio C Hamano2006-01-071-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>
* | | ls-files -o: optionally skip showing the contents in "untracked" directoriesLinus Torvalds2006-01-071-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>
* | | git-fetch: auto-following tags.Junio C Hamano2006-01-072-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>
* | | Make GIT-VERSION-GEN tolerate missing git describe commandJohn Ellson2006-01-051-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>
* | | Merge fixes up to GIT 1.0.7Junio C Hamano2006-01-0560-115/+202
|\ \ \ | |/ / | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | GIT 1.0.7v1.0.7Junio C Hamano2006-01-0561-116/+203
| |\ \ | | |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * Fix git-symbolic-ref typo in git.txt.Jon Loeliger2006-01-051-1/+1
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * git: grok 'help' to mean '--help'.Andreas Ericsson2006-01-051-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>
| | * Documentation/git-svnimport: document -T and -t switches correctlyEric Wong2006-01-051-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>
| | * svnimport: support repositories requiring SSL authenticationEric Wong2006-01-051-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>
| | * t3300: skip when filesystem does not like TAB in filenames.Junio C Hamano2006-01-051-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>
| | * format-patch/commit: Quote single quote in the author name properly.Junio C Hamano2006-01-052-0/+2
| | | | | | | | | | | | | | | | | | Noticed by Kyle McMartin. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * git-fetch --tags: reject malformed tags.Junio C Hamano2006-01-051-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>
View Lorry Controller Status