| 49ed2bc | Junio C Hamano | 05 December 2006, 03:44:40 UTC | git-reset to remove "$GIT_DIR/MERGE_MSG" An earlier commit a9cb3c6e changed git-commit to use the contents of MERGE_MSG even when we do not have MERGE_HEAD (the rationale is in its log message). However, the change tricks the following sequence to include a merge message in a completely unrelated commit: $ git pull somewhere : oops, the conflicts are too much. forget it. $ git reset --hard : work work work $ git commit To fix this confusion, this patch makes "git reset" to remove the leftover MERGE_MSG that was prepared when the user abandoned the merge. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Luben Tuikov <ltuikov@yahoo.com | 06 December 2006, 18:47:14 UTC |
| 0fb1eaa | Junio C Hamano | 04 December 2006, 10:11:39 UTC | unpack-trees: make sure "df_conflict_entry.name" is NUL terminated. The structure that ends with a flexible array member (or 0 length array with older GCC) "char name[FLEX_ARRAY]" is allocated on the stack and we use it after clearing its entire size with memset. That does not guarantee that "name" is properly NUL terminated as we intended on platforms with more forgiving structure alignment requirements. Reported breakage on m68k by Roman Zippel. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 December 2006, 22:24:28 UTC |
| 562cefb | Junio C Hamano | 04 December 2006, 22:24:12 UTC | receive-pack: do not insist on fast-forward outside refs/heads/ Especially refs/tags/ hierarchy should match what git-fetch checks. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 December 2006, 22:24:12 UTC |
| aca085e | Johannes Schindelin | 03 December 2006, 19:42:47 UTC | git-mv: search more precisely for source directory in index A move of a directory should find the entries in the index by searching for the name _including_ the slash. Otherwise, the directory can be shadowed by a file when it matches the prefix and is lexicographically smaller, e.g. "ab.c" shadows "ab/". Noticed by Sergey Vlasov. [jc: added Sergey's original reproduction recipe as a test case at the end of t7001.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 December 2006, 08:55:12 UTC |
| 6173c19 | Eric Wong | 03 December 2006, 00:19:31 UTC | git-svn: avoid fetching files twice in the same revision SVN is not entirely consistent in returning log information and sometimes returns file information when adding subdirectories, and sometimes it does not (only returning information about the directory that was added). This caused git-svn to occasionally add a file to the list of files to be fetched twice. Now we change the data structure to be hash to avoid repeated fetches. As of now (in master), this only affects repositories fetched without deltas enabled (file://, and when manually overriden with GIT_SVN_DELTA_FETCH=0); so this bug mainly affects users of 1.4.4.1 and maint. Thanks to Florian Weimer for reporting this bug. [jc: backported for maint] Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 December 2006, 01:25:34 UTC |
| eb07fd5 | Andy Parkins | 29 November 2006, 08:25:40 UTC | Document git-repo-config --bool/--int options. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2006, 18:34:20 UTC |
| 6658923 | Junio C Hamano | 29 November 2006, 08:17:01 UTC | tutorial: talk about user.name early and don't start with commit -a Introducing yourself to git early would be a good idea; otherwise the user may not find the mistake until much later when "git log" is learned. Teaching "commit -a" without saying that it is a shortcut for listing the paths to commit leaves the user puzzled. Teach the form with explicit paths first. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2006, 18:34:18 UTC |
| 6bee4e4 | Alex Riesen | 15 November 2006, 21:52:25 UTC | git-blame: fix rev parameter handling. We lacked "--" termination in the underlying init_revisions() call which made it impossible to specify a revision that happens to have the same name as an existing file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2006, 18:33:25 UTC |
| ab3bb80 | Junio C Hamano | 29 November 2006, 06:29:18 UTC | git blame -C: fix output format tweaks when crossing file boundary. We used to get the case that more than two paths came from the same commit wrong when computing the output width and deciding to turn on --show-name option automatically. When we find that lines that came from a path that is different from what we started digging from, we should always turn --show-name on, and we should count the name length for all files involved. Signed-off-by: Junio C Hamano <junkio@cox.net> | 29 November 2006, 06:32:23 UTC |
| f73da29 | Andy Parkins | 23 November 2006, 10:05:17 UTC | Increase length of function name buffer In xemit.c:xdl_emit_diff() a buffer for showing the function name as commentary is allocated; this buffer was 40 characters. This is a bit small; particularly for C++ function names where there is often an identical prefix (like void LongNamespace::LongClassName) on multiple functions, which makes the context the same everywhere. In other words the context is useless. This patch increases that buffer to 80 characters - which may still not be enough, but is better Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 24 November 2006, 06:51:41 UTC |
| 4769489 | Eric Wong | 23 November 2006, 22:54:05 UTC | git-svn: preserve uncommitted changes after dcommit Using dcommit could cause the user to lose uncommitted changes during the reset --hard operation, so change it to reset --mixed. If dcommit chooses the rebase path, then git-rebase will already error out when local changes are made. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 November 2006, 23:17:46 UTC |
| e70dc78 | Eric Wong | 23 November 2006, 22:54:04 UTC | git-svn: correctly handle revision 0 in SVN repositories some SVN repositories have a revision 0 (committed by no author and no date) when created; so when we need to ensure that we check any revision variables are defined, and not just non-zero. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 November 2006, 23:17:45 UTC |
| 48d044b | Eric Wong | 23 November 2006, 22:54:03 UTC | git-svn: error out from dcommit on a parent-less commit dcommit would unconditionally append "~1" to a commit in order to generate a diff. Now we generate a meaningful error message if we try to generate an impossible diff. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 November 2006, 23:17:43 UTC |
| 0ea865c | René Scharfe | 23 November 2006, 22:02:37 UTC | archive-zip: don't use sizeof(struct ...) We can't rely on sizeof(struct zip_*) returning the sum of all struct members. At least on ARM padding is added at the end, as Gerrit Pape reported. This fixes the problem but still lets the compiler do the summing by introducing explicit padding at the end of the structs and then taking its offset as the combined size of the preceding members. As Junio correctly notes, the _end[] marker array's size must be greater than zero for compatibility with compilers other than gcc. The space wasted by the markers can safely be neglected because we only have one instance of each struct, i.e. in sum 3 wasted bytes on i386, and 0 on ARM. :) We still rely on the compiler to not add padding between the struct members, but that's reasonable given that all of them are unsigned char arrays. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 November 2006, 22:20:32 UTC |
| e945f95 | Junio C Hamano | 23 November 2006, 00:57:34 UTC | GIT 1.4.4.1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 November 2006, 00:57:34 UTC |
| 2bbaaed | Junio C Hamano | 23 November 2006, 00:33:32 UTC | trust-executable-bit: fix breakage for symlinks An earlier commit f28b34a broke symlinks when trust-executable-bit is not set because it incorrectly assumed that everything was a regular file. Reported by Juergen Ruehle. Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 November 2006, 00:36:49 UTC |
| 5d1faf8 | Chris Riddoch | 21 November 2006, 23:49:15 UTC | Move --pretty options into Documentation/pretty-formats.txt Asciidoc-include it into the manuals for programs that use the --pretty command-line option, for consistency among the docs. This describes all the pretty-formats currently listed in the cmit_fmt enum in commit.h, and also briefly describes the presence and format of the 'Merge: ' line in some pretty formats. There's a hedge that limiting your view of history can affect what goes in the Merge: line, and that --abbrev/--no-abbrev do nothing to the 'raw' format. Signed-off-by: Chris Riddoch <chris@syntacticsugar.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 23 November 2006, 00:06:32 UTC |
| 5942706 | Paolo Ciarrocchi | 20 November 2006, 20:29:41 UTC | Doc: Make comment about merging in tutorial.txt more clear Rephrased a sentence in order to make more clear the concept of pull . branch Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 November 2006, 03:01:29 UTC |
| aa90986 | Michal Rokos | 21 November 2006, 22:19:28 UTC | archive: use setvbuf() instead of setlinebuf() This tiny patch makes GIT compile again on HP-UX 11i. [jc: The setlinebuf() is described as unportable to BSD before 4.2; it's not even in POSIX, while setvbuf() is in ISO C.] Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 22 November 2006, 00:57:55 UTC |
| 6994560 | Paolo Ciarrocchi | 21 November 2006, 18:55:20 UTC | Teach SubmittingPatches about git-commit -s As discussed on git mailing list let's teach the reader about the possiblity to have automatically signed off the commit running the git-commit -s command Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 21 November 2006, 19:40:18 UTC |
| ef06b91 | Junio C Hamano | 19 November 2006, 06:13:33 UTC | do_for_each_ref: perform the same sanity check for leftovers. An earlier commit b37a562a added a check to see if the ref points at a valid object (as a part of 'negative ref' support which we currently do not use), but did so only while iterating over both packed and loose refs, and forgot to apply the same check while iterating over the remaining ones. We might want to replace the "if null then omit it" check with "eh --- what business does a 0{40} value have here?" complaint later since we currently do not use negative refs, but that is a separate issue. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 November 2006, 02:44:29 UTC |
| 6c96c0f | Junio C Hamano | 19 November 2006, 05:39:17 UTC | git-fetch: follow lightweit tags as well. This side-ports commit fd19f620 from Cogito, in which I fixed exactly the same bug. Somehow nobody noticed this for a long time in git. Signed-off-by: Junio C Hamano <junkio@cox.net> | 20 November 2006, 02:44:23 UTC |
| 198a4f4 | Petr Baudis | 18 November 2006, 23:30:15 UTC | Documentation: Correct alternates documentation, document http-alternates For one, the documentation invalidly claimed that the paths have to be absolute when that's not the case and in fact there is a very valid reason not to use absolute paths (documented the reason as well). Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 November 2006, 00:29:46 UTC |
| e3d457f | Petr Baudis | 18 November 2006, 19:44:08 UTC | Documentation: Define symref and update HEAD description HEAD was still described as a symlink instead of a symref. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 November 2006, 22:04:51 UTC |
| fd93141 | Rene Scharfe | 18 November 2006, 14:15:49 UTC | Document git-runstatus I copied most of the text from git-status.txt. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 November 2006, 22:04:45 UTC |
| 3dad11b | Rene Scharfe | 18 November 2006, 12:07:09 UTC | git-apply: slightly clean up bitfield usage This patch fixes a sparse warning about inaccurate_eof being a "dubious one-bit signed bitfield", makes three more binary variables members of this (now unsigned) bitfield and adds a short comment to indicate the nature of two ternary variables. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 November 2006, 19:40:11 UTC |
| 38f4d13 | Rene Scharfe | 18 November 2006, 12:06:56 UTC | sparse fix: Using plain integer as NULL pointer Z_NULL is defined as 0, use a proper NULL pointer in its stead. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 November 2006, 19:40:07 UTC |
| a6e8a76 | Rene Scharfe | 18 November 2006, 12:07:06 UTC | sparse fix: non-ANSI function declaration The declaration of discard_cache() in cache.h already has its "void". Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 November 2006, 19:40:00 UTC |
| f847c07 | Petr Baudis | 18 November 2006, 05:05:11 UTC | git-apply: Documentation typo fix inacurate -> inaccurate, sorry if it was a pun. ;-) Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 November 2006, 19:09:55 UTC |
| f829063 | Petr Baudis | 18 November 2006, 02:56:52 UTC | Fix git-for-each-refs broken for tags Unfortunately, git-for-each-refs is currently unusable for peeking into tag comments, since it uses freed pointers, so it just prints out all sort of garbage. This makes it strdup() contents and body values. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 November 2006, 19:09:46 UTC |
| 6b1f8c3 | Linus Torvalds | 17 November 2006, 06:57:20 UTC | "git fmt-merge-msg" SIGSEGV Ok, this is a _really_ stupid case, and I don't think it matters, but hey, we should never SIGSEGV. Steps to reproduce: mkdir duh cd duh git init-db git-fmt-merge-msg < /dev/null will cause a SIGSEGV in cmd_fmt_merge_msg(), because we're doing a strncmp() with a NULL current_branch. And yeah, it's an insane schenario, and no, it doesn't really matter. The only reason I noticed was that a broken version of my "git pull" into an empty directory would cause this. This silly patch just replaces the SIGSEGV with a controlled exit with an error message. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 November 2006, 07:45:57 UTC |
| d09e79c | Linus Torvalds | 16 November 2006, 19:47:22 UTC | git-pull: allow pulling into an empty repository We used to complain that we cannot merge anything we fetched with a local branch that does not exist yet. Just treat the case as a natural extension of fast forwarding and make the local branch'es tip point at the same commit we just fetched. After all an empty repository without an initial commit is an ancestor of any commit. [jc: I added a trivial test. We've become sloppy but we should stick to the discipline of covering new behaviour with new tests. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 November 2006, 07:45:48 UTC |
| 73fbd33 | Junio C Hamano | 15 November 2006, 22:57:47 UTC | convert-objects: set _XOPEN_SOURCE to 600 Otherwise OpenBSD header files drop S_ISLNK() definition which is used in an inline defined in cache.h Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2006, 22:57:47 UTC |
| efe4abd | Jim Meyering | 15 November 2006, 20:15:44 UTC | Run "git repack -a -d" once more at end, if there's 1MB or more of not-packed data. Although I converted upstream coreutils to git last month, I just reconverted coreutils once again, as a test, and ended up with a git repository of about 130MB (contrast with my packed git repo of size 52MB). That was because there were a lot of commits (but < 1024) after the final automatic "git-repack -a -d". Running a final git-repack -a -d && git-prune-packed cut the final repository size down to the expected size. So this looks like an easy way to improve git-cvsimport. Just run "git repack ..." at the end if there's more than some reasonable amount of not-packed data. My choice of 1MB is a little arbitrarily. I wouldn't mind missing the minimal repo size by 1MB. At the other end of the spectrum, it's probably not worthwhile to pack everything when the total repository size is less than 1MB. Here's the patch: Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2006, 20:50:29 UTC |
| faa1bbf | Alexandre Julliard | 15 November 2006, 20:37:50 UTC | gitweb: Put back shortlog instead of graphiclog in the project list. Looks like a repo.or.cz-specific change slipped in. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2006, 20:49:27 UTC |
| bf7e147 | Junio C Hamano | 15 November 2006, 18:54:10 UTC | git-checkout: allow pathspec to recover lost working tree directory It is often wanted on the #git channel that this were to work to recover removed directory: rm -fr Documentation git checkout -- Documentation git checkout HEAD -- Documentation ;# alternatively Now it does. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2006, 20:01:44 UTC |
| 897643c | Junio C Hamano | 15 November 2006, 18:46:10 UTC | git-checkout: do not allow -f and -m at the same time. Instead of silently ignoring one over the other, complain on this incompatible combination. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2006, 20:01:30 UTC |
| 0a3881d | Johannes Schindelin | 15 November 2006, 16:27:54 UTC | Seek back to current filepos when mmap()ing with NO_MMAP "git-index-pack --fix-thin" relies on mmap() not changing the current file position (otherwise the pack will be corrupted when writing the final SHA1). Meet that expectation. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2006, 18:23:47 UTC |
| e267c2f | Junio C Hamano | 15 November 2006, 06:11:26 UTC | GIT 1.4.4 Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 November 2006, 06:11:26 UTC |
| 2a54323 | Junio C Hamano | 13 November 2006, 22:30:39 UTC | Merge branch 'maint' * maint: Rework cvsexportcommit to handle binary files for all cases. Catch errors when writing an index that contains invalid objects. test-lib.sh: A command dying due to a signal is an unexpected failure. git-update-index(1): fix use of quoting in section title | 13 November 2006, 22:30:39 UTC |
| fe142b3 | Robin Rosenberg | 12 November 2006, 15:29:42 UTC | Rework cvsexportcommit to handle binary files for all cases. Also adds test cases for adding removing and deleting binary and text files plus two tests for the checks on binary files. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2006, 22:27:38 UTC |
| 3d12d0c | Johannes Sixt | 13 November 2006, 13:50:00 UTC | Catch errors when writing an index that contains invalid objects. If git-write-index is called without --missing-ok, it reports invalid objects that it finds in the index. But without this patch it dies right away or may run into an infinite loop. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2006, 22:26:51 UTC |
| 40cf043 | Johannes Sixt | 13 November 2006, 13:50:04 UTC | test-lib.sh: A command dying due to a signal is an unexpected failure. When test_expect_failure detects that a command failed, it still has to treat a program that crashed from a signal as unexpected failure. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2006, 22:26:41 UTC |
| bae777d | Jonas Fonseca | 12 November 2006, 21:28:43 UTC | git-update-index(1): fix use of quoting in section title Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 November 2006, 02:50:20 UTC |
| a74e60a | Junio C Hamano | 12 November 2006, 02:22:31 UTC | GIT 1.4.4-rc2 Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2006, 02:30:31 UTC |
| dc8302d | Junio C Hamano | 12 November 2006, 02:30:31 UTC | Merge branch 'maint' * maint: git-cvsserver: read from git with -z to get non-ASCII pathnames. | 12 November 2006, 02:30:31 UTC |
| e02cd63 | Junio C Hamano | 10 November 2006, 19:53:41 UTC | git-cvsserver: read from git with -z to get non-ASCII pathnames. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 November 2006, 02:26:57 UTC |
| 5a4ffc8 | Junio C Hamano | 11 November 2006, 22:49:25 UTC | Merge branch 'maint' * maint: path-list: fix path-list-insert return value | 11 November 2006, 22:49:25 UTC |
| 057bc80 | Junio C Hamano | 11 November 2006, 22:45:35 UTC | path-list: fix path-list-insert return value When path-list-insert is called on an existing path, it returned an unrelated element in the list. Luckily most of the callers are ignoring the return value, but merge-recursive uses it at three places and this would have resulted in a bogus rename detection. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 November 2006, 22:46:11 UTC |
| 8eaf798 | Junio C Hamano | 10 November 2006, 21:39:01 UTC | git-annotate: fix -S on graft file with comments. The graft file can contain comment lines and read_graft_line can return NULL for such an input, which should be skipped by the reader. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 November 2006, 21:44:39 UTC |
| a19f901 | Junio C Hamano | 10 November 2006, 21:36:44 UTC | git-annotate: no need to exec blame; it is built-in now. | 10 November 2006, 21:36:44 UTC |
| 368c2ac | Junio C Hamano | 09 November 2006, 23:08:19 UTC | Merge branch 'maint' * maint: git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch. git-svn: fix dcommit losing changes when out-of-date from svn git-svn: don't die on rebuild when --upgrade is specified git-svn: avoid printing filenames of files we're not tracking | 09 November 2006, 23:08:19 UTC |
| a6ec3c1 | Robert Shearman | 03 October 2006, 16:29:26 UTC | git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch. This reduces the number of conflicts when rebasing after a series of patches to the same piece of code is committed upstream. Signed-off-by: Robert Shearman <rob@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 22:41:16 UTC |
| 18d5453 | Junio C Hamano | 09 November 2006, 18:44:56 UTC | Documentation: move blame examples This moves the example to specify a line range with regexps to a later part of the manual page that has similar examples. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 18:44:56 UTC |
| 6a96b32 | Junio C Hamano | 09 November 2006, 17:40:59 UTC | Merge branch 'maint' * maint: Nicer error messages in case saving an object to db goes wrong | 09 November 2006, 17:40:59 UTC |
| 45bf473 | Eric Wong | 09 November 2006, 09:19:37 UTC | git-svn: fix dcommit losing changes when out-of-date from svn There was a bug in dcommit (and commit-diff) which caused deltas to be generated against the latest version of the changed file in a repository, and not the revision we are diffing (the tree) against locally. This bug can cause recent changes to the svn repository to be silently clobbered by git-svn if our repository is out-of-date. Thanks to Steven Grimm for noticing the bug. The (few) people using the commit-diff command are now required to use the -r/--revision argument. dcommit usage is unchanged. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 17:34:46 UTC |
| a35a045 | Eric Wong | 05 November 2006, 05:51:11 UTC | git-svn: don't die on rebuild when --upgrade is specified --copy-remote and --upgrade are rarely (never?) used together, so if --copy-remote is specified, that means the user really wanted to copy the remote ref, and we should fail if that fails. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 17:34:36 UTC |
| 75bd7e3 | Eric Wong | 05 November 2006, 05:51:10 UTC | git-svn: avoid printing filenames of files we're not tracking This is purely an aesthetic change, we already skip importing of files that don't affect the subdirectory we import. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 17:34:27 UTC |
| 916d081 | Petr Baudis | 09 November 2006, 12:52:05 UTC | Nicer error messages in case saving an object to db goes wrong Currently the error e.g. when pushing to a read-only repository is quite confusing, this attempts to clean it up, unifies error reporting between various object writers and uses error() on couple more places. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 17:33:53 UTC |
| 1c791cf | Junio C Hamano | 09 November 2006, 10:33:35 UTC | gitweb: fix unmatched div in commitdiff When the last filepair changed only metainfo we failed to close the extended header <div>. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 10:33:35 UTC |
| 225932e | Junio C Hamano | 09 November 2006, 08:57:13 UTC | gitweb: protect commit messages from controls. The same change as the previous. It is rather sad that commit log message parser gives list of chomped lines while tag message parser gives unchomped ones. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 08:57:13 UTC |
| 25ffbb2 | Junio C Hamano | 08 November 2006, 23:11:10 UTC | gitweb: protect blob and diff output lines from controls. This revealed that the output from blame and tag was not chomped properly and was relying on HTML output not noticing that extra whitespace that resulted from the newline, which was also fixed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 08:13:50 UTC |
| acca687 | Junio C Hamano | 09 November 2006, 02:47:54 UTC | git-pickaxe: retire pickaxe Just make it take over blame's place. Documentation and command have all stopped mentioning "git-pickaxe". The built-in synonym is left in the command table, so you can still say "git pickaxe", but it probably is a good idea to retire it as well. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 November 2006, 02:49:37 UTC |
| 659db3f | Junio C Hamano | 08 November 2006, 21:43:08 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] gitk: Fix nextfile() and add prevfile() | 08 November 2006, 21:43:08 UTC |
| 3a94680 | Junio C Hamano | 08 November 2006, 21:20:46 UTC | git-status: quote LF in its output Otherwise, commit log template would get the remainder of the filename start on a new line unquoted and the log gets messed up. I initially considered using the full quote_c_style(), but the output from the command is primarily for human consumption so chose to leave other control characters and bytes with high-bits unmolested. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 21:20:46 UTC |
| 2b2a8c7 | Junio C Hamano | 08 November 2006, 20:22:04 UTC | gitweb: do not give blame link unconditionally in diff-tree view Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 20:34:25 UTC |
| 744d0ac | Jakub Narebski | 08 November 2006, 16:59:41 UTC | gitweb: New improved patchset view Replace "gitweb diff header" with its full sha1 of blobs and replace it by "git diff" header and extended diff header. Change also somewhat highlighting of diffs. Added `file_type_long' subroutine to convert file mode in octal to file type description (only for file modes which used by git). Changes: * "gitweb diff header" which looked for example like below: file:_<sha1 before>_ -> file:_<sha1 after>_ where 'file' is file type and '<sha1>' is full sha1 of blob is changed to diff --git _a/<file before>_ _b/<file after>_ In both cases links are visible and use default link style. If file is added, a/<file> is not hyperlinked. If file is deleted, b/<file> is not hyperlinked. * there is added "extended diff header", with <path> and <hash> hyperlinked (and <hash> shortened to 7 characters), and <mode> explained: '<mode>' is extended to '<mode> (<file type description>)', where added text is slightly lighter to easy distinguish that it was added (and it is difference from git-diff output). * from-file/to-file two-line header lines have slightly darker color than removed/added lines. * chunk header has now delicate line above for easier finding chunk boundary, and top margin of 2px, both barely visible. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 20:34:19 UTC |
| 1d3bc0c | Jakub Narebski | 08 November 2006, 10:50:07 UTC | gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path Instead of simply hiding control characters in esc_path by replacing them with '?', use Character Escape Codes (CEC) i.e. alphabetic backslash sequences like those found in C programming language and many other languages influenced by it, such as Java and Perl. If control characted doesn't have corresponding character escape code, use octal char sequence to escape it. Alternatively, controls can be replaced with Unicode Control Pictures U+2400 - U+243F (9216 - 9279), the Unicode characters reserved for representing control characters when it is necessary to print or display them. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 20:34:03 UTC |
| 403d090 | Jakub Narebski | 08 November 2006, 10:48:56 UTC | gitweb: Better git-unquoting and gitweb-quoting of pathnames Extend unquote subroutine, which unquotes quoted and escaped filenames which git may return, to deal not only with octal char sequence quoting, but also quoting ordinary characters including '\"' and '\\' which are respectively quoted '"' and '\', and to deal also with C escape sequences including '\t' for TAB and '\n' for LF. Add esc_path subroutine for gitweb quoting and HTML escaping filenames (currently it does equivalent of ls' --hide-control-chars, which means showing undisplayable characters (including '\n' and '\t') as '?' (question mark) character, and use 'span' element with cntrl CSS class to help rendering them differently. Convert gitweb to use esc_path correctly to print pathnames. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 18:38:48 UTC |
| 83ee94c | Junio C Hamano | 08 November 2006, 06:37:17 UTC | gitweb: minimally fix "fork" support. A forked project is defined to be $projname/$forkname.git for $projname.git; the code did not check this correctly and mistook $projname/.git to be a fork of itself. This minimally fixes the breakage. Also forks were not checked when index.aux file was in use. Listing the forked ones in index.aux would show them also on the toplevel index which may go against the hierarchical nature of forks, but again this is a minimal fix to whip it in a better shape suitable to be in the 'master' branch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 06:42:05 UTC |
| 5dd5ed0 | Junio C Hamano | 08 November 2006, 06:00:45 UTC | gitweb: fix disabling of "forks" Apparently this code was never tested without "forks". check-feature returns a one-element list (0) when disabled, and assigning that to a scalar variable made it to be called in a scalar context, which meant my $check_forks = gitweb_check_feature("forks") were always 1! Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 06:00:45 UTC |
| baf0bfc | Junio C Hamano | 08 November 2006, 00:36:11 UTC | GIT 1.4.3-rc1 Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 00:36:11 UTC |
| c56f243 | Junio C Hamano | 08 November 2006, 00:34:30 UTC | Merge branch 'maint' * maint: remove an unneeded test | 08 November 2006, 00:34:30 UTC |
| 24ad8e0 | Junio C Hamano | 08 November 2006, 00:33:59 UTC | Merge branch 'jc/pickaxe' | 08 November 2006, 00:33:59 UTC |
| 7bd9641 | Junio C Hamano | 08 November 2006, 00:20:02 UTC | git-pickaxe: allow "-L <something>,+N" With this, git pickaxe -L '/--progress/,+20' v1.4.0 -- pack-objects.c gives you 20 lines starting from the first occurrence of '--progress' in pack-objects, digging from v1.4.0 version. You can also say git pickaxe -L '/--progress/,-5' v1.4.0 -- pack-objects.c Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 00:24:37 UTC |
| 231f240 | Nicolas Pitre | 07 November 2006, 15:51:23 UTC | git-pack-objects progress flag documentation and cleanup This adds documentation for --progress and --all-progress, remove a duplicate --progress handling and make usage string more readable. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 November 2006, 00:05:37 UTC |
| 0623421 | Tero Roponen | 07 November 2006, 10:44:33 UTC | remove an unneeded test In wt-status.c there is a test which does nothing. This patch removes it. Signed-off-by: Tero Roponen <teanropo@jyu.fi> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 November 2006, 23:50:06 UTC |
| d0a75a1 | Junio C Hamano | 07 November 2006, 23:41:34 UTC | Merge branch 'jc/read-tree' * jc/read-tree: t6022: ignoring untracked files by merge-recursive when they do not matter merge-recursive: adjust to loosened "working file clobbered" check merge-recursive: make a few functions static. merge-recursive: use abbreviated commit object name. merge: loosen overcautious "working file will be lost" check. | 07 November 2006, 23:41:34 UTC |
| 66f3b35 | Junio C Hamano | 07 November 2006, 23:39:56 UTC | Merge branch 'np/index-pack' * np/index-pack: remove .keep pack lock files when done with refs update have index-pack create .keep file more carefully improve fetch-pack's handling of kept packs git-fetch can use both --thin and --keep with fetch-pack now Teach receive-pack how to keep pack files based on object count. Allow pack header preprocessing before unpack-objects/index-pack. Remove unused variable in receive-pack. Revert "send-pack --keep: do not explode into loose objects on the receiving end." missing small substitution Teach git-index-pack how to keep a pack file. Only repack active packs by skipping over kept packs. Allow short pack names to git-pack-objects --unpacked=. send-pack --keep: do not explode into loose objects on the receiving end. index-pack: minor fixes to comment and function name enhance clone and fetch -k experience mimic unpack-objects when --stdin is used with index-pack add progress status to index-pack make index-pack able to complete thin packs. enable index-pack streaming capability | 07 November 2006, 23:39:56 UTC |
| bd45fec | Junio C Hamano | 07 November 2006, 06:56:07 UTC | Merge branch 'maint' * maint: Documentation: Transplanting branch with git-rebase --onto merge-recursive implicitely depends on trust_executable_bit adjust_shared_perm: chmod() only when needed. Fix git-runstatus for repositories containing a file named HEAD | 07 November 2006, 06:56:07 UTC |
| 931233b | Junio C Hamano | 07 November 2006, 01:08:32 UTC | git-pickaxe: -L /regexp/,/regexp/ With this change, you can specify the beginning and the ending line of the range you wish to inspect with pattern matching. For example, these are equivalent with the git.git sources: git pickaxe -L 7,21 v1.4.0 -- commit.c git pickaxe -L '/^struct sort_node/,/^}/' v1.4.0 -- commit.c git pickaxe -L '7,/^}/' v1.4.0 -- commit.c git pickaxe -L '/^struct sort_node/,21' v1.4.0 -- commit.c Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 November 2006, 06:09:44 UTC |
| e52775f | Jakub Narebski | 06 November 2006, 18:12:45 UTC | Documentation: Transplanting branch with git-rebase --onto Added example of transplantig feature branch from one development branch (for example "next") into the other development branch (for example "master"). [jc: talking Carl's advice this contains both examples sent to the list by Jakub in his original message.] Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 23:01:14 UTC |
| d28f7cb | Junio C Hamano | 06 November 2006, 08:28:52 UTC | Document git-pack-refs and link it to git(7). Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 16:43:34 UTC |
| 9faed78 | Alex Riesen | 06 November 2006, 10:38:52 UTC | merge-recursive implicitely depends on trust_executable_bit Read the configuration in to get core.filemode value for this particular repository. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 16:42:02 UTC |
| fe732ed | Junio C Hamano | 04 November 2006, 20:24:05 UTC | adjust_shared_perm: chmod() only when needed. When widening permission for files and directories in a 'shared' repository for a user with inappropriate umask() setting for shared work, make sure we call chmod() only when we actually need to. The primary idea owes credit to Johannes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 02:36:36 UTC |
| 49b8b29 | Jeff King | 05 November 2006, 22:22:15 UTC | Fix git-runstatus for repositories containing a file named HEAD The wt_status_print_updated() and wt_status_print_untracked() routines call setup_revisions() with 'HEAD' being the reference to the tip of the current branch. However, setup_revisions() gets confused if the branch also contains a file named 'HEAD' resulting in a fatal error. Instead, don't pass an argv to setup_revisions() at all; simply give it no arguments, and make 'HEAD' the default revision. Bug noticed by Rocco Rutte <pdmef@gmx.net>. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 November 2006, 02:35:08 UTC |
| a79c655 | Shawn O. Pearce | 05 November 2006, 11:25:25 UTC | Remove more sed invocations from within bash completion. This change removes between 1 and 4 sed invocations per completion entered by the user. In the case of cat-file the 4 invocations per completion can take a while on Cygwin; running these replacements directly within bash saves some time for the end user. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:38 UTC |
| e5d5b21 | Shawn O. Pearce | 05 November 2006, 11:24:56 UTC | Support bash completion on symmetric difference operator. Now that log, whatchanged, rev-list, etc. support the symmetric difference operator '...' we should provide bash completion for it just like we do for '..'. While we are at it we can remove two sed invocations during the interactive prompt and replace them with internal bash operations. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:36 UTC |
| 873537f | Shawn O. Pearce | 05 November 2006, 11:21:57 UTC | Take --git-dir into consideration during bash completion. If the user has setup a command line of "git --git-dir=baz" then anything we complete must be performed within the scope of "baz" and not the current working directory. This is useful with commands such as "git --git-dir=git.git log m" to complete out "master" and view the log for the master branch of the git.git repository. As a nice side effect this also works for aliases within the target repository, just as git would honor them. Unfortunately because we still examine arguments by absolute position in most of the more complex commands (e.g. git push) using --git-dir with those commands will probably still cause completion to fail. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:33 UTC |
| 56fc25f | Shawn O. Pearce | 05 November 2006, 11:21:03 UTC | Bash completion support for remotes in .git/config. Now that Git natively supports remote specifications within the config file such as: [remote "origin"] url = ... we should provide bash completion support "out of the box" for these remotes, just like we do for the .git/remotes directory. Also cleaned up the __git_aliases expansion to use the same form of querying and filtering repo-config as this saves two fork/execs in the middle of a user prompted completion. Finally also forced the variable 'word' to be local within __git_aliased_command. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:32 UTC |
| 76c3eb5 | Shawn O. Pearce | 05 November 2006, 11:20:25 UTC | Only load .exe suffix'd completions on Cygwin. The only platform which actually needs to define .exe suffixes as part of its completion set is Cygwin. So don't define them on any other platform. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:30 UTC |
| 144d33d | Shawn O. Pearce | 05 November 2006, 11:20:02 UTC | Added missing completions for show-branch and merge-base. The show-branch and merge-base commands were partially supported when it came to bash completions as they were only specified in one form another. Now we specify them in both forms. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 21:36:29 UTC |
| c2e525d | Junio C Hamano | 05 November 2006, 19:51:41 UTC | git-pickaxe: optimize by avoiding repeated read_sha1_file(). It turns out that pickaxe reads the same blob repeatedly while blame can reuse the blob already read for the parent when handling a child commit when it's parent's turn to pass its blame to the grandparent. Have a cache in the origin structure to keep the blob there, which will be garbage collected when the origin loses the last reference to it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 19:51:41 UTC |
| 2bc4547 | Junio C Hamano | 05 November 2006, 19:47:53 UTC | git-blame: add internal statistics to count read blobs. | 05 November 2006, 19:49:56 UTC |
| c74390e | Junio C Hamano | 05 November 2006, 19:26:21 UTC | cherry is built-in, do not ship git-cherry.sh Noticed by Rene; Makefile now has another maintainer's check target to catch this kind of mistakes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 19:26:21 UTC |
| 82cc8d8 | Junio C Hamano | 05 November 2006, 07:52:32 UTC | Merge branch 'maint' * maint: Remove unsupported C99 style struct initializers in git-archive. Remove SIMPLE_PROGRAMS and make git-daemon a normal program. Use ULONG_MAX rather than implicit cast of -1. | 05 November 2006, 07:52:32 UTC |
| 6c2f207 | Shawn O. Pearce | 05 November 2006, 05:37:23 UTC | Remove unsupported C99 style struct initializers in git-archive. At least one older version of the Solaris C compiler doesn't support the newer C99 style struct initializers. To allow Git to compile on those systems use an archive description struct which is easier to initialize without the C99 struct initializer syntax. Also since the archives array is not used by anyone other than archive.c we can make it static. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:48:36 UTC |
| af8ffbe | Shawn O. Pearce | 05 November 2006, 07:28:25 UTC | Remove SIMPLE_PROGRAMS and make git-daemon a normal program. Some platforms (Solaris in particular) appear to require -lz as part of the link line for git-daemon, due to it linking against sha1_file.o and that module requiring inflate/deflate support. So its time to retire SIMPLE_PROGRAMS and move its last remaining member into the standard PROGRAMS list, allowing it to link against all libraries used by the rest of Git. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:41:05 UTC |
| bf8675d | Shawn O. Pearce | 05 November 2006, 07:27:07 UTC | Use ULONG_MAX rather than implicit cast of -1. At least one (older) version of the Solaris C compiler won't allow 'unsigned long x = -1' without explicitly casting -1 to a type of unsigned long. So instead use ULONG_MAX, which is really the correct constant anyway. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:41:02 UTC |
| b2e2ddf | Eric Wong | 05 November 2006, 05:51:11 UTC | git-svn: don't die on rebuild when --upgrade is specified --copy-remote and --upgrade are rarely (never?) used together, so if --copy-remote is specified, that means the user really wanted to copy the remote ref, and we should fail if that fails. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 November 2006, 07:33:21 UTC |
