AgeCommit message (Collapse)Author
2005-07-30Skip --merge-order test when built with NO_OPENSSLJunio C Hamano
When built with NO_OPENSSL, rev-list --merge-order does not work, causing t6001 test to fail. Detect that and skip this test to allow continuing to the rest of the tests. Signed-off-by: Junio C Hamano <>
2005-07-30[PATCH] Support for NO_OPENSSLPetr Baudis
Support for completely OpenSSL-less builds. FSF considers distributing GPL binaries with OpenSSL linked in as a legal problem so this is trouble e.g. for Debian, or some people might not want to install OpenSSL anyway. If you make NO_OPENSSL=1 you get completely OpenSSL-less build, disabling --merge-order and using Mozilla's SHA1 implementation. Ported from Cogito. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-07-30[PATCH] Reorder Makefile rulesPetr Baudis
The Makefile rules were massively reordered so that they are actually logically grouped now. Captions were added to separate the sections. No rule contents was touched during the process. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-07-30[PATCH] Remove the explicit Makefile dependencies descriptionPetr Baudis
Remove about one gazillion of explicit dependency rules with few lines describing the general dependency pattern and then the exceptions. This noticably shortens the Makefile and makes it easier to touch it. This is part of the Cogito Makefile changes port. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-07-30[PATCH] Improve the compilation-time settings interfacePetr Baudis
Describe variables which make itself takes and adjusts compilation accordingly (MOZILLA_SHA1, NO_OPENSSL, PPC_SHA1), and make adding defines more convenient through the $DEFINES variable. $COPTS includes -g as well now and is not overriden if it was already declared in the environment. Also, $CFLAGS is appended to rather than reset, so that if there was already a $CFLAGS environment variable, it's appended to. Some more variables are also made overridable through the environment. Renamed $bin to $bindir which is the name commonly used for this. This is part of the Cogito Makefile changes port. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-07-30[PATCH] Unify usage strings declarationPetr Baudis
All usage strings are now declared as static const char []. This is carried over from my old git-pb branch. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-07-30[PATCH] Trivial tidyupsPetr Baudis
Simple whitespace-related tidyups ensuring style consistency. This is carried over from my old git-pb branch. Signed-off-by: Petr Baudis <> Signed-off-by: Junio C Hamano <>
2005-07-30[PATCH] mmap error handlingPavel Roskin
I have reviewed all occurrences of mmap() in git and fixed three types of errors/defects: 1) The result is not checked. 2) The file descriptor is closed if mmap() succeeds, but not when it fails. 3) Various casts applied to -1 are used instead of MAP_FAILED, which is specifically defined to check mmap() return value. [jc: This is a second round of Pavel's patch. He fixed up the problem that close() potentially clobbering the errno from mmap, which the first round had.] Signed-off-by: Pavel Roskin <> Signed-off-by: Junio C Hamano <>
2005-07-30Documentation and tests: ls-files exclude pattern.Junio C Hamano
Update the tests and documentation to match the new "last one determines its fate" semantics. Signed-off-by: Junio C Hamano <>
2005-07-30ls-files: rework exclude patterns.Junio C Hamano
Pasky and others raised many valid points on the problems initial exclude pattern enhancement work had. Based on the list discussion, rework the exclude logic to use "last match determines its fate" rule, and order the list by exclude-from (the fallback default pattern file), exclude-per-directory (shallower to deeper, so deeper ones can override), and then command line exclude patterns. Signed-off-by: Junio C Hamano <>
2005-07-30[PATCH] Fix interesting git-rev-list corner caseLinus Torvalds
This corner-case was triggered by a kernel commit that was not in date order, due to a misconfigured time zone that made the commit appear three hours older than it was. That caused git-rev-list to traverse the commit tree in a non-obvious order, and made it parse several of the _parents_ of the misplaced commit before it actually parsed the commit itself. That's fine, but it meant that the grandparents of the commit didn't get marked uninteresting, because they had been reached through an "interesting" branch. The reason was that "mark_parents_uninteresting()" (which is supposed to mark all existing parents as being uninteresting - duh) didn't actually traverse more than one level down the parent chain. NORMALLY this is fine, since with the date-based traversal order, grandparents won't ever even have been looked at before their parents (so traversing the chain down isn't needed, because the next time around when we pick out the parent we'll mark _its_ parents uninteresting), but since we'd gotten out of order, we'd already seen the parent and thus never got around to mark the grandparents. Anyway, the fix is simple. Just traverse parent chains recursively. Normally the chain won't even exist (since the parent hasn't been parsed yet), so this is not actually going to trigger except in this strange corner-case. Add a comment to the simple one-liner, since this was a bit subtle, and I had to really think things through to understand how it could happen. Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
2005-07-29Tutorial: use a bit longer sample filenames.Junio C Hamano
Darrin Thompson noticed when he was showing off GIT to others that the use of filenames "a" and "b" in the tutorial example was unnecessarily confusing, especially with our "patch -p1" prefix a/ and b/, without giving us any patch. I was very tempted to change them back to l/ and k/ prefixes, but decided to restrain myself and update the tutorial instead ;-). Signed-off-by: Junio C Hamano <>
2005-07-29[PATCH] support older versions of libcurlJohannes Schindelin
Some newer features of libcurl are used which are not strictly necessary for http-pull. Use them only if libcurl is new enough to know about them. [jc: I just reworked #ifdef sprinkled all over the code into a single section that defines a set of macros.] Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-07-29Merge with gitk.Junio C Hamano
2005-07-29Improve the merge display when the result differs from all parents.Paul Mackerras
Now we see if the result is quite similar to one of the parents, and if it is, display the result as a diff from that parent. If the result is similar to more than one parent, pick the one that it's most similar to.
2005-07-29[PATCH] socklen_t needs to be defined and libssl to be linked on old Mac OS XJohannes Schindelin
On older Mac OS X (10.2.8), no socklen_t is defined, and therefore daemon.c does not compile. However, Mac OS X 10.4 seems to define socklen_t differently. Also, linking fails due to some symbols defined in libssl (not just libcrypto). [jc: I am tentatively dropping the socklen_t part of the patch because I am waiting for confirmation on the server side IPV6 patch from Yoshifuji-san] Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-07-29[PATCH] support bc version 1.04Johannes Schindelin
Test t6002 unnecessarily fails when bc is a bit older than average. Signed-off-by: Johannes.Schindelin <> Signed-off-by: Junio C Hamano <>
2005-07-29[PATCH] remove "-r" option to xargsJohannes Schindelin
git-prune-script still contained that non-portable option. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2005-07-29server-info: do not complain if a tag points at a non-commit.Junio C Hamano
Linux 2.6 tree has one of those tree tags. Signed-off-by: Junio C Hamano <>
2005-07-29[PATCH] Make git-apply --stat less butt-ugly with long filenamesLinus Torvalds
When git-apply was printing out long filenames, it used to just truncate them to show the last "max_len" characters of the filename. Which can be really quite ugly (note the two filenames that have just been silently truncated from the beginning - it looks even worse when there are lots of them, like there were in the current v2.6.13-rc4 cris arch update): Documentation/video4linux/README.saa7134 | 9 Documentation/video4linux/bttv/Cards | 74 umentation/video4linux/hauppauge-wintv-cx88-ir.txt | 54 Documentation/video4linux/lifeview.txt | 42 mentation/video4linux/not-in-cx2388x-datasheet.txt | 41 Documentation/w1/w1.generic | 107 With this patch it now looks like so: Documentation/video4linux/README.saa7134 | 9 Documentation/video4linux/bttv/Cards | 74 .../video4linux/hauppauge-wintv-cx88-ir.txt | 54 Documentation/video4linux/lifeview.txt | 42 .../video4linux/not-in-cx2388x-datasheet.txt | 41 Documentation/w1/w1.generic | 107 ie we've made it clear with an ellipsis that we've cut off something from the beginning, and it also tries to do it cleanly at a subdirectory level. Signed-off-by: Linus "good taste" Torvalds <> Signed-off-by: Junio C Hamano <>
2005-07-28[PATCH] gitk: Use GIT_DIR where appropriate.Junio C Hamano
Some places assumed .git is the GIT_DIR, resulting heads and tags not showing when it was run like "GIT_DIR=. gitk --all". This is not a contrived example --- I rely on it to verify my private copy of git.git repository before pushing it out. Define a single procedure "gitdir" and use it. Signed-off-by: Junio C Hamano <> Signed-off-by: Paul Mackerras <>
2005-07-28[PATCH] GIT: Listen on IPv6 as well, if available.YOSHIFUJI Hideaki
Signed-off-by: Hideaki YOSHIFUJI <> Signed-off-by: Junio C Hamano <>
2005-07-28[PATCH] Add documentation for git-rename-scriptRyan Anderson
Signed-off-by: Ryan Anderson <> Signed-off-by: Junio C Hamano <>
2005-07-28[PATCH] Add support for directories to git-rename-script.Ryan Anderson
Oh, and in the process, rewrite it in Perl. Signed-off-by: Ryan Anderson <> Signed-off-by: Junio C Hamano <>
2005-07-28Import the --topo-order change and fix the writing of ~/.gitk.Paul Mackerras
2005-07-28Display the diffs for a merge in a unified fashion.Paul Mackerras
Stuff that ended up in the result is shown in bold with a "+" at the beginning of the line; stuff that didn't is in the normal font with a "-" at the beginning of the line. The color shows which parent the stuff was in; red for the first parent, blue for the second, then green, purple, brown, and the rest are grey. If the result is different from all of the parents it is shown in black (and bold).
2005-07-28Document --strict flag to the fsck-cache command.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-07-28git-fsck-cache: be stricter about "tree" objectsLinus Torvalds
In particular, warn about things like zero-padding of the mode bits, which is a big no-no, since it makes otherwise identical trees have different representations (and thus different SHA1 numbers). Also make the warnings more regular. Signed-off-by: Linus Torvalds <>
2005-07-28git-convert-cache: fix up mode conversionLinus Torvalds
The old mode conversion was not only complex, it also refused to change the length of a mode, which made it fragile. By moving the mode conversion around a bit, we can not only simplify it, it also ends up being more powerful. Also fix a memory leak that made it impossible to convert huge archives without tons and tons of memory. Signed-off-by: Linus Torvalds <>
2005-07-28git-fsck-cache.c: check commit objects more carefullyLinus Torvalds
We historically used to be very careful in fsck-cache, but when it was re-written to use "parse_object()" instead of parsing everything by hand, it lost a bit of the checks. This, together with the previous commit, should make it do more proper commit object syntax checks. Also add a "--strict" flag, which warns about the old-style "0664" file mode bits, which shouldn't exist in modern trees, but that happened early on in git trees and that the default git-fsck-cache thus silently accepts. Signed-off-by: Linus Torvalds <>
2005-07-28Make "parse_commit()" be a lot more carefulLinus Torvalds
This was brought on by a bad tree of Thomas Gleixner, where some bogus commit objects weren't warned about properly Signed-off-by: Linus Torvalds <>
2005-07-27Tutorial typofix.Linus Torvalds
Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
2005-07-27Typofix: usage strings fix.Junio C Hamano
The *_usage strings should not start with "usage: ", since the usage() function gives its own. Signed-off-by: Junio C Hamano <>
2005-07-27git-log: make sure we have some commit to start from.Linus Torvalds
When no usable head/tag is specified, git log barfed with underlying error message from rev-list, which was not helpful. Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
2005-07-27request-pull: minor tweaks.Junio C Hamano
- use --verify to make sure rev param is a rev, and barf otherwise. - make it always output to stdout; no funny business with tee. - take optional branch head name to specify which branch to summarize. - show baserev in a human readable way. - do not depend on diffstat; use git-apply --stat instead. Signed-off-by: Junio C Hamano <>
2005-07-27[PATCH] Add git-request-pull-script, a short script that generates a summary ↵Ryan Anderson
of pending changes A short message requesting a pull from the repository is also included. Signed-off-by: Ryan Anderson <> Signed-off-by: Junio C Hamano <>
2005-07-27[PATCH] git-status-script was missed during the conversion from N -> ARyan Anderson
git-status-script was missed during the conversion from "N" to "A" as the new-file marker flag. Signed-off-by: Ryan Anderson <> Signed-off-by: Junio C Hamano <>
2005-07-27Deb Packaging fixes: Build against Mozilla libs for Debian, conflict with "git"Ryan Anderson
This patch includes two fixes to the git-core Debian package: * Conflict with the GNU Interactive Tools package, which _also_ wants to install /usr/bin/git. * Compile against the unencumbered Mozilla SHA1 code, instead of the iffy OpenSSL code, as much as possible. This makes it easier to get the package included for distribution with Debian. This has been based upon the original patch by Sebastian Kuzminsky <>, but has been fixed up based upon feedback. Signed-off-by: Ryan Anderson <> Signed-off-by: Junio C Hamano <>
2005-07-27Fix potential send-pack SIGSEGVLinus Torvalds
The check that the source is ahead of the destination incorrectly expects pop_most_recent_commit() to gracefully handle an empty list. Fix by just checking the list itself, rather than the return value of the pop function. [jc: I did the test script that demonstrated the problem] Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
2005-07-27Name it 0.99.2v0.99.2Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-07-26Adjust diff-raw tests to the status letter change.Junio C Hamano
We use 'A' for added files instead of 'N' to make the it visually easier to distinguish from 'M' now. While we are at it, make the test scripts executable. Yes, I know it does not matter because t/Makefile runs them explicitly with "sh", but being consistent is always better. Signed-off-by: Junio C Hamano <>
2005-07-26diff-raw: Use 'A' instead of 'N' for added files.Junio C Hamano
This actually changes the diff-raw status letter from N to A for added files. Signed-off-by: Junio C Hamano <>
2005-07-26Use symbolic constants for diff-raw status indicators.Junio C Hamano
Both Cogito and StGIT prefer to see 'A' for new files. The current 'N' is visually harder to distinguish from 'M', which is used for modified files. Prepare the internals to use symbolic constants to make the change easier. Signed-off-by: Junio C Hamano <>
2005-07-26Documentation: describe git-ls-files --exclude patterns.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-07-26git-ls-files: --exclude mechanism updates.Junio C Hamano
Add --exclude-per-directory=<name> option that specifies a file to contain exclude patterns local to that directory and its subdirectories. Update the exclusion logic to be able to say "include files that match this more specific pattern, even though later exclude patterns may match them". Also enhances that a pattern can contain '/' in which case fnmatch is called with FNM_PATHNAME flag to match the entire path. Signed-off-by: Junio C Hamano <>
2005-07-25Update the documentation for git-tag-script to reflect current behavior.Ryan Anderson
[jc: I updated Ryan's patch to mention -a to create an unsigned tag.] Signed-off-by: Ryan Anderson <>
2005-07-25git-tag-script updates.Junio C Hamano
This adds -a (annotate only but not sign) option "A Large Angry SCM" <> sent to the list, after fixing up the whitespace corruption in the patch, with some of my own fixes. Namely: * A new flag '-a' can be used to create an unsigned tag object; * The '-f' flag logic did not do the right thing; * When creating a signed tag, we did not check for GPG failure as we should; * Try to use the key for the tagger identity when signing the tag. Signed-off-by: Junio C Hamano <>
2005-07-24Fix up applymbox script for the addition of "git-" prefixLinus Torvalds
Ehh, it works much better that way ;)
2005-07-24[PATCH] diffcore-pickaxe: switch to "counting" behaviour.Junio C Hamano
Instead of finding old/new pair that one side has and the other side does not have the specified string, find old/new pair that contains the specified string as a substring different number of times. This would still not catch a case where you introduce two static variable declarations and remove two static function definitions from a file with -S"static", but would make it behave a bit more intuitively. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-07-24Add a "git rename" to help with - surprise surprise - renamesLinus Torvalds
It's stupid. We'd want to rename directories too, but this doesn't do that yet - easy enough to do per se, we just need to carefully list all the pathnames that got moved (and remember to ignore the files that weren't tracked but are in the subdirectory that got moved). Doing the directory case will require a bit more scripting.. Something like oldfiles=($(git-ls-files | grep '^$src')) newfiles=($(git-ls-files | sed ':^$src: s:^$src:$dst:')) mv $src $dst && git-update-cache --add --remove -- "${oldfiles[@]}" "${newfiles[@]}" might do it, except it needs to be done right, and carefully. Methinks perl is probably better at this. Hint hint..