summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-08-30[PATCH] Initial import of git-archimport-scriptMartin Langhoff
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>
2005-08-30Merge refs/heads/master from . Junio C Hamano
2005-08-30cat-file: make it work in a subdirectory.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 73244994ee4abd6e436e8a1d597dd917271d77a9 commit)
2005-08-30Documentaion updates.Junio C Hamano
Mostly making the formatted html prettier. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit)
2005-08-30'git bisect visualize'Junio C Hamano
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>
2005-08-30[PATCH] Fix bisection terminating conditionLinus Torvalds
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>
2005-08-30Merge refs/heads/master from . Junio C Hamano
2005-08-30parse-remote: trivial fix to allow refs/{heads,tags}/ spelled easier.Junio C Hamano
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>
2005-08-30Merge refs/heads/master from paulus Junio C Hamano
2005-08-30Make sure howto/*.html is built as well.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30[PATCH] Make "git resolve" less scaryLinus Torvalds
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>
2005-08-30Merge refs/heads/master from . Junio C Hamano
2005-08-30Allow asciidoc formatted documentation in howto/Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30Merge refs/heads/master from . Junio C Hamano
2005-08-30Add [HOWTO] revert/branch/rebase.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30git commit: Allow editing on all occasions.Junio C Hamano
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>
2005-08-30Do not verify reverted/cherry-picked/rebased patches.Junio C Hamano
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>
2005-08-30Fix compilation warnings.Junio C Hamano
... found by compiling them with gcc 2.95. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30[PATCH] Update Thunderbird specific hints.A Large Angry SCM
Setting the wraplength to zero keeps the bird from trimming WS. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 1d535d525d6a0ddddc3755065d721278bc5f0aff commit)
2005-08-30[PATCH] Documentation for git-request-pull-script.A Large Angry SCM
Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 10dce95490cb02f66b3a08984ccdee0a92b48236 commit)
2005-08-30[PATCH] Documentation for git-clone-dumb-http.A Large Angry SCM
Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from f79528e5d05a64d68b8e09a18521950775e99ec1 commit)
2005-08-30[PATCH] Documentation for git-daemon.A Large Angry SCM
Copy & paste source comments into documentation. Signed-off-by: <gitzilla@gmail.com> (cherry picked from 5d0a4efeff62cfa363437f91308453b5b9fd8cf5 commit)
2005-08-30Merge refs/heads/master from . Junio C Hamano
2005-08-30Draw selected graph line thicker and make arrowheads active.Paul Mackerras
2005-08-30Accumulated documentation updates.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30git-repack-script: Add option to repack all objects.Junio C Hamano
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)
2005-08-30Updates: show-branchJunio C Hamano
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>
2005-08-29Merge refs/heads/master from . Junio C Hamano
2005-08-29mailinfo and applymbox updatesJunio C Hamano
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>
2005-08-29Document "git cherry-pick" and "git revert"Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-29Remove git-apply-patch-script.Junio C Hamano
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>
2005-08-29Redo "revert" using three-way merge machinery.Junio C Hamano
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>
2005-08-29Revert "Replace zero-length array decls with []."Junio C Hamano
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>
2005-08-29Merge refs/heads/master from . Junio C Hamano
2005-08-29Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git Junio C Hamano
2005-08-29[PATCH] tutorial note about git branchAmos Waterland
Explain that an asterisk will be displayed in front of the current branch when you run `git branch' to see which are available. Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-29Merge refs/heads/master from . Junio C Hamano
2005-08-29Update SubmittingPatches.Junio C Hamano
- It does not matter how I read git list. What matters is that I do not necessarily read everything on it. - Talk a bit about how to use applymbox to check one's own patches. - Talk a bit about PGP signed patches. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28[PATCH] Add footnote about Thunderbird about trimming trailing WS.A Large Angry SCM
Add footnote about Thunderbird about trimming trailing WS. Signed-off-by: <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28[PATCH] Add some documentation.A Large Angry SCM
Add some documentation. Text taken from the the commit messages and the command sources. Signed-off-by: <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28[PATCH] New git-apply test cases for scanning forwards and backwards.Robert Fitzsimons
Added a new test case for the scanning forwards and backwards for the correct location to apply a patch fragment. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28[PATCH] New git-apply test cases for patches with mulitple fragments.Robert Fitzsimons
Added a test case for patches with multiple fragments. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28[PATCH] Fix git patch header processing in git-apply.Robert Fitzsimons
Stop processing and return NULL if we encounter a '\n' character before we have two matching names in the git header. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28Teach git-status-script about git-ls-files --othersJunio C Hamano
When there is non-empty $GIT_DIR/info/exclude file, use it along with .gitignore per-directory exclude pattern files (which was a convention agreed on the list while ago and is compatible with Cogito) to generate a list of ignored files as well. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from d330948a5ff0df55c2f12627c0583b4e16f1ea4d commit)
2005-08-28Show the branch name more prominently in "git status".Junio C Hamano
When not working on "master" branch, remind the user at the beginning of the status message, not at the end. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28Barf nicely when "git push" is run without parameter.Junio C Hamano
Saying "internal error" makes it look like my fault ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28[PATCH] Make .git directory validation code test HEADLinus Torvalds
Inspired by a report by Kalle Valo, this changes git-sh-setup-script and the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a symlink, since a number of core git features depend on that these days. We used to allow a regular file there, but git-fsck-cache has been complaining about that for a while, and anything that uses branches depends on the HEAD file being a symlink, so let's just encode that as a fundamental requirement. Before, a non-symlink HEAD file would appear to work, but have subtle bugs like not having the HEAD show up as a valid reference (because it wasn't under "refs"). Now, we will complain loudly, and the user can fix it up trivially instead of getting strange behaviour. This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY" being directories, since the other tests will implicitly test for that anyway (ie the tests for HEAD, refs and 00 would fail). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-27Update SubmittingPatches to add MUA specific notes.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-27Merge master branch changes into release candidate branch.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-27Accept -m and friends for initial commits and merge commits.Junio C Hamano
Yes it was irritating not to be able to do so. Signed-off-by: Junio C Hamano <junkio@cox.net>