summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge with master.kernel.org:/pub/scm/git/git.gitH. Peter Anvin2005-09-305-16/+15
|\
| * 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>
* | Merge with master.kernel.org:/pub/scm/git/git.gitPeter Anvin2005-09-291-4/+44
|\ \ | |/
| * 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>
* | git-http-fetch needs $(X)hpa2005-09-291-1/+1
| |
* | Just explicitly add $(X) to most programs.H. Peter Anvin2005-09-281-30/+25
| |
* | Ignore *.exe filesPeter Anvin2005-09-281-0/+1
| |
* | Merge with http://www.kernel.org/pub/scm/git/git.gitPeter Anvin2005-09-2816-83/+124
|\ \ | |/
| * 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>
* | Handle Cygwin .exe extensionsPeter Anvin2005-09-281-24/+24
| |
* | Remove variables not needed when using pollPeter Anvin2005-09-281-4/+0
| |
* | Remove *.exe for Cygwin's benefitPeter Anvin2005-09-281-1/+1
| |
* | NO_IPV6 support for git daemonPeter Anvin2005-09-283-18/+77
| |
* | For the benefit of Cygwin, test for git-cmd.exePeter Anvin2005-09-281-0/+3
| |
* | (no commit message)Peter Anvin2005-09-281-0/+1
| |
* | Call it NO_IPV6 rather than hard-coding __CYGWIN__hpa2005-09-282-4/+14
| |
* | Cygwin doesn't support IPv6 or getaddrinfo()hpa2005-09-281-0/+73
| |
* | Options to compile on Cygwinhpa2005-09-281-0/+4
|/
* 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