summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2005-09-30socklen_t is unsigned int on most Linux platformsLibravatar H. Peter Anvin1-1/+1
2005-09-30Use xmalloc/xcallocLibravatar H. Peter Anvin1-6/+2
2005-09-30Don't need <alloca.h>Libravatar H. Peter Anvin1-1/+0
2005-09-30Change $(X) -> $X to be less annoying.Libravatar H. Peter Anvin1-33/+33
2005-09-30Merge with master.kernel.org:/pub/scm/git/git.gitLibravatar H. Peter Anvin5-16/+15
2005-09-30Still installing the old command names.Libravatar Junio C Hamano2-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>
2005-09-30Tell which packfile is corrupt when we die.Libravatar Junio C Hamano1-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>
2005-09-29[PATCH] Make logerror() and loginfo() staticLibravatar Pavel Roskin1-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>
2005-09-29[PATCH] Old curl does not know about CURLOPT_SSLKEYLibravatar Johannes Schindelin1-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>
2005-09-29Merge with master.kernel.org:/pub/scm/git/git.gitLibravatar Peter Anvin1-4/+44
2005-09-29git-http-fetch needs $(X)Libravatar hpa1-1/+1
2005-09-29Use git-merge in git-pull (second try).Libravatar Junio C Hamano1-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>
2005-09-28Just explicitly add $(X) to most programs.Libravatar H. Peter Anvin1-30/+25
2005-09-28Ignore *.exe filesLibravatar Peter Anvin1-0/+1
2005-09-28Merge with http://www.kernel.org/pub/scm/git/git.gitLibravatar Peter Anvin16-83/+124
2005-09-28Handle Cygwin .exe extensionsLibravatar Peter Anvin1-24/+24
2005-09-28Remove variables not needed when using pollLibravatar Peter Anvin1-4/+0
2005-09-28Remove *.exe for Cygwin's benefitLibravatar Peter Anvin1-1/+1
2005-09-28NO_IPV6 support for git daemonLibravatar Peter Anvin3-18/+77
2005-09-28For the benefit of Cygwin, test for git-cmd.exeLibravatar Peter Anvin1-0/+3
2005-09-28(no commit message)Libravatar Peter Anvin1-0/+1
2005-09-28Call it NO_IPV6 rather than hard-coding __CYGWIN__Libravatar hpa2-4/+14
2005-09-28Use git-update-ref in scripts.Libravatar Junio C Hamano9-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>
2005-09-28[PATCH] Make some needlessly global stuff staticLibravatar Peter Hagervall3-5/+5
Insert 'static' where appropriate. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-28[PATCH] Support for more CURL SSL settings via environment variablesLibravatar Nick Hengeveld1-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>
2005-09-28[PATCH] Add new programs to .gitignore.Libravatar Tom Prince1-0/+2
Signed-off-by: Tom Prince <tom.prince@ualberta.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-28Cygwin doesn't support IPv6 or getaddrinfo()Libravatar hpa1-0/+73
2005-09-28Options to compile on CygwinLibravatar hpa1-0/+4
2005-09-28Fastpath the normal case by not checking that index matches HEAD.Libravatar Junio C Hamano1-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>
2005-09-28Fix default pull not to do an unintended Octopus.Libravatar Junio C Hamano4-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>
2005-09-28Update the case table in t/t1000.Libravatar Junio C Hamano1-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>
2005-09-27Merge master.kernel.org:/home/hpa/git/daemonLibravatar Junio C Hamano2-6/+74
2005-09-27git-commit: use update-index --stdin, instead of xargs.Libravatar Junio C Hamano1-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>
2005-09-27update-index: document --stdin and -zLibravatar Junio C Hamano1-1/+10
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-27update-index: --stdin and -zLibravatar Junio C Hamano1-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>
2005-09-27COPTS -> CFLAGSLibravatar H. Peter Anvin1-1/+2
2005-09-27Parallelize the buildLibravatar H. Peter Anvin1-2/+5
2005-09-27Merge with git+ssh://master.kernel.org/pub/scm/git/git.gitLibravatar H. Peter Anvin8-39/+89
2005-09-27Restore chdir(".git")Libravatar H. Peter Anvin1-0/+2
2005-09-27[PATCH] Return CURL error message when object transfer failsLibravatar Nick Hengeveld1-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>
2005-09-27[PATCH] Implement --recover for git-*-fetchLibravatar Daniel Barkalow5-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>
2005-09-27[PATCH] Provide access to git_dir through get_git_dir().Libravatar Sven Verdoolaege4-7/+10
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-27[PATCH] Make the test more shell generic and fix missing Solaris find optionLibravatar Peter Eriksen3-3/+4
This is from Peter Eriksen, but further fixed. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-27Really require tk 8.4 (RPM)Libravatar Junio C Hamano1-1/+1
**BLUSH** Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-26Support a modicum of path validation, and allow an export all trees option.Libravatar H. Peter Anvin1-5/+67
2005-09-26Require tk 8.4 (RPM)Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-26Merge http://www.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-1/+9
2005-09-26git-fetch: send informational output to >&2 consistently.Libravatar Junio C Hamano1-1/+1
Only the "Fetching ... using http" was leaking to stdout. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-26Give default merge message after failed automerge.Libravatar Junio C Hamano2-4/+13
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-26Do not require clean tree when reverting and cherry-picking.Libravatar Junio C Hamano2-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 00:25:44 +0000