aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix default pull not to do an unintended Octopus.Junio C Hamano2005-09-28
| | | | | | | | | | | | 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-28
| | | | | | | | 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-27
|\
| * COPTS -> CFLAGSH. Peter Anvin2005-09-27
| |
| * Parallelize the buildH. Peter Anvin2005-09-27
| |
| * Merge with git+ssh://master.kernel.org/pub/scm/git/git.gitH. Peter Anvin2005-09-27
| |\
| * | Restore chdir(".git")H. Peter Anvin2005-09-27
| | |
| * | Support a modicum of path validation, and allow an export all trees option.H. Peter Anvin2005-09-26
| | |
* | | git-commit: use update-index --stdin, instead of xargs.Junio C Hamano2005-09-27
| | | | | | | | | | | | | | | | | | | | | 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-27
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | update-index: --stdin and -zJunio C Hamano2005-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27
| | | | | | | | | | | | | | | 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-27
| |/ |/| | | | | | | | | 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-27
| | | | | | | | | | **BLUSH** Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Require tk 8.4 (RPM)Junio C Hamano2005-09-26
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge http://www.kernel.org/pub/scm/gitk/gitkJunio C Hamano2005-09-26
|\ \
| * | Use "$@" rather than "${1+$@}" when invoking wish.Paul Mackerras2005-09-27
| | |
| * | Change wish8.4 back to wishPaul Mackerras2005-09-26
| | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Do not require clean tree when reverting and cherry-picking.Junio C Hamano2005-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | git-clone: check out "master" by default.Junio C Hamano2005-09-26
| |/ |/| | | | | | | | | And with -n flag you can tell it not to. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Plug a small race in update-ref.c.Junio C Hamano2005-09-25
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Add "git-update-ref" to update the HEAD (or other) refLinus Torvalds2005-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a careful version of the script stuff that currently just blindly writes HEAD with a new value. You can use git-update-ref HEAD <newhead> or git-update-ref HEAD <newhead> <oldhead> where the latter version verifies that the old value of HEAD matches oldhead. It basically allows a "ref" file to be a symbolic pointer to another ref file by starting with the four-byte header sequence of "ref:". More importantly, it allows the update of a ref file to follow these symbolic pointers, whether they are symlinks or these "regular file symbolic refs". NOTE! It follows _real_ symlinks only if they start with "refs/": otherwise it will just try to read them and update them as a regular file (ie it will allow the filesystem to follow them, but will overwrite such a symlink to somewhere else with a regular filename). In general, using git-update-ref HEAD "$head" should be a _lot_ safer than doing echo "$head" > "$GIT_DIR/HEAD" both from a symlink following standpoint _and_ an error checking standpoint. The "refs/" rule for symlinks means that symlinks that point to "outside" the tree are safe: they'll be followed for reading but not for writing (so we'll never write through a ref symlink to some other tree, if you have copied a whole archive by creating a symlink tree). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] More descriptive messages for conflict cases in mergesFredrik Kuivinen2005-09-25
| | | | | | | | | | | | | | | | | | The merge strategies can give more descriptive error messages for conflict cases if they are given the actual branch names instead of the SHA1s. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] recursive-merge: Don't print a stack trace when read-tree fails.Fredrik Kuivinen2005-09-25
| | | | | | | | | | | | | | | | | | If the working tree is dirty read-tree will fail, and we don't want an ugly stack trace in that case. Also make sure we don't print stack traces when we use 'die'. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Diff: --name-status output format.Junio C Hamano2005-09-24
| | | | | | | | | | | | The new output format shows only the status letter and paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Diff: -l<num> to limit rename/copy detection.Junio C Hamano2005-09-24
| | | | | | | | | | | | | | | | When many paths are modified, rename detection takes a lot of time. The new option -l<num> can be used to disable rename detection when more than <num> paths are possibly created as renames. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Diff clean-up.Junio C Hamano2005-09-24
| | | | | | | | | | | | | | This is a long overdue clean-up to the code for parsing and passing diff options. It also tightens some constness issues. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fixes'Junio C Hamano2005-09-24
|\ \
| * | show-branch: fix commit naming breakage.Junio C Hamano2005-09-24
| | | | | | | | | | | | | | | | | | | | | | | | It was ignoring the generation number of the commit when naming 2nd and later parents, showing "(linus^n)^2" for any <n> incorrectly as "linus^2". Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-grep: fix 'git grep -e $pattern' handlingJunio C Hamano2005-09-24
| | | | | | | | | | | | | | | | | | | | | | | | People typically say 'grep -e $pattern' because $pattern has a leading dash which would be mistaken as a grep flag. Make sure we pass -e in front of $pattern when we invoke grep. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Clean generated files a bit more.Junio C Hamano2005-09-24
| | | | | | | | | | | | | | | | | | | | | | | | Now we conditionally compile things in compat/, so we should remove object files there. Python execution can leave *.pyc and *.pyo, which need to be cleaned as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Stop installing the backward compatible symlinks.Junio C Hamano2005-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cmd-renames.sh can now be used to remove the backward compatible symlinks -- this is not used by default in any way. As discussed on the list with Pasky, git-ssh-push and git-ssh-pull will keep calling each other for a while longer. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] Finish documenting trivial merge rulesDaniel Barkalow2005-09-24
| | | | | | | | | | | | | | | | | | | | | | | | Fix missing symbol explanations, a few incorrect cases, and add two-way merge rules. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Remove use of 'xargs -0' from git-reset.Junio C Hamano2005-09-24
| | | | | | | | | | | | | | | | | | | | | | | | Even without the trouble it causes to people without GNU xargs, it was not really necessary to print from Perl and then remove it outside. Just unlink it inside Perl. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Use 0.99.7.GIT as version between 0.99.7 and 0.99.8Junio C Hamano2005-09-24
| | | | | | | | | | | | | | | | | | | | | Pasky taught me how he does his versioning for ELinks. This will sort after 0.99.7 and interim fixes 0.99.7a, and before 0.99.8. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Solaris: give a bit more built-in defaults.Junio C Hamano2005-09-24
| | | | | | | | | | | | | | | | | | | | | Taking the make command line Peter Eriksen uses, give defaults to SHELL_PATH, TAR, CURLDIR, NO_STRCASESTR, and INSTALL. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] CURLDIR in MakefilePatrick Mauritz2005-09-24
| | | | | | | | | | | | | | | | | | | | | | | | Support systems that do not install curl headers and libraries in /usr/{include,lib}. Signed-off-by: Patrick Mauritz <oxygene@studentenbude.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] Rename daemon.c's lognotice() to loginfo()Petr Baudis2005-09-24
| | | | | | | | | | | | | | | | | | | | | | | | The syslog code logs with severity LOG_INFO in the loginfo() function, so make things less confusing. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] git-daemon --syslog to log through syslogPetr Baudis2005-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well, this makes it even more clear that we need the packet reader and friends to use the daemon logging code. :/ Therefore, we at least indicate in the "Disconnect" log message if the child process exitted with an error code or not. Idea by Linus. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | [PATCH] Update git-daemon documentation wrt. the --verbose parameterPetr Baudis2005-09-24
| | | | | | | | | | | | | | | Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Really ignore generated distribution material.Junio C Hamano2005-09-24
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | daemon.c: pid_t is not int.Junio C Hamano2005-09-23
| | | | | | | | | | | | | | | | | | Reported by Morten Welinder <mwelinder@gmail.com>. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge 'fixes' branch.Junio C Hamano2005-09-23
|\ \ \ | |/ / | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Further clarify licensing status of compat/subprocess.py.Junio C Hamano2005-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | PSF license explicitly states the files in Python distribution is compatible with GPL, and upstream clarified the licensing terms by shortening its file header. This version is a verbatim copy from release24-maint branch form Python CVS. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-13 11:06:43 +0000