summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* More portability.Junio C Hamano2005-10-014-22/+34
| | | | | | | | | | | - The location of openssl development files got customizable. - The location of iconv development files got customizable. - Pass $TAR down to t5000 test so that the user can override with 'gmake TAR=gtar'. - Solaris 'bc' does not seem to grok "define abs()". There is no reason to use bc there -- expr would do. Signed-off-by: Junio C Hamano <junio@twinsun.com>
* Add git-symbolic-refJunio C Hamano2005-10-0116-57/+176
| | | | | | | | | | | | | This adds the counterpart of git-update-ref that lets you read and create "symbolic refs". By default it uses a symbolic link to represent ".git/HEAD -> refs/heads/master", but it can be compiled to use the textfile symbolic ref. The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah .git/HEAD' have been converted to use new git-symbolic-ref command, so that they can deal with either implementation. Signed-off-by: Junio C Hamano <junio@twinsun.com>
* Use resolve_ref() to implement read_ref().Junio C Hamano2005-10-013-88/+64
| | | | | | | Symbolic refs are understood by resolve_ref(), so existing read_ref() users will automatically understand them as well. Signed-off-by: Junio C Hamano <junio@twinsun.com>
* [PATCH] Allow reading "symbolic refs" that point to other refsLinus Torvalds2005-10-013-49/+42
| | | | | | | | | | | | | | | | This extends the ref reading to understand a "symbolic ref": a ref file that starts with "ref: " and points to another ref file, and thus introduces the notion of ref aliases. This is in preparation of allowing HEAD to eventually not be a symlink, but one of these symbolic refs instead. [jc: Linus originally required the prefix to be "ref: " five bytes and nothing else, but I changed it to allow and strip any number of leading whitespaces to match what update-ref.c does.] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Teach update-ref about a symbolic ref stored in a textfile.Junio C Hamano2005-10-011-1/+14
| | | | | | | | | | | | | | | | | A symbolic ref is a regular file whose contents is "ref:", followed by optional leading whitespaces, followed by a GIT_DIR relative pathname, followed by optional trailing whitespaces (the optional whitespaces are unconditionally removed, so you cannot have leading nor trailing whitespaces). This can be used in place of a traditional symbolic link .git/HEAD that usually points at "refs/heads/master". You can instead have a regular file .git/HEAD whose contents is "ref: refs/heads/master". [jc: currently the code does not enforce the symbolic ref to begin with refs/, unlike the symbolic link case. It may be worthwhile to require either case to begin with refs/ and not have any /./ nor /../ in them.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] git fetch --tagsLinus Torvalds2005-10-011-1/+24
| | | | | | | | | | | | | | | | You can do git fetch --tags <linus-kernel-repo> and it should fetch all my tags automatically. [jc: The original by Linus fetched and overwrote branch heads with --all, which felt dangerous and wrong, so I removed it. Also this version does not use any refs that resulted as --tags for later merge. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] HTTP partial transfer support fix.Nick Hengeveld2005-10-011-1/+0
| | | | | | | | Don't unlink the temp file when an object transfer fails, so next attempt will pick up where the failed transfer left off Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update partial HTTP transfers.Junio C Hamano2005-10-011-4/+11
| | | | | | | | | | | | | | | | | | Add the sanity checks discussed on the list with Nick Hengeveld in <20050927000931.GA15615@reactrix.com>. * unlink of previous and rename from temp to previous can fail for reasons other than benign ones (missing previous and missing temp). Report these failures when we encounter them, to make diagnosing problems easier. * when rewinding the partially written result, make sure to truncate the file. Also verify the pack after downloading by calling verify_packfile(). Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] HTTP partial transfer support for object, pack, and index transfersNick Hengeveld2005-10-011-23/+161
| | | | | | | | | | HTTP partial transfer support for object, pack, and index transfers [jc: this should not be placed in "master" -- it does not have any fixes requested on the list.] Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Pass CVSps generated A U Thor <author@domain.xz> intact.Junio C Hamano2005-10-011-7/+11
| | | | | | | | | | Alexey Nezhdanov updated CVSps to generate author-name and author-email information in its output. If the input looks like it has that already properly formatted, use that without our own munging. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] archimport: Actually cope with merges from "remote" repositories. ↵Martin Langhoff2005-10-011-1/+7
| | | | | | | | | | | | Plus: Nicer messages. archimport was refusing to import commits that had merges from repositories that it didn't know about. Fixed. Also brings in nicer messages. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Honor extractor's umask in git-tar-tree.Junio C Hamano2005-10-011-0/+2
| | | | | | | | | The archive generated with git-tar-tree had 0755 and 0644 mode bits. This inconvenienced the extractor with umask 002 by robbing g+w bit unconditionally. Just write it out with loose permissions bits and let the umask of the extractor do its job. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Honor user's umask.Junio C Hamano2005-10-012-2/+2
| | | | | | | | | Fix the last two holdouts that forced mode bits stricter than the user's umask. Noticed by Wolfgang Denk and fixed by Linus. [jc: applied the same fix to mailsplit just for the sake of consistency.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Flag empty patches as errorsLinus Torvalds2005-09-301-0/+13
| | | | | | | | | | | | | | | | | | | | | | | A patch that contains no actual diff, and that doesn't change any meta-data is bad. It shouldn't be a patch at all, and git-apply shouldn't just accept it. This caused a corrupted patch to be silently applied as an empty change in the kernel, because the corruption ended up making the patch look empty. An example of such a patch is one that contains the patch header, but where the initial fragment header (the "@@ -nr,.." line) is missing, causing us to not parse any fragments. The real "patch" program will also flag such patches as bad, with the message patch: **** Only garbage was found in the patch input. and we should do likewise. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Consolidate null_sha1[].Junio C Hamano2005-09-304-3/+4
| | | | Signed-off-by: Junio C Hamano <junio@twinsun.com>
* Still installing the old command names.Junio C Hamano2005-09-302-11/+6
| | | | | | | | | | | | | After seeing Jeff's guide, I changed my mind about the big-rename transition plan. Even if Porcelains are kept up to date, those web documents that describes older world order would live longer and people will stumble across them via google searches. And who knows how many mirrored copies there are. The backward compatible symbolic links *will* be removed before 1.0. But that will not happen in 0.99.8. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Tell which packfile is corrupt when we die.Junio C Hamano2005-09-301-3/+5
| | | | | | | The core part detected and died upon seeing a corrupted packfile, but did not help the user by telling which packfile is corrupt and how. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Make logerror() and loginfo() staticPavel Roskin2005-09-291-2/+2
| | | | | | | | | | | Make logerror() and loginfo() static logerror() and loginfo() in daemon.c are never declared and never called from other files, therefore they should be declared static. Found by sparse. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Old curl does not know about CURLOPT_SSLKEYJohannes Schindelin2005-09-291-0/+2
| | | | | | | ... so try to set it only in later versions. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use git-merge in git-pull (second try).Junio C Hamano2005-09-291-4/+44
| | | | | | | | | | | | | | This again makes git-pull to use git-merge, so that different merge strategy can be specified from the command line. Without explicit strategy parameter, it defaults to git-merge-resolve if only one remote is pulled, and git-merge-octopus otherwise, to keep the default behaviour of the command the same as the original. Also this brings another usability measure: -n flag from the command line, if given, is passed to git-merge to prevent it from running the diffstat at the end of the merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use git-update-ref in scripts.Junio C Hamano2005-09-289-32/+39
| | | | | | | | | This uses the git-update-ref command in scripts for safer updates. Also places where we used to read HEAD ref by using "cat" were fixed to use git-rev-parse. This will matter when we start using symbolic references. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Make some needlessly global stuff staticPeter Hagervall2005-09-283-5/+5
| | | | | | | Insert 'static' where appropriate. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Support for more CURL SSL settings via environment variablesNick Hengeveld2005-09-281-0/+19
| | | | | | | | | Added support for additional CURL SSL settings via environment variables. Client certificate/key files can be specified as well as alternate CA information. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Add new programs to .gitignore.Tom Prince2005-09-281-0/+2
| | | | | Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fastpath the normal case by not checking that index matches HEAD.Junio C Hamano2005-09-281-7/+4
| | | | | | | The merge strategy would check this itself and typically does it by using git-read-tree -m -u 3-way merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix default pull not to do an unintended Octopus.Junio C Hamano2005-09-284-8/+43
| | | | | | | | | | | | The refspecs specified in the .git/remotes/<remote> on the "Pull: " lines are for fetching multiple heads in one go, but most of the time making an Octopus out of them is not what is wanted. Make git-fetch leave the marker in .git/FETCH_HEAD file so that later stages can tell which heads are for merging and which are not. Tom Prince made me realize how stupid the original behaviour was. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update the case table in t/t1000.Junio C Hamano2005-09-281-31/+12
| | | | | | | | It still talked about "the proposed alternative semantics" but we have used those alternative semantics for quite some time. Update them to avoid confusion. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge master.kernel.org:/home/hpa/git/daemonJunio C Hamano2005-09-272-6/+74
|\
| * COPTS -> CFLAGSH. Peter Anvin2005-09-271-1/+2
| |
| * Parallelize the buildH. Peter Anvin2005-09-271-2/+5
| |
| * Merge with git+ssh://master.kernel.org/pub/scm/git/git.gitH. Peter Anvin2005-09-278-39/+89
| |\
| * | Restore chdir(".git")H. Peter Anvin2005-09-271-0/+2
| | |
| * | Support a modicum of path validation, and allow an export all trees option.H. Peter Anvin2005-09-261-5/+67
| | |
* | | git-commit: use update-index --stdin, instead of xargs.Junio C Hamano2005-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | Now update-index supports '-z --stdin', we do not have to rely on platform xargs to support -0 option. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | update-index: document --stdin and -zJunio C Hamano2005-09-271-1/+10
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | update-index: --stdin and -zJunio C Hamano2005-09-271-13/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new option --stdin reads list of paths to be updated from the standard input. As usual, -z means the paths are terminated with NUL characters, as opposed to LF without that option. This is useful to use git-diff-files -z and git-ls-files -z when the platform xargs does not support -0 option, and obviously saves one process even when xargs can take -0. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] Return CURL error message when object transfer failsNick Hengeveld2005-09-271-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return CURL error message when object transfer fails [jc: added similar curl_errorstr errors to places where we use curl_easy_perform() to run fetch that _must_ succeed.] Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] Implement --recover for git-*-fetchDaniel Barkalow2005-09-275-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | With the --recover option, we verify that we have absolutely everything reachable from the target, not assuming that things reachable from refs will be complete. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] Provide access to git_dir through get_git_dir().Sven Verdoolaege2005-09-274-7/+10
| | | | | | | | | | | | | | | Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] Make the test more shell generic and fix missing Solaris find optionPeter Eriksen2005-09-273-3/+4
| |/ |/| | | | | | | | | This is from Peter Eriksen, but further fixed. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Really require tk 8.4 (RPM)Junio C Hamano2005-09-271-1/+1
| | | | | | | | | | **BLUSH** Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Require tk 8.4 (RPM)Junio C Hamano2005-09-261-1/+1
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano2005-09-261-1/+9
|\ \
| * | Use "$@" rather than "${1+$@}" when invoking wish.Paul Mackerras2005-09-271-1/+1
| | |
| * | Change wish8.4 back to wishPaul Mackerras2005-09-261-1/+1
| | | | | | | | | | | | | | | | | | Checking in the change from wish to wish8.4 was a mistake; I had changed it for a test but forgot to change it back before checking in a patch.
| * | [PATCH] Add new keybindingsRobert Suetterlin2005-09-221-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds several new keybindings to allow history and selectline navigation. I basically added Opera-like history traversal, as well as left-right-cursor history traversal and vi-like motion commands. Signed-off-by: Robert Suetterlin <robert@mpe.mpg.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | git-fetch: send informational output to >&2 consistently.Junio C Hamano2005-09-261-1/+1
| | | | | | | | | | | | | | | | | | Only the "Fetching ... using http" was leaking to stdout. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Give default merge message after failed automerge.Junio C Hamano2005-09-262-4/+13
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Do not require clean tree when reverting and cherry-picking.Junio C Hamano2005-09-262-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My stupidity deserved to be yelled at by Linus ... there is no reason to require the working tree to be clean when merging -- the only requirements are index to match HEAD commit and the paths involved in merge are up to date in the working tree. Revert and cherry-pick are just specialized forms of merge, and the requirements should be the same. Remove the 'general purpose routine to make sure tree is clean' from git-sh-setup, to prevent me from getting tempted again. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Fix overzealous cleanliness check in git-mergeJunio C Hamano2005-09-261-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Being able to try multiple strategies and automatically picking one that seems to give less conflicting result may or may not much sense in practice. At least that should not force normal use case to additionally require the working tree to be fully clean. As Linus shouted, local changes do not matter unless they interfere with the merge. This commit changes git-merge not to require a clean working tree. Only when we will iterate through more than one merge strategies, local changes are stashed away before trying the first merge, and restored before second and later merges are attempted. The index file must be in sync with HEAD in any case -- otherwise the merge result would contain changes since HEAD that was done locally and registered in the index. This check is already enforced by three-way read-tree existing merge strategies use, but is done here as a safeguard as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status