aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add copy/rename check for git-apply.Junio C Hamano2005-09-04
| | | | | | | | | | | The new test pattern is taken from HPA's klibc and klibc-kbuild trees, which has many interesting renames (the commits 001eef5a19219e5b0601068a3d13874b88c0653e and 0037d1bc0deaf7daec3778496656cb04b4e4b9d0). The test pattern exposes problems in the apply.c changes currently in the proposed updates branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add a link from update-server-info documentation to repository layout.Junio C Hamano2005-09-04
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Make git-apply understand incomplete lines in non-C localesFredrik Kuivinen2005-09-04
| | | | | | | | | | | | | | | | | | | | | | | | The message "\ No newline at end of file" used by diff(1) to mark an incomplete line is locale dependent. We can't assume more than that it begins with "\ ". For example, given two files, "foo" and "bar", with appropriate contents, 'diff -u foo bar' will produce the following output on my system: --- foo 2005-09-04 18:59:38.000000000 +0200 +++ bar 2005-09-04 18:59:16.000000000 +0200 @@ -1 +1 @@ -foobar +foo \ Ingen nyrad vid filslut [jc: the check for the marker still uses the line length being no less than 12 bytes for a sanity check, but I think it is safe to assume that in other locales. I haven't checked the .po files from diff, tho'.] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-applymbox: fix '-c'.Junio C Hamano2005-09-04
| | | | | | | Earlier round b50abe8843006e9856c633b5abeb4eab53b46629 broke it by carelessly rewriting the main loop. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] archimport: avoid committing on an Arch tagMartin Langhoff2005-09-04
| | | | | | | | | | Arch tags are full commits (without any changed files) as well. Trust Arch to have put an unchanged tree in place (which seems to do reliably), and just add a tag & new branch. Speeds up Arch imports significantly, and leaves history in a much saner state. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] archimport autodetects import status, supports incremental importsMartin Langhoff2005-09-04
| | | | | | | | | | If there is no GIT directory, archimport will assume it is an initial import. It now also supports incremental imports, skipping "seen" commits. You can now run it repeatedly to pull new commits from the Arch repository. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] NUL terminate the object data in patch_delta()Sergey Vlasov2005-09-04
| | | | | | | | | | | | At least pretty_print_commit() expects to get NUL-terminated commit data to work properly. unpack_sha1_rest(), which reads objects from separate files, and unpack_non_delta_entry(), which reads non-delta-compressed objects from pack files, already add the NUL byte after the object data, but patch_delta() did not do it, which caused problems with, e.g., git-rev-list --pretty when there are delta-compressed commit objects. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Possible cleanups for local-pull.cPeter Hagervall2005-09-04
| | | | | | | | | | Hi. This patch contains the following possible cleanups: * Make some needlessly global functions in local-pull.c static * Change 'char *' to 'const char *' where appropriate Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Doc: replace read-cache with git-read-tree.Paolo 'Blaisorblade' Giarrusso2005-09-04
| | | | | | | | | Replace references to "read-cache" with references to git-read-tree in the documentation. I chose that because reference say "see read-cache about stages", and stages are explained in git-read-tree. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document hooks.Junio C Hamano2005-09-02
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Mention post-update when we first talk about publishing a repository.Junio C Hamano2005-09-02
| | | | | | | | There is more detailed instruction for `project lead` later in the tutorial to talk about the same, but at this point in the flow of tutorial, the first time reader has no way of knowing it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* scripts: equality test '==' is not portable.Junio C Hamano2005-09-02
| | | | | | | | | | | | | | | | On NetBSD 3 we trigger an error: [: ==: unexpected operator Double-equal is accepted by bash built-in '[' and bash(1) suggests using '=' for strict POSIX compliance (test(1) from coreutils does not mention '=='). Eradicate their uses everywhere. [jc: Somebody with a pseudonym kindly sent a message to let me know about the problem privately; I do not have access to a NetBSD box.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-checkout-script: Remove unnecessary variable.Junio C Hamano2005-09-02
| | | | | | | There was unused variable $i that counted the number of arguments being processed. Remove it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix automerge message.Junio C Hamano2005-09-02
| | | | | | | | | | | | The rewrite done while adding the shorthand support made the remote refname recorded in the commit message too long for human consumption, while losing information by using the shorthand not the real URL to name the remote repository there. They were both bad changes done without enough thinking. Pointed out by Linus. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Explain what went wrong on update-cache of new fileAmos Waterland2005-09-01
| | | | | | | | | | | | | | | | | If somebody tries to run `git update-cache foo', where foo is a new file, git dies with a rather cryptic error message: fatal: Unable to add foo to database This trivial patch makes git explain what probably went wrong. It is not a perfect diagnosis of all error paths, but for 90% of the cases it should provide the user with the clue they need. [jc: I ended up wording slightly differently, and fixed another confusing error message I noticed while reviewing the code.] Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add repository-layout document.Junio C Hamano2005-09-01
| | | | | | ... and link to it from both the main index and the tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use 'git status' now it can handle initial commit.Junio C Hamano2005-08-31
| | | | | | | Update 'git commit' to use the updated `git status`. Also earlier the `-s` flag was ignored for the initial commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix git-status when HEAD is invalid.Junio C Hamano2005-08-31
| | | | | | It tried to do git-diff-cache against HEAD, of course. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix git-log-script when HEAD is invalid.Junio C Hamano2005-08-31
| | | | | | | | It used 'die' without including git-sh-setup-script; since everything it uses are subdirectory-aware, instead of including the script to force it to be run from the top, use echo & exit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add Pine 4.63 help from Daniel.Junio C Hamano2005-08-31
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update tutorial.Junio C Hamano2005-08-30
| | | | | | | | Finally I bit the bullet and did a full sweep of this document. The changes are mostly clarifications, adjusting old terminology to the glossary compatible one, and asciidoc formatting. Signed-off-by: Junio C Hamano <junkio@cox.net>
* show-branch: make it work in a subdirectory.Junio C Hamano2005-08-30
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Initial import of git-archimport-scriptMartin Langhoff2005-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imports a project history from one or more Arch repositories, following the branching and tagging across repositories. Note you should import separate projects to separate GIT repositories. Supported - Imports, tags and simple commits. - File renames - Arch tags - Binary files - Large trees - Multiple repositories - Branches TODO: - Allow re-running the import on an already-imported project - Follow merges using Arch data - Audit shell escaping of filenames - Better support for file metadata - Better/safer creation of temp directories Unsupported: - Arch 'configuration' [jc: my arch/tla is very rusty and after Tom announced he is stepping down as the maintainer I have very little motivation to relearn it, so I would appreciate if people discuss any bugs or enhancements directly with Martin. Of course I can help with the git end of the issues.] Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cat-file: make it work in a subdirectory.Junio C Hamano2005-08-30
| | | | | Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 73244994ee4abd6e436e8a1d597dd917271d77a9 commit)
* Documentaion updates.Junio C Hamano2005-08-30
| | | | | | | Mostly making the formatted html prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit)
* 'git bisect visualize'Junio C Hamano2005-08-30
| | | | | | | | | | | | | | | Linus says: I'm testing bisection to find a bug that causes my G5 to no longer boot, and during the process have found this command line very nice: gitk bisect/bad --not $(cd .git/refs ; ls bisect/good-*) it basically shows the state of bisection with the known bad commit as the top, and cutting off all the good commits - so what you see are the potential buggy commits. Signed-off-by: Junio C Hamano <junkio@cox.net>
* [PATCH] Fix bisection terminating conditionLinus Torvalds2005-08-30
| | | | | | | | | | | | | | | When testing bisection and using gitk to visualize the result, it was obvious that the termination condition was broken. We know what the bad entry is only when the bisection ends up telling us to test the known-bad entry again. Also, add a safety net: if somebody marks as good something that includes the known-bad point, we now notice and complain, instead of writing an empty revision to the new bisection branch. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* parse-remote: trivial fix to allow refs/{heads,tags}/ spelled easier.Junio C Hamano2005-08-30
| | | | | | | | | Earlier we always prefixed refs/heads to the token given to "git fetch" (and "git pull") as refspec. This was a mistake. Allow them to be spelled like "master:refs/tags/paulus" to mean "I want to fetch the master there and store it as my local "paulus" tag. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge refs/heads/master from paulus Junio C Hamano2005-08-30
|\
| * Draw selected graph line thicker and make arrowheads active.Paul Mackerras2005-08-30
| |
* | Make sure howto/*.html is built as well.Junio C Hamano2005-08-29
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Make "git resolve" less scaryLinus Torvalds2005-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we resolve a merge between two branches, and it removes a file in the current branch, we notify the person doing the resolve with a big nice notice like Removing xyzzy which is all well and good. HOWEVER, we also do this when the file was actually removed in the current branch, and we're merging with another branch that didn't have it removed (or, indeed, if the other branch _did_ have it removed, but the common parent was far enough back that the file still existed in there). And that just doesn't make sense. In that case we're not removing anything: the file didn't exist in the branch we're merging into in the first place. So the message just makes people nervous, and makes no sense. This has been around forever, but I never bothered to do anything about it. Until now. The trivial fix is to only talk about removing files if the file existed in the branch we're merging into, but will not exist in the result. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Allow asciidoc formatted documentation in howto/Junio C Hamano2005-08-29
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add [HOWTO] revert/branch/rebase.Junio C Hamano2005-08-29
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git commit: Allow editing on all occasions.Junio C Hamano2005-08-29
| | | | | | | | | | | | | | | | | | | | Sometimes it may be handy to be able to edit messages that come from somewhere other than an existing commit. This makes 'git commit -F <file> -e' to start editor with the initial log message contents taken from <file>. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Do not verify reverted/cherry-picked/rebased patches.Junio C Hamano2005-08-29
| | | | | | | | | | | | | | | | | | The original committer may have used validation criteria that is less stricter than yours. You do not want to lose the changes even if they are done in substandard way from your 'commit -v' verifier's point of view. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix compilation warnings.Junio C Hamano2005-08-29
| | | | | | | | | | | | ... found by compiling them with gcc 2.95. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] Update Thunderbird specific hints.A Large Angry SCM2005-08-29
| | | | | | | | | | | | | | Setting the wraplength to zero keeps the bird from trimming WS. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 1d535d525d6a0ddddc3755065d721278bc5f0aff commit)
* | [PATCH] Documentation for git-request-pull-script.A Large Angry SCM2005-08-29
| | | | | | | | | | | | | | Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 10dce95490cb02f66b3a08984ccdee0a92b48236 commit)
* | [PATCH] Documentation for git-clone-dumb-http.A Large Angry SCM2005-08-29
| | | | | | | | | | | | | | Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from f79528e5d05a64d68b8e09a18521950775e99ec1 commit)
* | [PATCH] Documentation for git-daemon.A Large Angry SCM2005-08-29
| | | | | | | | | | | | | | Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 5d0a4efeff62cfa363437f91308453b5b9fd8cf5 commit)
* | Accumulated documentation updates.Junio C Hamano2005-08-29
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-repack-script: Add option to repack all objects.Junio C Hamano2005-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This originally came from Frank Sorenson, but with a bit of rework to allow future enhancements without changing the external interface for pack pruning part. With the '-a' option, all objects in the current repository are packed into a single pack. When the '-d' option is given at the same time, existing packs that were made redundant by this round of repacking are deleted. Since we currently have only two repacking strategies, one with '-a' (everything into one) and the other without '-a' (incrementally pack only the unpacked ones), the '-d' option is meaningful only when used with '-a'; it removes the packs existed before we did the "everything into one" repacking. At least for now. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Frank Sorenson <frank@tuxrocks.com> (cherry picked from bfed505327e31221d8de796b3af880bad696b149 commit)
* | Updates: show-branchJunio C Hamano2005-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | Earlier show-branch gave names only to commits reachable via first parent ancestry chain. Change the naming code to name everybody. The original idea was to stop at the first merge point in the topological order, and --more=<n> to show commits until we show <n> more extra merge points. However depending on the order of how we discover the commits, it additionally showed parents of the <n>th merge points, which was unnecessary. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | mailinfo and applymbox updatesJunio C Hamano2005-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attempts to minimally cope with a subset of MIME "features" often seen in patches sent to our mailing lists. Namely: - People's name spelled in characters outside ASCII (both on From: header and the signed-off-by line). - Content-transfer-encoding using quoted-printable (both in multipart and non-multipart messages). These MIME features are detected and decoded by "git mailinfo". Optionally, with the '-u' flag, the output to .info and .msg is transliterated from its original chaset to utf-8. This is to encourage people to use utf8 in their commit messages for interoperability. Applymbox accepts additional flag '-u' which is passed to mailinfo. Signed-off-by: Junio C Hamano / 濱野 純 <junkio@cox.net>
* | Document "git cherry-pick" and "git revert"Junio C Hamano2005-08-29
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Remove git-apply-patch-script.Junio C Hamano2005-08-29
| | | | | | | | | | | | | | | | Now the rebase is rewritten to use git cherry-pick, there is no user for that ancient script. I've checked Cogito and StGIT to make sure they do not use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Redo "revert" using three-way merge machinery.Junio C Hamano2005-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reverse patch application using "git apply" sometimes is too rigid. Since the user would get used to resolving conflicting merges by hand during the normal merge experience, using the same machinery would be more helpful rather than just giving up. Cherry-picking and reverting are essentially the same operation. You pick one commit, and apply the difference that commit introduces to its own commit ancestry chain to the current tree. Revert applies the diff in reverse while cherry-pick applies it forward. They share the same logic, just different messages and merge direction. Rewrite "git rebase" using "git cherry-pick". Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Revert "Replace zero-length array decls with []."Junio C Hamano2005-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts 6c5f9baa3bc0d63e141e0afc23110205379905a4 commit, whose change breaks gcc-2.95. Not that I ignore portability to compilers that are properly C99, but keeping compilation with GCC working is more important, at least for now. We would probably end up declaring with "name[1]" and teach the allocator to subtract one if we really aimed for portability, but that is left for later rounds. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git Junio C Hamano2005-08-28
|\ \
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-21 11:32:30 +0000