| 1b9bc5a | Junio C Hamano | 15 May 2006, 19:52:00 UTC | Fix pack-index issue on 64-bit platforms a bit more portably. Apparently <stdint.h> is not enough for uint32_t on OpenBSD; use "unsigned int" -- hopefully that would stay 32-bit on every platform we care about, at least until we update the pack-index file format. Our sha1 routines optimized for architectures use uint32_t and expects '#include <stdint.h>' to be enough, so OpenBSD on arm or ppc might have similar issues down the road, I dunno. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 May 2006, 20:01:37 UTC |
| f3dd5ea | Eric Wong | 15 May 2006, 02:26:56 UTC | Install git-send-email by default After 567ffeb7722eefab3991cb894c96548b92b57cc2 and 4bc87a28be020a6bf7387161c65ea3d8e4a0228b, git-send-email no longer requires any non-standard Perl modules, so there's no reason to special-case it. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 May 2006, 20:00:28 UTC |
| e88856b | Dennis Stosberg | 11 May 2006, 17:35:31 UTC | Fix compilation on newer NetBSD systems NetBSD >=2.0 has iconv() in libc. A libiconv is not required and does not exist. See: http://netbsd.gw.com/cgi-bin/man-cgi?iconv+3+NetBSD-2.0 [jc: with a bit of simplification later discussed on the list.] Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 May 2006, 20:00:01 UTC |
| c8df633 | Junio C Hamano | 15 May 2006, 07:49:25 UTC | Merge branch 'fix' into maint * fix: Ensure author & committer before asking for commit message. | 15 May 2006, 07:49:25 UTC |
| ec4e69c | Sean | 14 May 2006, 03:09:32 UTC | Ensure author & committer before asking for commit message. It's better to find out you need to fix your author and committer information before you enter a long commit message. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 May 2006, 23:27:03 UTC |
| 3f22deb | Junio C Hamano | 14 May 2006, 23:20:09 UTC | Merge branch 'fix' into maint * fix: include header to define uint32_t, necessary on Mac OS X | 14 May 2006, 23:20:09 UTC |
| d9635e9 | Ben Clifford | 14 May 2006, 20:34:56 UTC | include header to define uint32_t, necessary on Mac OS X Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 May 2006, 23:19:52 UTC |
| d14f776 | Linus Torvalds | 09 May 2006, 19:24:02 UTC | git config syntax updates This updates the hierarchical section name syntax to [section<space>+"<randomstring>"] where the only rule for "randomstring" is that it can't contain a newline, and if you really want to insert a double-quote, you do it with \". It turns that into the section name "secion.randomstring". The "section" part is still case insensitive, but the "randomstring" part is case sensitive. So you could use this for things like [email "torvalds@osdl.org"] name = Linus Torvalds if you wanted to do the "email->name" conversion as part of the config file format (I'm not claiming that is sensible, I'm just giving it as an insane example). That would show up as the association email.torvalds@osdl.org.name -> Linus Torvalds which is easy to parse (the "." in the email _looks_ ambiguous, but it isn't: you know that there will always be a single key-name, so you find the key name with "strrchr(name, '.')" and things are entirely unambiguous). Repo-config is updated to be able to parse the new format, and also write things out in the new format. [jc: rolled two patches from Linus and one fix-up from Sean into one, with additional adjustments for t/t1300 test to check the case insensitiveness of section base and variable and case sensitiveness of the extended section part. Then stripped some part off to make the result applicable to the stale 1.3.X series that does not have recent enhancements. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 May 2006, 21:00:16 UTC |
| bdf0ef0 | sean | 06 May 2006, 18:14:02 UTC | Another config file parsing fix. If the variable we need to store should go into a section that currently only has a single variable (not matching the one we're trying to insert), we will already be into the next section before we notice we've bypassed the correct location to insert the variable. To handle this case we store the current location as soon as we find a variable matching the section of our new variable. This breakage was brought up by Linus. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 May 2006, 21:00:16 UTC |
| 618faa1 | Junio C Hamano | 10 May 2006, 02:23:23 UTC | checkout: use --aggressive when running a 3-way merge (-m). After doing an in-index 3-way merge, we always do the stock "merge-index merge-one-file" without doing anything fancy; use of --aggressive helps performance quite a bit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 May 2006, 21:00:15 UTC |
| 66561f5 | Dennis Stosberg | 11 May 2006, 17:36:32 UTC | Fix git-pack-objects for 64-bit platforms The offset of an object in the pack is recorded as a 4-byte integer in the index file. When reading the offset from the mmap'ed index in prepare_pack_revindex(), the address is dereferenced as a long*. This works fine as long as the long type is four bytes wide. On NetBSD/sparc64, however, a long is 8 bytes wide and so dereferencing the offset produces garbage. [jc: taking suggestion by Linus to use uint32_t] Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 May 2006, 17:43:16 UTC |
| d180285 | Linus Torvalds | 10 May 2006, 02:22:25 UTC | revert/cherry-pick: use aggressive merge. After doing an in-index 3-way merge, we always do the stock "merge-index merge-one-file" without doing anything fancy; use of --aggressive helps performance quite a bit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 May 2006, 02:22:25 UTC |
| 28cc4ab | Yakov Lerner | 09 May 2006, 16:14:00 UTC | read-cache.c: use xcalloc() not calloc() Elsewhere we use xcalloc(); we should consistently do so. Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 May 2006, 13:28:59 UTC |
| dbd0f7d | Eric Wong | 09 May 2006, 08:08:23 UTC | apply: fix infinite loop with multiple patches with --index When multiple patches are passed to git-apply, it will attempt to open multiple file descriptors to an index, which means multiple entries will be in the circular cache_file_list. This change makes git-apply only open the index once and write the index at exit. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 May 2006, 08:29:38 UTC |
| 31fff30 | Dmitry V. Levin | 08 May 2006, 21:43:38 UTC | Separate object name errors from usage errors Separate object name errors from usage errors. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 May 2006, 23:25:33 UTC |
| afb4ff2 | Junio C Hamano | 08 May 2006, 20:46:53 UTC | Documentation: {caret} fixes (git-rev-list.txt) Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 May 2006, 20:46:53 UTC |
| 5d6a9f4 | Linus Torvalds | 08 May 2006, 16:46:53 UTC | Fix "git diff --stat" with long filenames When we cut off the front of a filename to make it fit on the line, we add a "..." in front. However, the way the "git diff" code was written, we will never reset the prefix back to the empty string, so every single filename afterwards will have the "..." prefix, whether appropriate or not. You can see this with "git diff v2.6.16.." on the current kernel tree, since there are filenames with long names that changed there: [ snip snip ] Documentation/filesystems/vfs.txt | 229 .../firmware_class/firmware_sample_driver.c | 3 .../firmware_sample_firmware_class.c | 1 ...Documentation/fujitsu/frv/kernel-ABI.txt | 192 ...Documentation/hwmon/w83627hf | 4 [ snip snip ] notice how the two Documentation/firmware** filenames caused the "..." to be added, but then the later filenames don't want it, and it also screws up the alignment of the line numbering afterwards. Trivially fixed by moving the declaration (and initial setting) of the "prefix" variable into the for-loop where it is used. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 May 2006, 17:54:30 UTC |
| f8ba655 | Junio C Hamano | 08 May 2006, 04:27:30 UTC | Fix repo-config set-multivar error return path. This hopefully fixes the problem an earlier commit 5d8ee9ceb attemted to fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 May 2006, 04:27:30 UTC |
| 178613c | Martin Waitz | 07 May 2006, 18:18:53 UTC | repack: honor -d even when no new pack was created If all objects are reachable via an alternate object store then we still have to remove all obsolete local packs. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 May 2006, 22:35:50 UTC |
| cf9dc65 | Martin Waitz | 07 May 2006, 18:19:09 UTC | clone: keep --reference even with -l -s Both -l -s and --reference update objects/info/alternates and used to write over each other. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 May 2006, 22:33:43 UTC |
| 6fe31e2 | Junio C Hamano | 07 May 2006, 22:32:51 UTC | repo-config: document what value_regexp does a bit more clearly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 May 2006, 22:32:51 UTC |
| 5d8ee9c | Pavel Roskin | 07 May 2006, 21:36:12 UTC | Release config lock if the regex is invalid Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 May 2006, 22:31:06 UTC |
| 245f102 | Matthias Lederhofer | 07 May 2006, 17:32:53 UTC | core-tutorial.txt: escape asterisk Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 May 2006, 20:55:36 UTC |
| e388c73 | Junio C Hamano | 02 May 2006, 07:40:24 UTC | core.prefersymlinkrefs: use symlinks for .git/HEAD When inspecting a project whose build infrastructure used to assume that .git/HEAD is a symlink ref, core.prefersymlinkrefs in the config file of such a project would help to bisect its history. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 9f0bb90d161edf8c43f5261d12bf83f14eb02ff4 commit) | 05 May 2006, 21:37:08 UTC |
| 7ebdba6 | Johannes Schindelin | 02 May 2006, 14:58:37 UTC | repo-config: trim white-space before comment Earlier, calling git-repo-config core.hello on a .git/config like this: [core] hello = world ; a comment would yield "world " (i.e. with a trailing space). Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from c1aee1fd8d94da9b3c5d2dc1d4264f7e73a58f80 commit) | 05 May 2006, 21:34:47 UTC |
| 93ddef3 | sean | 05 May 2006, 13:49:15 UTC | Fix for config file section parsing. Currently, if the target key has a section that matches the initial substring of another section we mistakenly believe we've found the correct section. To avoid this problem, ensure that the section lengths are identical before comparison. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 May 2006, 21:33:58 UTC |
| 7abd711 | Jon Loeliger | 04 May 2006, 04:19:54 UTC | Add a few more words to the glossary. Clean up a few entries and fix typos. bare repository cherry-picking hook topic branch [jc: removing questionable "symbolic ref -- see 'ref'" for now.] Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2006, 05:59:30 UTC |
| 9290cd5 | Jon Loeliger | 04 May 2006, 04:18:59 UTC | Added definitions for a few words: fast forward pickaxe refspec tracking branch Wild hack allows "link:git-" prefix to reference commands too. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2006, 05:31:50 UTC |
| aa9b157 | Jon Loeliger | 04 May 2006, 04:15:46 UTC | Alphabetize the glossary. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 May 2006, 05:31:43 UTC |
| de5f2bf | Matthias Kestenholz | 03 May 2006, 10:51:40 UTC | fix various typos in documentation Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 May 2006, 21:08:41 UTC |
| e923eff | Martin Langhoff | 02 May 2006, 21:44:36 UTC | git-send-email: fix version string to be valid perl This makes git-send-email easier to develop and debug, skipping the need to `make git-send-email` every time. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 May 2006, 21:59:58 UTC |
| ced9456 | Robert Shearman | 02 May 2006, 12:32:43 UTC | Give the user a hint for how to continue in the case that git-am fails because it requires user intervention Give the user a hint for how to continue in the case that git-am fails because it requires user intervention. Signed-off-by: Robert Shearman <rob@codeweaves.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 May 2006, 19:42:12 UTC |
| 262a6ef | Huw Davies | 29 April 2006, 15:50:28 UTC | git-format-patch: Use rfc2822 compliant date. Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 30 April 2006, 07:32:25 UTC |
| aa6bf0e | Sean Estabrooks | 28 April 2006, 13:15:03 UTC | Fix trivial typo in git-log man page. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> | 28 April 2006, 21:31:53 UTC |
| 776e994 | Sean Estabrooks | 28 April 2006, 13:15:06 UTC | Properly render asciidoc "callouts" in git man pages. Adds an xsl fragment to render docbook callouts when converting to man page format. Update the Makefile to have "xmlto" use it when generating man pages. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> | 28 April 2006, 21:31:51 UTC |
| 48aeecd | Sean Estabrooks | 28 April 2006, 13:15:05 UTC | Fix up remaining man pages that use asciidoc "callouts". Unfortunately docbook does not allow a callout to be referenced from inside a callout list description. Rewrite one paragraph in git-reset man page to work around this limitation. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> | 28 April 2006, 21:31:36 UTC |
| 2eaf273 | Sean Estabrooks | 28 April 2006, 13:15:04 UTC | Update the git-branch man page to include the "-r" option, and fix up asciidoc "callouts" Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> | 28 April 2006, 21:31:18 UTC |
| fe77bb1 | Matthias Kestenholz | 28 April 2006, 08:41:19 UTC | annotate: display usage information if no filename was given Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> | 28 April 2006, 21:29:04 UTC |
| d0ad165 | Matthias Kestenholz | 28 April 2006, 08:42:28 UTC | annotate: fix warning about uninitialized scalar Use of uninitialized value in scalar chomp at ./git-annotate.perl line 212, <$kid> chunk 4. Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> | 28 April 2006, 21:28:28 UTC |
| c1d1128 | Junio C Hamano | 28 April 2006, 09:32:44 UTC | git-am --resolved: more usable error message. After doing the hard work of hand resolving the conflicts in the working tree, if the user forgets to run update-index to mark the paths that have been resolved, the command gave an unfriendly "fatal: git-write-tree: not able to write tree" error message. Catch the situation early and give more meaningful message and suggestion. Noticed and suggested by Len Brown. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 April 2006, 09:32:44 UTC |
| 55e1805 | Junio C Hamano | 27 April 2006, 22:42:01 UTC | verify-pack: check integrity in a saner order. Check internal integrity to report corrupt pack or idx, and then check cross-integrity between idx and pack. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 27 April 2006, 22:42:17 UTC |
| 5981e09 | Junio C Hamano | 26 April 2006, 23:55:25 UTC | commit-tree.c: check_valid() microoptimization. There is no point reading the whole object just to make sure it exists and it is of the expected type. We added sha1_object_info() for such need after this code was written, so use it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2006, 23:55:25 UTC |
| e23d0b4 | Linus Torvalds | 26 April 2006, 17:15:54 UTC | Fix filename verification when in a subdirectory When we are in a subdirectory of a git archive, we need to take the prefix of that subdirectory into accoung when we verify filename arguments. Noted by Matthias Lederhofer This also uses the improved error reporting for all the other git commands that use the revision parsing interfaces, not just git-rev-parse. Also, it makes the error reporting for mixed filenames and argument flags clearer (you cannot put flags after the start of the pathname list). [jc: with fix to a trivial typo noticed by Timo Hirvonen] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2006, 19:16:21 UTC |
| b176e6b | Junio C Hamano | 26 April 2006, 19:07:42 UTC | rebase: typofix. Noticed by Sean. Signed-off-by: Junio C Hamano <junkio@cox.net> | 26 April 2006, 19:16:19 UTC |
| 7d09fbe | Serge E. Hallyn | 18 April 2006, 13:11:06 UTC | socksetup: don't return on set_reuse_addr() error The set_reuse_addr() error case was the only error case in socklist() where we returned rather than continued. Not sure why. Either we must free the socklist, or continue. This patch continues on error. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 0032d548db56eac9ea09b4ba05843365f6325b85 commit) | 25 April 2006, 06:07:54 UTC |
| 1ab661d | Petr Baudis | 24 April 2006, 22:59:33 UTC | Document the configuration file This patch adds a Documentation/config.txt file included by git-repo-config and currently aggregating hopefully all the available git plumbing / core porcelain configuration variables, as well as briefly describing the format. It also updates an outdated bit of the example in git-repo-config(1). Signed-off-by: Petr Baudis <pasky@suse.cz> | 25 April 2006, 05:26:37 UTC |
| 4ee6bc9 | Petr Baudis | 24 April 2006, 22:59:28 UTC | Document git-var -l listing also configuration variables Signed-off-by: Petr Baudis <pasky@suse.cz> | 25 April 2006, 05:26:34 UTC |
| 3e1a70d | Paul Mackerras | 25 April 2006, 00:00:03 UTC | rev-parse: better error message for ambiguous arguments Currently, if git-rev-parse encounters an argument that is neither a recognizable revision name nor the name of an existing file or directory, and it hasn't encountered a "--" argument, it prints an error message saying "No such file or directory". This can be confusing for users, including users of programs such as gitk that use git-rev-parse, who may then think that they can't ask about the history of files that no longer exist. This makes it print a better error message, one that points out the ambiguity and tells the user what to do to fix it. Signed-off-by: Paul Mackerras <paulus@samba.org> | 25 April 2006, 05:22:29 UTC |
| 34fd1c9 | Linus Torvalds | 21 April 2006, 19:25:13 UTC | git-log produces no output When $PAGER is set to 'less -i', we used to fail because we assumed the $PAGER is a command and simply exec'ed it. Try exec first, and then run it through shell if it fails. This allows even funkier PAGERs like these ;-): PAGER='sed -e "s/^/`date`: /" | more' PAGER='contrib/colordiff.perl | less -RS' Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2006, 20:00:10 UTC |
| 0dec30b | Nicolas Pitre | 20 April 2006, 21:25:37 UTC | fix pack-object buffer size The input line has 40 _chars_ of sha1 and no 20 _bytes_. It should also account for the space before the pathname, and the terminating \n and \0. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2006, 07:45:10 UTC |
| 7573193 | Junio C Hamano | 21 April 2006, 07:06:58 UTC | mailinfo: decode underscore used in "Q" encoding properly. Quoted-Printable (RFC 2045) and the "Q" encoding (RFC 2047) are subtly different; the latter is used on the mail header and an underscore needs to be decoded to 0x20. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2006, 07:09:28 UTC |
| d598075 | Santi_Béjar | 27 March 2006, 11:26:01 UTC | Reintroduce svn pools to solve the memory leak. Introduced in 4802426. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2006, 06:41:24 UTC |
| f527cb8 | Junio C Hamano | 21 April 2006, 06:36:22 UTC | pack-objects: do not stop at object that is "too small" Because we sort the delta window by name-hash and then size, hitting an object that is too small to consider as a delta base for the current object does not mean we do not have better candidate in the window beyond it. Noticed by Shawn Pearce, analyzed by Nico, Linus and me. Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 April 2006, 06:36:22 UTC |
| 6a74642 | Junio C Hamano | 20 April 2006, 08:20:56 UTC | git-commit --amend: two fixes. When running "git commit --amend" only to fix the commit log message without any content change, we mistakenly showed the git-status output that says "nothing to commit" without commenting it out. If you have already run update-index but you want to amend the top commit, "git commit --amend --only" without any paths should have worked, because --only means "starting from the base commit, update-index these paths only to prepare the index to commit, and perform the commit". However, we refused -o without paths. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 April 2006, 09:51:12 UTC |
| 61c2bcb | Junio C Hamano | 19 April 2006, 21:58:24 UTC | pre-commit hook: complain about conflict markers. Several <<< or === or >>> characters at the beginning of a line is very likely to be leftover conflict markers from a failed automerge the user resolved incorrectly, so detect them. As usual, this can be defeated with "git commit --no-verify" if you really do want to have those files, just like changes that introduce trailing whitespaces. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2006, 22:37:40 UTC |
| 50ac740 | Junio C Hamano | 19 April 2006, 21:54:27 UTC | git-merge: a bit more readable user guidance. We said "fix up by hand" after failed automerge, which was a big "Huh? Now what?". Be a bit more explicit without being too verbose. Suggested by Carl Worth. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2006, 22:37:36 UTC |
| 23edecb | Shawn Pearce | 19 April 2006, 00:19:48 UTC | Document git-clone --reference The new --reference flag introduced to git-clone in GIT 1.3.0 was not documented but is rather handy. So document it. Also corrected a minor issue with the documentation for the -s flag; the info/alternates file name was spelled wrong. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 April 2006, 00:56:53 UTC |
| 8d6e103 | Jonas Fonseca | 18 April 2006, 21:26:43 UTC | Fix filename scaling for binary files Set maximum filename length for binary files so that scaling won't be triggered and result in invalid string access. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2006, 21:44:58 UTC |
| 4baff50 | Junio C Hamano | 18 April 2006, 20:15:18 UTC | GIT 1.3.0 Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2006, 20:15:18 UTC |
| 8f2b72a | Jonas Fonseca | 06 March 2006, 05:24:44 UTC | Add git-annotate(1) and git-blame(1) [jc: with entries in git.txt] Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2006, 19:06:55 UTC |
| f56ef54 | Junio C Hamano | 18 April 2006, 18:29:33 UTC | diff --stat: make sure to set recursive. Just like "patch" format always needs recursive, "diffstat" format does not make sense without setting recursive. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2006, 18:29:33 UTC |
| 08ddd4f | Herbert Valerio Riedel | 17 April 2006, 10:58:39 UTC | git-svnimport symlink support added svn:special symlink support for access methods other than direct-http Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org> Acked-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2006, 09:26:52 UTC |
| 2855d58 | Junio C Hamano | 18 April 2006, 00:46:07 UTC | packed_object_info_detail(): check for corrupt packfile. Serge E. Hallyn noticed that we compute how many input bytes are still left, but did not use it for sanity checking. Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 April 2006, 00:46:07 UTC |
| bb99661 | Serge E. Hallyn | 17 April 2006, 15:14:48 UTC | cleanups: remove unused variable from exec_cmd.c Not sure whether it should be removed, or whether execv_git_cmd() should return it rather than -1 at bottom. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2006, 22:06:40 UTC |
| dafc88b | Serge E. Hallyn | 17 April 2006, 15:14:48 UTC | cleanups: prevent leak of two strduped strings in config.c Config_filename and lockfile are strduped and then leaked in git_config_set_multivar. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2006, 22:06:37 UTC |
| ecc13e7 | Serge E. Hallyn | 17 April 2006, 15:14:48 UTC | cleanups: Remove impossible case in quote.c The switch is inside an if statement which is false if the character is ' '. Either the if should be <=' ' instead of <' ', or the case should be removed as it could be misleading. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2006, 22:06:25 UTC |
| 310f8b5 | Serge E. Hallyn | 17 April 2006, 15:14:47 UTC | cleanups: Remove unused vars from combine-diff.c Mod_type in particular sure looks like it wants to be used, but isn't. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2006, 22:06:16 UTC |
| da2a95b | Serge E. Hallyn | 17 April 2006, 15:14:47 UTC | cleanups: Fix potential bugs in connect.c The strncmp for ACK was ACK does not include the final space. Presumably either we should either remove the trailing space, or compare 4 chars (as this patch does). 'path' is sometimes strdup'ed, but never freed. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2006, 22:05:33 UTC |
| 6feba7c | Junio C Hamano | 17 April 2006, 22:03:11 UTC | Merge branch 'jc/boundary' * jc/boundary: rev-list --boundary: show boundary commits even when limited otherwise. | 17 April 2006, 22:03:11 UTC |
| e190bc5 | Junio C Hamano | 17 April 2006, 22:03:10 UTC | Merge branch 'jc/bottomless' * jc/bottomless: rev-list --bisect: limit list before bisecting. | 17 April 2006, 22:03:10 UTC |
| 360204c | Yann Dirson | 17 April 2006, 11:41:49 UTC | Allow empty lines in info/grafts In addition to the existing comment support, that just allows the user to use a convention that works pretty much everywhere else. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2006, 21:17:50 UTC |
| 1b65a5a | Junio C Hamano | 17 April 2006, 01:12:49 UTC | rev-list --boundary: show boundary commits even when limited otherwise. The boundary commits are shown for UI like gitk to draw them as soon as topo-order sorting allows, and should not be omitted by get_revision() filtering logic. As long as their immediate child commits are shown, we should not filter them out. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2006, 05:05:38 UTC |
| e6bfaf3 | A Large Angry SCM | 17 April 2006, 03:17:38 UTC | Makefile fixups. Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 April 2006, 03:42:37 UTC |
| 1a17ee2 | Junio C Hamano | 17 April 2006, 01:59:30 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug caused by missing commitlisted elements | 17 April 2006, 01:59:30 UTC |
| e7da347 | Paul Mackerras | 17 April 2006, 00:27:59 UTC | gitk: Fix bug caused by missing commitlisted elements This bug was reported by Yann Dirson, and results in an 'Error: expected boolean value but got ""' dialog when scrolling to the bottom of the graph under some circumstances. The issue is that git-rev-list isn't outputting all the boundary commits when it is asked for commits affecting only certain files. We already cope with that by adding the missing boundary commits in addextraid, but there we weren't adding a 0 to the end of the commitlisted list when we added the extra id to the end of the displayorder list. This fixes it by appending 0 to commitlisted in addextraid, thus keeping commitlisted and displayorder in sync. Signed-off-by: Paul Mackerras <paulus@samba.org> | 17 April 2006, 00:27:59 UTC |
| 5bc4ce5 | Junio C Hamano | 16 April 2006, 21:24:56 UTC | reading $GIT_DIR/info/graft - skip comments correctly. Noticed by Yann Dirson. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2006, 21:24:56 UTC |
| 402461a | Johannes Schindelin | 16 April 2006, 02:44:25 UTC | pager: do not fork a pager if PAGER is set to empty. This skips an extra pipe, and helps debugging tremendously. [jc: PAGER=cat is a questionable hack and should be done as a separate patch. ] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2006, 08:40:04 UTC |
| 2935327 | Johannes Schindelin | 15 April 2006, 11:41:18 UTC | diff-options: add --patch-with-stat With this option, git prepends a diffstat in front of the patch. Since I really, really do not know what a diffstat of a combined diff ("merge diff") should look like, the diffstat is not generated for these. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2006, 02:30:27 UTC |
| cbdda02 | Junio C Hamano | 16 April 2006, 01:38:32 UTC | diff-files --stat: do not dump core with unmerged index. Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2006, 02:22:48 UTC |
| 1cd9508 | Linus Torvalds | 15 April 2006, 18:13:49 UTC | Support "git cmd --help" syntax The "--help" argument is special, in that it is (along with "--version") in that is taken by the "git" program itself rather than the sub-command, and thus we've had the syntax "git --help cmd". However, as anybody who has ever used CVS or some similar devil-spawn program, it's confusing as h*ll when options before the sub-command act differently from options after the sub-command, so this quick hack just makes it acceptable to do "git cmd --help" instead, and get the exact same result. It may be hacky, but it's simple and does the trick. Of course, this does not help if you use one of the non-builtin commands without using the "git" helper. Ie you won't be getting a man-page just because you do "git-rev-list --help". Don't expect us to be quite _that_ helpful. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 April 2006, 01:17:46 UTC |
| 6f4780f | Junio C Hamano | 15 April 2006, 21:02:10 UTC | diff --stat: do not do its own three-dashes. I missed that "git-diff-* --stat" spits out three-dash separator on its own without being asked. Remove it. When we output commit log followed by diff, perhaps --patch-with-stat, for downstream consumer, we _would_ want the three-dash between the message and the diff material, but that logic belongs to the caller, not diff generator. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2006, 21:06:42 UTC |
| 5069b1c | Junio C Hamano | 15 April 2006, 10:22:00 UTC | diff-tree: typefix. Recent diff_tree_setup_paths() update made it take a second argument of type "struct diff_options", but we passed another struct that happenes to have that type at the beginning by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2006, 10:22:00 UTC |
| 42b5c78 | Junio C Hamano | 15 April 2006, 06:21:34 UTC | GIT v1.3.0-rc4 I've merged everything I think is ready for 1.3.0, so this is the final round -- hopefully I can release this with minimum last-minute fixup as v1.3.0 early next week. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2006, 06:21:34 UTC |
| 170abc8 | Junio C Hamano | 15 April 2006, 05:58:17 UTC | Merge branch 'dl/xdiff' * dl/xdiff: xdiff: post-process hunks to make them consistent. | 15 April 2006, 05:58:17 UTC |
| afcb536 | Junio C Hamano | 15 April 2006, 04:55:23 UTC | Merge branch 'js/diffstat' * js/diffstat: diff --stat: no need to ask funcnames nor context. diff-options: add --stat (take 2) diff-options: add --stat (take 2) | 15 April 2006, 04:55:23 UTC |
| a3cc31f | Junio C Hamano | 15 April 2006, 04:55:22 UTC | Merge branch 'jc/fix5500' * jc/fix5500: t5500: test fix | 15 April 2006, 04:55:22 UTC |
| 4e1dc64 | Junio C Hamano | 14 April 2006, 22:57:32 UTC | rev-list --bisect: limit list before bisecting. I noticed bisect does not work well without both good and bad. Running this script in git.git repository would give you quite different results: #!/bin/sh initial=e83c5163316f89bfbde7d9ab23ca2e25604af290 mid0=`git rev-list --bisect ^$initial --all` git rev-list $mid0 | wc -l git rev-list ^$mid0 --all | wc -l mid1=`git rev-list --bisect --all` git rev-list $mid1 | wc -l git rev-list ^$mid1 --all | wc -l The $initial commit is the very first commit you made. The first midpoint bisects things evenly as designed, but the latter does not. The reason I got interested in this was because I was wondering if something like the following would help people converting a huge repository from foreign SCM, or preparing a repository to be fetched over plain dumb HTTP only: #!/bin/sh N=4 P=.git/objects/pack bottom= while test 0 \< $N do N=$((N-1)) if test -z "$bottom" then newbottom=`git rev-list --bisect --all` else newbottom=`git rev-list --bisect ^$bottom --all` fi if test -z "$bottom" then rev_list="$newbottom" elif test 0 = $N then rev_list="^$bottom --all" else rev_list="^$bottom $newbottom" fi p=$(git rev-list --unpacked --objects $rev_list | git pack-objects $P/pack) git show-index <$P/pack-$p.idx | wc -l bottom=$newbottom done The idea is to pack older half of the history to one pack, then older half of the remaining history to another, to continue a few times, using finer granularity as we get closer to the tip. This may not matter, since for a truly huge history, running bisect number of times could be quite time consuming, and we might be better off running "git rev-list --all" once into a temporary file, and manually pick cut-off points from the resulting list of commits. After all we are talking about "approximately half" for such an usage, and older history does not matter much. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2006, 04:52:50 UTC |
| 40c2fe0 | Linus Torvalds | 15 April 2006, 04:20:51 UTC | Clean up trailing whitespace when pretty-printing commits Partly because we've messed up and now have some commits with trailing whitespace, but partly because this also just simplifies the code, let's remove trailing whitespace from the end when pretty-printing commits. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2006, 04:46:08 UTC |
| cad1ed9 | Junio C Hamano | 14 April 2006, 22:54:51 UTC | "git cmd -h" for shell scripts. Wrappers that use sh-setup took --help but not -h. Noticed by Sébastien Pierre. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 22:54:51 UTC |
| e51c3b5 | Junio C Hamano | 14 April 2006, 19:59:09 UTC | git-log <diff-options> <paths> documentation Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 19:59:09 UTC |
| e3a125a | Junio C Hamano | 14 April 2006, 19:47:10 UTC | Retire git-log.sh (take #4) Noticed by Johannes. We do not install it anymore, but still have been shipping the source, which was crazy. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 19:48:45 UTC |
| 5cf7e21 | Junio C Hamano | 14 April 2006, 19:41:51 UTC | stripspace: incomplete line fix (take #2) This fixes f4ee3eb68906f079dea45de4f1bbb03d68189eb3 breakage, which added an extra trailing blank line after stripping trailing blank lines by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 19:41:51 UTC |
| 7f732c6 | Junio C Hamano | 14 April 2006, 05:28:06 UTC | t5500: test fix Relying on eye-candy progress bar was fragile to begin with. Run fetch-pack with -k option, and count the objects that are in the pack that were transferred from the other end. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 05:28:06 UTC |
| 84981f9 | Junio C Hamano | 14 April 2006, 04:35:54 UTC | diff --stat: no need to ask funcnames nor context. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 04:35:54 UTC |
| dfdcb55 | Junio C Hamano | 14 April 2006, 02:05:38 UTC | Fix-up previous expr changes. The regexp on the right hand side of expr : operator somehow was broken. expr 'z+pu:refs/tags/ko-pu' : 'z\+\(.*\)' does not strip '+'; write 'z+\(.*\)' instead. We probably should switch to shell based substring post 1.3.0; that's not bashism but just POSIX anyway. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 02:05:38 UTC |
| ece634d | Johannes Schindelin | 13 April 2006, 23:09:48 UTC | diff-options: add --stat (take 2) ... and a fix for an invalid free(): Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 23:50:02 UTC |
| 295ba2f | Davide Libenzi | 13 April 2006, 23:45:13 UTC | xdiff: post-process hunks to make them consistent. | 13 April 2006, 23:48:45 UTC |
| d75f795 | Johannes Schindelin | 13 April 2006, 22:15:30 UTC | diff-options: add --stat (take 2) Now, you can say "git diff --stat" (to get an idea how many changes are uncommitted), or "git log --stat". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 23:48:24 UTC |
| f327dbc | Mark Wooding | 13 April 2006, 22:01:24 UTC | Shell utilities: Guard against expr' magic tokens. Some words, e.g., `match', are special to expr(1), and cause strange parsing effects. Track down all uses of expr and mangle the arguments so that this isn't a problem. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 23:45:48 UTC |
| 2283645 | Junio C Hamano | 13 April 2006, 18:57:57 UTC | t3600-rm: skip failed-remove test when we cannot make an unremovable file. When running t3600-rm test under fakeroot (or as root), we cannot make a file unremovable with "chmod a-w .". Detect this case early and skip that test. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 18:57:57 UTC |
