| 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 |
| f43ba60 | Linus Torvalds | 13 April 2006, 17:01:02 UTC | Use less memory in "git log" This trivially avoids keeping the commit message data around after we don't need it any more, avoiding a continually growing "git log" memory footprint. It's not a huge deal, but it's somewhat noticeable. For the current kernel tree, doing a full "git log" I got - before: /usr/bin/time git log > /dev/null 0.81user 0.02system 0:00.84elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+8851minor)pagefaults 0swaps - after: /usr/bin/time git log > /dev/null 0.79user 0.03system 0:00.83elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+5039minor)pagefaults 0swaps ie the touched pages dropped from 8851 to 5039. For the historic kernel archive, the numbers are 18357->11037 minor page faults. We could/should in theory free the commits themselves, but that's really a lot harder, since during revision traversal we may hit the same commit twice through different children having it as a parent, even after we've shown it once (when that happens, we'll silently ignore it next time, but we still need the "struct commit" to know). And as the commit message data is clearly the biggest part of the commit, this is the really easy 60% solution. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 18:26:56 UTC |
| d533524 | Junio C Hamano | 13 April 2006, 07:26:21 UTC | git-log: do not output excess blank line between commits Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 07:26:21 UTC |
| 8c989ec | Junio C Hamano | 13 April 2006, 07:17:19 UTC | Makefile: $(MAKE) check-docs This target lists undocumented commands, and/or whose document is not referenced from the main git documentation. For now, there are some exceptions I added primarily because I lack the energy to document them myself: - merge backends (we should really document them) - ssh-push/ssh-pull (does anybody still use them?) - annotate and blame (maybe after one of them eats the other ;-) Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 07:21:47 UTC |
| c16e30c | Junio C Hamano | 13 April 2006, 07:09:54 UTC | Documentation: add a couple of missing docs. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 07:21:06 UTC |
| 0237628 | Junio C Hamano | 12 April 2006, 20:24:48 UTC | Merge branch 'jc/combine' into next * jc/combine: stripspace: make sure not to leave an incomplete line. git-commit: do not muck with commit message when no_edit is set. When showing a commit message, do not lose an incomplete line. Retire t5501-old-fetch-and-upload test. combine-diff: type fix. | 12 April 2006, 20:24:48 UTC |
| 3103c00 | Junio C Hamano | 12 April 2006, 20:24:04 UTC | Merge branch 'master' into jc/combine * master: stripspace: make sure not to leave an incomplete line. git-commit: do not muck with commit message when no_edit is set. When showing a commit message, do not lose an incomplete line. Retire t5501-old-fetch-and-upload test. | 12 April 2006, 20:24:04 UTC |
| 8bc7574 | Junio C Hamano | 12 April 2006, 20:23:50 UTC | combine-diff: type fix. The variable hunk_end points at a line number, which is represented as unsigned long by all the other variables. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 April 2006, 20:23:50 UTC |
| f4ee3eb | Junio C Hamano | 12 April 2006, 20:10:27 UTC | stripspace: make sure not to leave an incomplete line. When dealing with a commit log message for human consumption, it never makes sense to keep a log that ends with an incomplete line, so make it a part of the clean-up process done by git-stripspace. Acked-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 April 2006, 20:10:27 UTC |
| 475443c | Junio C Hamano | 12 April 2006, 18:45:18 UTC | git-commit: do not muck with commit message when no_edit is set. Spotted by Linus and Darrin Thompson. When we took a commit message from -F <file> with an incomplete line, we appended "git status" output, which ended up attaching a lone "#" at the end. We still need the "do we have anything to commit?" check by running "status" (which has to know what to do in different cases with -i/-o/-a), but there is no point appending its output to the proposed commit message given by the user. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 April 2006, 18:45:18 UTC |
| 684958a | Linus Torvalds | 12 April 2006, 18:31:23 UTC | When showing a commit message, do not lose an incomplete line. | 12 April 2006, 18:31:23 UTC |
| 5ca64e4 | Junio C Hamano | 11 April 2006, 23:35:39 UTC | Retire t5501-old-fetch-and-upload test. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 23:35:39 UTC |
| 72c159f | Junio C Hamano | 11 April 2006, 21:34:59 UTC | Merge branch 'jc/combine' into next * jc/combine: combine-diff: fix hunks at the end (take #2). combine-diff: do not lose hunks with only deletion at end. | 11 April 2006, 21:34:59 UTC |
| 4da8cbc | Junio C Hamano | 11 April 2006, 21:34:53 UTC | Merge branch 'jc/diff' into next * jc/diff: blame and friends: adjust to multiple pathspec change. git log --full-diff tree-diff: do not assume we use only one pathspec | 11 April 2006, 21:34:53 UTC |
| 7406595 | Junio C Hamano | 11 April 2006, 21:31:31 UTC | combine-diff: fix hunks at the end (take #2). The previous round showed the delete-only hunks at the end, but forgot to mark them interesting when they were. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 21:31:31 UTC |
| 8a470eb | Junio C Hamano | 11 April 2006, 10:13:29 UTC | combine-diff: do not lose hunks with only deletion at end. We used to lose hunks that appear at the end and have only deletion. This makes sure that the record beyond the end of file (which holds such deletions) is examined. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 19:06:27 UTC |
| b5b1442 | Junio C Hamano | 11 April 2006, 18:52:36 UTC | Merge branch 'ds/index' into next * ds/index: Replace index() with strchr(). Solaris 9 also wants our own unsetenv/setenv. Retire git-log.sh (take #3) | 11 April 2006, 18:52:36 UTC |
| 55275b3 | Junio C Hamano | 11 April 2006, 18:52:01 UTC | Merge branch 'jc/withraw' into next * jc/withraw: Separate the raw diff and patch with a newline Document --patch-with-raw | 11 April 2006, 18:52:01 UTC |
| ef9e58c | Dennis Stosberg | 11 April 2006, 16:37:58 UTC | Replace index() with strchr(). strchr() is more portable than index() and is used everywhere in git already. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 18:45:37 UTC |
| 40d88d4 | Dennis Stosberg | 11 April 2006, 18:42:26 UTC | Solaris 9 also wants our own unsetenv/setenv. [jc: the original had "index() is evil" but that should be a separate patch.] | 11 April 2006, 18:42:26 UTC |
| f94fbbe | Junio C Hamano | 11 April 2006, 18:29:36 UTC | Retire git-log.sh (take #3) Do not install built-in commands as separate files -- use hardlinks instead. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 18:29:36 UTC |
| 90c1b08 | Petr Baudis | 11 April 2006, 11:30:46 UTC | Separate the raw diff and patch with a newline More friendly for human reading I believe, and possibly friendlier to some parsers (although only by an epsilon). Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 18:17:50 UTC |
| 5c91da2 | Petr Baudis | 11 April 2006, 11:22:17 UTC | Document --patch-with-raw Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 18:16:51 UTC |
| 8fcd421 | Junio C Hamano | 11 April 2006, 02:45:30 UTC | Merge branch 'eb/apply' into next * eb/apply: Implement limited context matching in git-apply. | 11 April 2006, 02:45:30 UTC |
| 6b32ee2 | Junio C Hamano | 11 April 2006, 02:44:35 UTC | Merge branch 'jc/withraw' into next * jc/withraw: diff-* --patch-with-raw Retire git-log.sh (take#2) Retire git-log.sh Retire diffcore-pathspec. Improve the git-diff-tree -c/-cc documentation | 11 April 2006, 02:44:35 UTC |
| 86ff1d2 | Junio C Hamano | 11 April 2006, 00:36:53 UTC | diff-* --patch-with-raw This new flag outputs the diff-raw output and diff-patch output at the same time. Requested by Cogito. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 02:44:18 UTC |
| 4749588 | Eric W. Biederman | 10 April 2006, 09:33:06 UTC | Implement limited context matching in git-apply. Ok this really should be the good version. The option handling has been reworked to be automation safe. Currently to import the -mm tree I have to work around git-apply by using patch. Because some of Andrews patches in quilt will only apply with fuzz. I started out implementing a --fuzz option and then I realized fuzz is not a very safe concept for an automated system. What you really want is a minimum number of context lines that must match. This allows policy to be set without knowing how many lines of context a patch actually provides. By default the policy remains to match all provided lines of context. Allowng git-apply to match a restricted set of context makes it much easier to import the -mm tree into git. I am still only processing 1.5 to 1.6 patches a second for the 692 patches in 2.6.17-rc1-mm2 is still painful but it does help. If I just loop through all of Andrews patches in order and run git-apply --index -C1 I process the entire patchset in 1m53s or about 6 patches per second. So running git-mailinfo, git-write-tree, git-commit-tree, and git-update-ref everytime has a measurable impact, and shows things can be speeded up even more. All of these timings were taking on my poor 700Mhz Athlon with 512MB of ram. So people with fast machiens should see much better performance. When a match is found after the number of context are reduced a warning is generated. Since this is a rare event and possibly dangerous this seems to make sense. Unless you are patching a single file the error message is a little bit terse at the moment, but it should be easy to go back and fix. I have also updated the documentation for git-apply to reflect the new -C option that sets the minimum number of context lines that must match. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 02:44:08 UTC |
| 944e3a8 | Junio C Hamano | 11 April 2006, 00:37:58 UTC | Retire git-log.sh (take#2) ... and install a replacement properly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 02:40:59 UTC |
| c4e05b1 | Junio C Hamano | 11 April 2006, 01:14:54 UTC | blame and friends: adjust to multiple pathspec change. This makes things that include revision.h build again. Blame is also built, but I am not sure how well it works (or how well it worked to begin with) -- it was relying on tree-diff to be using whatever pathspec was used the last time, which smells a bit suspicious. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 02:17:31 UTC |
| 9173080 | Junio C Hamano | 11 April 2006, 00:37:58 UTC | Retire git-log.sh Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 00:52:17 UTC |
| 477f2b4 | Junio C Hamano | 10 April 2006, 23:40:40 UTC | git log --full-diff Without this flag, "git log -p paths..." shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 April 2006, 23:45:19 UTC |
| a8baa7b | Junio C Hamano | 10 April 2006, 23:39:11 UTC | tree-diff: do not assume we use only one pathspec The way tree-diff was set up assumed we would use only one set of pathspec during the entire life of the program. Move the pathspec related static variables out to diff_options structure so that we can filter commits with one set of paths while show the actual diffs using different set of paths. I suspect this breaks blame.c, and makes "git log paths..." to default to the --full-diff, the latter of which is dealt with the next commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 April 2006, 23:45:19 UTC |
| 6d46a23 | Junio C Hamano | 10 April 2006, 23:44:59 UTC | Merge branch 'master' into jc/diff * master: Make "--parents" logs also be incremental Retire diffcore-pathspec. Improve the git-diff-tree -c/-cc documentation | 10 April 2006, 23:44:59 UTC |
| 5910e99 | Junio C Hamano | 10 April 2006, 22:58:41 UTC | Merge branch 'lt/rev' * lt/rev: Make "--parents" logs also be incremental | 10 April 2006, 22:58:41 UTC |
| 77882f6 | Junio C Hamano | 10 April 2006, 22:57:24 UTC | Retire diffcore-pathspec. Nobody except diff-stages used it -- the callers instead filtered the input to diffcore themselves. Make diff-stages do that as well and retire diffcore-pathspec. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 April 2006, 22:57:24 UTC |
| a13ba12 | Petr Baudis | 09 April 2006, 13:43:17 UTC | Improve the git-diff-tree -c/-cc documentation This tries to clarify the -c/-cc documentation and clean up the style and grammar. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 18:11:19 UTC |
| 910a591 | Junio C Hamano | 09 April 2006, 09:07:33 UTC | Merge branch 'jc/diff' into next * jc/diff: git log [diff-tree options]... log-tree: separate major part of diff-tree. | 09 April 2006, 09:07:33 UTC |
| 52b70d5 | Junio C Hamano | 09 April 2006, 08:59:03 UTC | git log [diff-tree options]... And this makes "git log" to take common diff-tree options, so that it can be used as "git whatchanged". The recent revision walker updates by Linus to make path limiting low-latency helps this quite a bit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 08:59:03 UTC |
| 5f1c3f0 | Junio C Hamano | 09 April 2006, 08:11:11 UTC | log-tree: separate major part of diff-tree. This separates out the part that deals with one-commit diff-tree (and --stdin form) into a separate log-tree module. There are two goals with this. The more important one is to be able to make this part available to "git log --diff", so that we can have a native "git whatchanged" command. Another is to simplify the commit log generation part simpler. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 08:35:13 UTC |
| 3381c79 | Linus Torvalds | 09 April 2006, 00:05:58 UTC | Make "--parents" logs also be incremental The parent rewriting feature caused us to create the whole history in one go, and then simplify it later, because of how rewrite_parents() had been written. However, with a little tweaking, it's perfectly possible to do even that one incrementally. Right now, this doesn't really much matter, because every user of "--parents" will probably generally _also_ use "--topo-order", which will cause the old non-incremental behaviour anyway. However, I'm hopeful that we could make even the topological sort incremental, or at least _partially_ so (for example, make it incremental up to the first merge). In the meantime, this at least moves things in the right direction, and removes a strange special case. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 06:37:21 UTC |
| 0ed49a3 | Marco Roeland | 08 April 2006, 15:27:20 UTC | xdiff/xdiffi.c: fix warnings about possibly uninitialized variables Compiling this module gave the following warnings (some double dutch!): xdiff/xdiffi.c: In functie 'xdl_recs_cmp': xdiff/xdiffi.c:298: let op: 'spl.i1' may be used uninitialized in this function xdiff/xdiffi.c:298: let op: 'spl.i2' may be used uninitialized in this function xdiff/xdiffi.c:219: let op: 'fbest1' may be used uninitialized in this function xdiff/xdiffi.c:219: let op: 'bbest1' may be used uninitialized in this function A superficial tracking of their usage, without deeper knowledge about the algorithm, indeed confirms that there are code paths on which these variables will be used uninitialized. In practice these code paths might never be reached, but then these fixes will not change the algorithm. If these code paths are ever reached we now at least have a predictable outcome. And should the very small performance impact of these initializations be noticeable, then they should at least be replaced by comments why certain code paths will never be reached. Some extra initializations in this patch now fix the warnings. | 09 April 2006, 06:35:22 UTC |
| fc58071 | Junio C Hamano | 09 April 2006, 03:17:46 UTC | diffcore-rename: fix merging back a broken pair. When a broken pair is matched up by rename detector to be merged back, we do not want to say it is "dissimilar" with the similarity index. The output should just say they were changed, taking the break score left by the earlier diffcore-break run if any. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 03:32:41 UTC |
| a041d94 | Junio C Hamano | 09 April 2006, 02:45:39 UTC | diff: fix output of total-rewrite diff. We did not read in the file data before emitting the total-rewrite diff. Noticed by Pasky. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 03:32:40 UTC |
| f085383 | Junio C Hamano | 08 April 2006, 05:34:11 UTC | git-log: match rev-list --abbrev and --abbrev-commit Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 03:32:40 UTC |
| ad0b46b | Junio C Hamano | 08 April 2006, 01:03:07 UTC | Merge branch 'master' into next * master: GIT 1.3.0-rc3 | 08 April 2006, 01:03:07 UTC |
