aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Remove "octopus".Junio C Hamano2005-12-19
| | | | | | | | | We still advertise "git resolve" as a standalone command, but never "git octopus", so nobody should be using it and it is safe to retire it. The functionality is still available as a strategy backend. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove unused cmd-rename.shJunio C Hamano2005-12-19
| | | | | | | This file is a remnant from the big command rename which happened quite some time ago. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Remove generated files */*.py[co]Junio C Hamano2005-12-19
| | | | | | We missed ones in the compat/ subdirectory. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: stdout of update-hook is connected to /dev/nullJunio C Hamano2005-12-19
| | | | | | Mention that update-hook does not emit its stdout to the sender. Signed-off-by: Junio C Hamano <junkio@cox.net>
* rev-list --objects: fix object list without commit.Junio C Hamano2005-12-19
| | | | | | | | | Earlier, "rev-list --objects <sha1>" for an object chain that does not have any commit failed with a usage message. This fixes "send-pack remote $tag" where tag points at a non-commit (e.g. a blob). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/git-archimport: document -o, -a, f, -D optionsEric Wong2005-12-19
| | | | | | | Also, ensure usage help switches are in the same order. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* howto/using-topic-branches: Recommend public URL git://git.kernel.org/Junio C Hamano2005-12-19
| | | | | | | Recommending this means subsystem maintainers do not have to log-in just to resync with upstream. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make "git help" sort git commands in columnsLinus Torvalds2005-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes "pretty_print_string_list()" to show the git commands alphabetically in column order, which is the normal one. Ie instead of doing git commands available in '/home/torvalds/bin' ---------------------------------------------- add am ... applypatch archimport ... cat-file check-ref-format ... ... it does git commands available in '/home/torvalds/bin' ---------------------------------------------- add diff-tree ... am fetch ... apply fetch-pack ... ... where each column is sorted. This is how "ls" sorts things too, and since visually the columns are much more distinct than the rows, so it _looks_ more sorted. The "ls" command has a "-x" option that lists entries by lines (the way git.c used to): if somebody wants to do that, the new print-out logic could be easily accomodated to that too. Matter of taste and preference, I guess. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make "git help" react to window size correctlyLinus Torvalds2005-12-18
| | | | | | | | | | | | | | Currently the git "show commands" function will react to the environment variable COLUMNS, or just default to a width of 80 characters. That's just soo eighties. Nobody sane sets COLUMNS any more, unless they need to support some stone-age software from before the age of steam engines, SIGWINCH and TIOCGWINSZ. So get with the new century, and use TIOCGWINSZ to get the terminal size. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: typos and small fixes in "everyday".Junio C Hamano2005-12-18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* clone-pack: remove unused and undocumented --keep flagJunio C Hamano2005-12-18
| | | | | | | While we are at it, give fully spelled --keep to fetch-pack. Also give --quiet in addition to -q to fetch-pack as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
* fetch-pack: -k option to keep downloaded pack.Junio C Hamano2005-12-17
| | | | | | | | | | | | | | Split out the functions that deal with the socketpair after finishing git protocol handshake to receive the packed data into a separate file, and use it in fetch-pack to keep/explode the received pack data. We earlier had something like that on clone-pack side once, but the list discussion resulted in the decision that it makes sense to always keep the pack for clone-pack, so unpacking option is not enabled on the clone-pack side, but we later still could do so easily if we wanted to with this change. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Revert "get_sha1_basic(): corner case ambiguity fix"Junio C Hamano2005-12-17
| | | | | | | This reverts 6677c4665af2d73f670bec382bc82d0f2e9513fb commit. The misguided disambiguation has been reverted, so there is no point testing that misfeature.
* Revert "We do not like "HEAD" as a new branch name"Junio C Hamano2005-12-17
| | | | This reverts ee34518d629331dadd58b1a75294369d679eda8b commit.
* Revert "refs.c: off-by-one fix."Junio C Hamano2005-12-17
| | | | This reverts 06bf6ac4248e834a229027908d405f5e42ac96d7 commit.
* Remove misguided branch disambiguation.Junio C Hamano2005-12-17
| | | | | | | | | | | | | | | | | | | | | | | | | | This removes the misguided attempt to refuse processing a branch name xyzzy and insist it to be given as either heads/xyzzy or tags/xyzzy when a tag xyzzy exists. There was no reason to do so --- the search order was predictable and well defined, so if the user says xyzzy we should have taken the tag xyzzy in such a case without complaining. This incidentally fixes another subtle bug related to this. If such a duplicate branch/tag name happened to be a unique valid prefix of an existing commit object name (say, "beef"), we did not take the tag "beef" but after complaining used the commit object whose name started with beef. Another problem this fixes while introducing some confusion is that there is no longer a reason to forbid a branch name HEAD anymore. In other words, now "git pull . ref1:HEAD" would work as expected, once we revert "We do not like HEAD branch" patch. It creates "HEAD" branch under ${GIT_DIR-.git}/refs/heads (or fast-forwards if already exists) using the tip of ref1 branch from the current repository, and merges it into the current branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: HTTP needs update-server-info.Junio C Hamano2005-12-17
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Comment fixes.Junio C Hamano2005-12-16
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix git-am --skipJan Harkes2005-12-16
| | | | | | | | | | | | | | | | | | | git-am --skip does not unpack the next patch and ends up reapplying the old patch, believing that it is the new patch in the sequence. If the old patch applied successfully it will commit it with the supposedly skipped log message and ends up dropping the following patch. If the patch did not apply the user is left with the conflict he tried to skip and has to unpack the next patch in the sequence by hand to get git-am back on track. By clearing the resume variable whenever skips bumps the sequence counter we correctly unpack the next patch. I also added another resume= in the case a patch file is missing from the sequence to avoid the same problem when a file in the sequence was removed. Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Forbid pattern maching characters in refnames.Junio C Hamano2005-12-16
| | | | | | by marking '?', '*', and '[' as bad_ref_char(). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Examples of resetting.Junio C Hamano2005-12-16
| | | | | | | | | | | Morten Welinder says examples of resetting is really about recovering from botched commit/pulls. I agree that pointers from commands that cause a reset to be needed in the first place would be very helpful. Also reset examples did not mention "pull/merge" cases. Signed-off-by: Junio C Hamano <junkio@cox.net>
* refs.c: off-by-one fix.Junio C Hamano2005-12-15
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* We do not like "HEAD" as a new branch nameJohannes Schindelin2005-12-15
| | | | | | | | | | | | | | This makes git-check-ref-format fail for "HEAD". Since the check is only executed when creating refs, the existing symbolic ref is safe. Otherwise these commands, most likely are pilot errors, would do pretty funky stuff: git checkout -b HEAD git pull . other:HEAD Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Sort globbed refname in show-branch.Junio C Hamano2005-12-15
| | | | | | | | "git show-branch bugs/*" shows all branches whose name match the specified pattern, but in the order readdir() happened to returned. Sort them to make the output more predictable. Signed-off-by: Junio C Hamano <junkio@cox.net>
* small cleanup for diff-delta.cNicolas Pitre2005-12-15
| | | | | | | | This patch removes unused remnants of the original xdiff source. No functional change. Possible tiny speed improvement. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-whatchanged: Add usage stringFredrik Kuivinen2005-12-15
| | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-log: Add usage stringFredrik Kuivinen2005-12-15
| | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-diff: Usage string clean-upFredrik Kuivinen2005-12-15
| | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* applymbox: typofixJunio C Hamano2005-12-15
| | | | | | | | Sorry, I broke this command completely with the stupid typo. Noticed by Marco Costalba. Signed-off-by: Junio C Hamano <junkio@cox.net>
* get_sha1_basic(): corner case ambiguity fixJunio C Hamano2005-12-15
| | | | | | | | | | | | | | When .git/refs/heads/frotz and .git/refs/tags/frotz existed, and the object name stored in .git/refs/heads/frotz were corrupt, we ended up picking tags/frotz without complaining. Worse yet, if the corrupt .git/refs/heads/frotz was more than 40 bytes and began with hexadecimal characters, it silently overwritten the initial part of the returned result. This commit adds a couple of tests to demonstrate these cases, with a fix. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: tutorialJunio C Hamano2005-12-14
| | | | | | | At the beginning of tutorial, refer the reader to everyday if she has not done so yet. Signed-off-by: Junio C Hamano <junkio@cox.net>
* svnimport: exit cleanly when we are up to dateMartin Langhoff2005-12-14
| | | | | | | | | Now we detect that the SVN repo does not have new commits for us and exit cleanly, removing the lockfile. With this, svnimport supports being run on a cronjob to maintain a SVN2GIT gateway. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* clone-pack: make it usable for partial branch cloning.Junio C Hamano2005-12-14
| | | | | | | | | | | | | | | | clone-pack had some logic to accept subset of remote refs from the command line and clone from there. However, it was never used in practice and its problems were not found out so far. This commit changes the command to output the object names of refs to the standard output instead of making a clone of the remote repository when explicit <head> parameters are given; the output format is the same as fetch-pack. The traditional behaviour of cloning the whole repository by giving no explicit <head> parameters stays the same. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git rebase loses author name/email if given bad email addressAmos Waterland2005-12-14
| | | | | | | | | | | If GIT_AUTHOR_EMAIL is of a certain form, `git rebase master' will blow away the author name and email when fast-forward merging commits. I have not tracked it down, but here is a testcase that demonstrates the behavior. Signed-off-by: Amos Waterland <apw@us.ibm.com> Acked-by: Michal Ostrowski <mostrows@watson.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Bugfixes for git-rebaseLukas Sandström2005-12-14
| | | | | | | | | | | Fix bugs in git-rebase wrt rebasing another branch than the current HEAD, rebasing with a dirty working dir, and rebasing a proper decendant of the target branch. [jc: with a bit of hand-merging] Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* mailinfo and git-am: allow "John Doe <johndoe>"Junio C Hamano2005-12-14
| | | | | | | | | | An isolated developer could have a local-only e-mail, which will be stripped out by mailinfo because it lacks '@'. Define a fallback parser to accomodate that. At the same time, reject authorless patch in git-am. Signed-off-by: Junio C Hamano <junkio@cox.net>
* define MAXPATHLEN for hosts that don't support itMartin Atukunda2005-12-14
| | | | | | [jc: Martin says syllable (www.syllable.org) wants this.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not let errors pass by unnoticed when running `make check'.Junio C Hamano2005-12-14
| | | | | | [jc: originally from Amos Waterland.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'hold/am'Junio C Hamano2005-12-14
|\
| * git-am support for naked email messages (take 2)H. Peter Anvin2005-12-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows git-am to accept single-message files as well as mboxes. Unlike the previous version, this one doesn't need to be explicitly told which one it is; rather, it looks to see if the first line is a From line and uses it to select mbox mode or not. I moved the logic to do all this into git-mailsplit, which got a new user interface as result, although the old interface is still available for backwards compatibility. [jc: applied with two obvious fixes.] Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | rebase: do not get confused in fast-forward situation.Junio C Hamano2005-12-14
| | | | | | | | | | | | | | | | When switching to another branch and rebasing it in a one-go, it failed to update the variable that holds the branch head, and did not detect fast-forward situation correctly. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fk/usage'Junio C Hamano2005-12-14
|\ \
| * | applypatch: no need to do non-portable [[ ... ]]Junio C Hamano2005-12-14
| | | | | | | | | | | | | | | | | | ... when old, proven, case would do. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-repack: Usage string clean-up, emit usage at incorrect invocationfreku045@student.liu.se2005-12-14
| | | | | | | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-rebase: Usage string clean-up, emit usage string at incorrect invocationfreku045@student.liu.se2005-12-14
| | | | | | | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-prune: Usage string clean-up, use the 'usage' functionfreku045@student.liu.se2005-12-14
| | | | | | | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-lost-found: Usage string clean-up, emit usage string at incorrect invocationfreku045@student.liu.se2005-12-14
| | | | | | | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-fetch: Usage string clean-up, emit usage string at unrecognized optionfreku045@student.liu.se2005-12-14
| | | | | | | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-cherry: Usage string clean-up, use the 'usage' functionfreku045@student.liu.se2005-12-14
| | | | | | | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | git-applypatch: Usage string clean-up, emit usage string at incorrect invocationfreku045@student.liu.se2005-12-14
| | | | | | | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 04:46:32 +0000