| 29209cb | Jeff King | 11 March 2010, 07:15:43 UTC | dir: fix COLLECT_IGNORED on excluded prefixes As we walk the directory tree, if we see an ignored path, we want to add it to the ignored list only if it matches any pathspec that we were given. We used to check for the pathspec to appear explicitly. E.g., if we see "subdir/file" and it is excluded, we check to see if we have "subdir/file" in our pathspec. However, this interacts badly with the optimization to avoid recursing into ignored subdirectories. If "subdir" as a whole is ignored, then we never recurse, and consider only whether "subdir" itself is in our pathspec. It would not match a pathspec of "subdir/file" explicitly, even though it is the reason that subdir/file would be excluded. This manifests itself to the user as "git add subdir/file" failing to correctly note that the pathspec was ignored. This patch extends the in_pathspec logic to include prefix directory case. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2010, 07:23:08 UTC |
| 0d7c243 | Junio C Hamano | 01 March 2010, 07:31:21 UTC | t0050: mark non-working test as such The test is to prepare an empty file "camelcase" in the index, remove and replace it with another file "CamelCase" with "1" as its contents in the working tree, and add it to the index, in a repository configured to be case insensitive. However, the test actually checked ls-files knows about a pathname that matches "camelcase" case insensitively. It didn't check if the added contents actually was the updated one. Mark the test as non-working. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2010, 07:22:50 UTC |
| 48ffef9 | Junio C Hamano | 09 January 2010, 07:05:41 UTC | ls-files: fix overeager pathspec optimization Given pathspecs that share a common prefix, ls-files optimized its call into recursive directory reader by starting at the common prefix directory. If you have a directory "t" with an untracked file "t/junk" in it, but the top-level .gitignore file told us to ignore "t/", this resulted in: $ git ls-files -o --exclude-standard $ git ls-files -o --exclude-standard t/ t/junk $ git ls-files -o --exclude-standard t/junk t/junk $ cd t && git ls-files -o --exclude-standard junk We could argue that you are overriding the ignore file by giving a patchspec that matches or being in that directory, but it is somewhat unexpected. Worse yet, these behave differently: $ git ls-files -o --exclude-standard t/ . $ git ls-files -o --exclude-standard t/ t/junk This patch changes the optimization so that it notices when the common prefix directory that it starts reading from is an ignored one. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2010, 07:14:50 UTC |
| 16e2cfa | Junio C Hamano | 09 January 2010, 04:56:16 UTC | read_directory(): further split treat_path() The next caller I'll be adding won't have an access to struct dirent because it won't be reading from a directory stream. Split the main part of the function further into a separate function to make it usable by a caller without passing a dirent as long as it knows what type is feeding the function. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2010, 07:13:47 UTC |
| 53cc535 | Junio C Hamano | 09 January 2010, 03:14:07 UTC | read_directory_recursive(): refactor handling of a single path into a separate function Primarily because I want to reuse it in a separate function later, but this de-dents a huge function by one tabstop which by itself is an improvement as well. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2010, 07:13:47 UTC |
| 472e746 | Junio C Hamano | 09 January 2010, 07:07:17 UTC | t3001: test ls-files -o ignored/dir When you have "t" directory that is marked as ignored in the top-level .gitignore file (or $GIT_DIR/info/exclude), running $ git ls-files -o --exclude-standard from the top-level correctly excludes files in "t" directory, but any of the following: $ git ls-files -o --exclude-standard t/ $ cd t && git ls-files -o --exclude-standard would show untracked files in that directory. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2010, 07:11:40 UTC |
| d6f8fd0 | Junio C Hamano | 07 January 2010, 23:47:32 UTC | Describe second batch for 1.7.0 in draft release notes Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2010, 23:47:32 UTC |
| f012d27 | Junio C Hamano | 07 January 2010, 23:40:30 UTC | Merge branch 'js/filter-branch-prime' * js/filter-branch-prime: filter-branch: remove an unnecessary use of 'git read-tree' | 07 January 2010, 23:40:30 UTC |
| 3259ada | Junio C Hamano | 07 January 2010, 23:40:21 UTC | Merge branch 'sb/maint-octopus' * sb/maint-octopus: octopus: remove dead code octopus: reenable fast-forward merges octopus: make merge process simpler to follow Conflicts: git-merge-octopus.sh | 07 January 2010, 23:40:21 UTC |
| 0ad6f1a | Junio C Hamano | 07 January 2010, 23:38:50 UTC | Merge branch 'mg/tag-d-show' * mg/tag-d-show: tag -d: print sha1 of deleted tag | 07 January 2010, 23:38:50 UTC |
| aec7de4 | Junio C Hamano | 07 January 2010, 23:38:11 UTC | Merge branch 'so/cvsserver-update' * so/cvsserver-update: cvsserver: make the output of 'update' more compatible with cvs. | 07 January 2010, 23:38:11 UTC |
| 693f2b1 | Junio C Hamano | 07 January 2010, 23:37:57 UTC | Merge branch 'bg/maint-add-all-doc' * bg/maint-add-all-doc: git-rm doc: Describe how to sync index & work tree git-add/rm doc: Consistently back-quote Documentation: 'git add -A' can remove files | 07 January 2010, 23:37:57 UTC |
| 47b7012 | Björn Gustavsson | 07 December 2009, 18:35:42 UTC | git-rm doc: Describe how to sync index & work tree Newcomers to git that want to remove from the index only the files that have disappeared from the working tree will probably look for a way to do that in the documentation for 'git rm'. Therefore, describe how that can be done (even though it involves other commands than 'git rm'). Based on a suggestion by Junio, but re-arranged and rewritten to better fit into the style of command reference. While at it, change a single occurrence of "work tree" to "working tree" for consistency. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 January 2010, 23:37:33 UTC |
| 762c710 | Junio C Hamano | 07 January 2010, 23:35:55 UTC | Merge branch 'mv/commit-date' * mv/commit-date: Document date formats accepted by parse_date() builtin-commit: add --date option | 07 January 2010, 23:35:55 UTC |
| 79f6ce5 | Junio C Hamano | 07 January 2010, 23:35:52 UTC | Merge branch 'mo/bin-wrappers' * mo/bin-wrappers: INSTALL: document a simpler way to run uninstalled builds run test suite without dashed git-commands in PATH build dashless "bin-wrappers" directory similar to installed bindir | 07 January 2010, 23:35:52 UTC |
| 2df3299 | Junio C Hamano | 06 January 2010, 20:22:25 UTC | .gitattributes: detect 8-space indent in shell scripts Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2010, 20:22:25 UTC |
| 4ecbc65 | Jonathan Nieder | 06 January 2010, 06:37:59 UTC | Makefile: make ppc/sha1ppc.o depend on GIT-CFLAGS The %.o: %.S pattern rule should depend on GIT-CFLAGS to avoid trouble when ALL_CFLAGS changes. The pattern only applies to one file (ppc/sha1ppc.S) and that file does not use any #ifdefs, so leaving the dependency out is probably harmless. Nevertheless, it is safer to include the dependency in case future code's behavior does depend on the build flags. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2010, 06:40:58 UTC |
| bd757c1 | Thiago Farina | 03 January 2010, 16:20:30 UTC | Use warning function instead of fprintf(stderr, "Warning: ..."). Signed-off-by: Thiago Farina <tfransosi@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2010, 00:17:03 UTC |
| b7fcb58 | Junio C Hamano | 03 January 2010, 07:04:11 UTC | Merge branch 'maint' * maint: stash: mention --patch in usage string. | 03 January 2010, 07:04:11 UTC |
| dc89689 | Matthieu Moy | 02 January 2010, 16:35:32 UTC | stash: mention --patch in usage string. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2010, 18:40:55 UTC |
| 37bae10 | Junio C Hamano | 31 December 2009, 23:00:38 UTC | Merge branch 'maint' * maint: branch: die explicitly why when calling "git branch [-a|-r] branchname". fast-import: Document author/committer/tagger name is optional SubmittingPatches: hints to know the status of a submitted patch. | 31 December 2009, 23:00:38 UTC |
| 9bfff3a | Junio C Hamano | 31 December 2009, 23:00:14 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: branch: die explicitly why when calling "git branch [-a|-r] branchname". | 31 December 2009, 23:00:14 UTC |
| 6e8f993 | Matthieu Moy | 30 December 2009, 14:45:31 UTC | branch: die explicitly why when calling "git branch [-a|-r] branchname". The -a and -r options used to be silently ignored in such a command. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 22:52:05 UTC |
| 74fbd11 | Shawn O. Pearce | 30 December 2009, 15:03:48 UTC | fast-import: Document author/committer/tagger name is optional The fast-import parser does not validate that the author, committer or tagger name component contains both a name and an email address. Therefore the name component has always been optional. Correct the documentation to match the implementation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 22:46:08 UTC |
| 63cb821 | Matthieu Moy | 30 December 2009, 14:51:22 UTC | SubmittingPatches: hints to know the status of a submitted patch. "What happened to my patch" is pretty much a FAQ on the Git mailing list, it deserves a few paragraphs in SubmittingPatches... Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 22:46:08 UTC |
| 8e4c4e7 | Sergei Organov | 07 December 2009, 11:11:44 UTC | cvsserver: make the output of 'update' more compatible with cvs. Native cvs update outputs the string "cvs update: Updating <DIR>" for every directory it processes (to stderr) unless -q or -Q is given on comman-line. This is used, e.g., by emacs pcl-cvs to split files by directory. This commit implements this feature in cvsserver. Signed-off-by: Sergei Organov <osv@javad.com> Acked-by: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 20:15:01 UTC |
| 4cc4738 | Shawn O. Pearce | 31 December 2009, 03:04:38 UTC | bash completion: add space between branch name and status flags Improve the readability of the bash prompt by adding a space between the branch name and the status flags (dirty, stash, untracked). While we are cleaning up this section of code, the two cases for formatting the prompt are identical except for the format string, so make them the same. Suggested-by: Roman Fietze <roman.fietze@telemotive.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 December 2009, 07:29:12 UTC |
| c18d5d8 | Robert Zeh | 30 December 2009, 00:58:48 UTC | Add completion for git-svn mkdirs,reset,and gc Signed-off-by: Robert Zeh <robert.a.zeh@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 09:25:27 UTC |
| 9e7ad09 | Junio C Hamano | 30 December 2009, 09:25:21 UTC | Merge branch 'maint' * maint: textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Documentation: always respect core.worktree if set | 30 December 2009, 09:25:21 UTC |
| b0b3a24 | Junio C Hamano | 30 December 2009, 09:24:12 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: builtin-commit.c diff.c | 30 December 2009, 09:24:12 UTC |
| 70d7099 | Jeff King | 30 December 2009, 09:02:53 UTC | textconv: stop leaking file descriptors We read the output from textconv helpers over a pipe, but we never actually closed our end of the pipe after using it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 09:22:27 UTC |
| 799fdb4 | Junio C Hamano | 30 December 2009, 04:16:34 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: commit: --cleanup is a message option t7102: make the test fail if one of its check fails | 30 December 2009, 04:16:34 UTC |
| e97ca7f | Greg Price | 29 December 2009, 21:54:49 UTC | commit: --cleanup is a message option In the usage message for "git commit", the --cleanup option appeared at the end, as one of the "contents options": usage: git commit [options] [--] <filepattern>... ... Commit message options ... Commit contents options ... --allow-empty ok to record an empty change --cleanup <default> how to strip spaces and #comments from message This is confusing, in part because it makes it ambiguous whether --allow-empty, just above, refers to an empty diff or an empty message. Move --cleanup into the 'message options' group. Also add a pair of comments to prevent similar oversights in the future. Signed-off-by: Greg Price <price@ksplice.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 04:15:41 UTC |
| c985ddf | Andreas Schwab | 29 December 2009, 19:09:15 UTC | git count-objects: handle packs bigger than 4G Use off_t to count sizes of packs and objects to avoid overflow after 4Gb. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 03:51:37 UTC |
| 153bb83 | Nguyễn Thái Ngọc Duy | 29 December 2009, 08:13:18 UTC | t7102: make the test fail if one of its check fails Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2009, 03:39:27 UTC |
| f5e025a | Nguyễn Thái Ngọc Duy | 29 December 2009, 07:48:41 UTC | Documentation: always respect core.worktree if set The value of core.worktree in a ".git/config" is honored even when it differs from the directory that has the ".git" directory as its subdirectory. This is likely to be a misconfiguration, so warn users about it. Also, drop the part of the documentation that incorrectly claimed that we ignore such a misconfigured value. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2009, 15:57:54 UTC |
| c2ff10c | Junio C Hamano | 28 December 2009, 07:01:32 UTC | Merge branch 'jk/1.7.0-status' * jk/1.7.0-status: status/commit: do not suggest "reset HEAD <path>" while merging commit/status: "git add <path>" is not necessarily how to resolve commit/status: check $GIT_DIR/MERGE_HEAD only once t7508-status: test all modes with color t7508-status: status --porcelain ignores relative paths setting status: reduce duplicated setup code status: disable color for porcelain format status -s: obey color.status builtin-commit: refactor short-status code into wt-status.c t7508-status.sh: Add tests for status -s status -s: respect the status.relativePaths option docs: note that status configuration affects only long format commit: support alternate status formats status: add --porcelain output format status: refactor format option parsing status: refactor short-mode printing to its own function status: typo fix in usage git status: not "commit --dry-run" anymore git stat -s: short status output git stat: the beginning of "status that is not a dry-run of commit" Conflicts: t/t4034-diff-words.sh wt-status.c | 28 December 2009, 07:01:32 UTC |
| 67834b9 | Junio C Hamano | 28 December 2009, 06:59:55 UTC | Merge branch 'maint' * maint: read_index(): fix reading extension size on BE 64-bit archs | 28 December 2009, 06:59:55 UTC |
| 0622f79 | Junio C Hamano | 27 December 2009, 18:42:00 UTC | Merge branch 'nf/maint-fix-index-ext-len-on-be64' into maint * nf/maint-fix-index-ext-len-on-be64: read_index(): fix reading extension size on BE 64-bit archs | 27 December 2009, 18:42:00 UTC |
| 07cc8ec | Nathaniel W Filardo | 27 December 2009, 06:11:21 UTC | read_index(): fix reading extension size on BE 64-bit archs On big endian platforms with 8-byte unsigned long, the code reads the size of the index extension section (which is a 4-byte network byte order integer) incorrectly. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2009, 18:41:48 UTC |
| 1d85dd6 | Junio C Hamano | 26 December 2009, 22:33:05 UTC | Merge branch 'maint' * maint: Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV Start 1.6.6.X maintenance track Add git-http-backend to command-list. t4019 "grep" portability fix t1200: work around a bug in some implementations of "find" Conflicts: RelNotes | 26 December 2009, 22:33:05 UTC |
| 21a0d9b | Junio C Hamano | 26 December 2009, 22:32:36 UTC | Makefile: FreeBSD (both 7 and 8) needs OLD_ICONV Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2009, 22:32:36 UTC |
| 685c568 | Junio C Hamano | 26 December 2009, 22:20:09 UTC | Start 1.6.6.X maintenance track Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2009, 22:20:09 UTC |
| d828fdb | Junio C Hamano | 26 December 2009, 22:15:55 UTC | Merge branch 'jc/maint-obsd46' into maint * jc/maint-obsd46: t4019 "grep" portability fix t1200: work around a bug in some implementations of "find" | 26 December 2009, 22:15:55 UTC |
| 5717b47 | Tarmigan Casebolt | 26 December 2009, 17:01:07 UTC | Add git-http-backend to command-list. Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2009, 22:12:34 UTC |
| 68b890a | Junio C Hamano | 26 December 2009, 22:11:46 UTC | Kick off 1.7.0 cycle Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2009, 22:11:46 UTC |
| 648f407 | Junio C Hamano | 26 December 2009, 22:03:18 UTC | Merge branch 'gb/1.7.0-diff-whitespace-only-output' * gb/1.7.0-diff-whitespace-only-output: No diff -b/-w output for all-whitespace changes | 26 December 2009, 22:03:18 UTC |
| 3cc3fb7 | Junio C Hamano | 26 December 2009, 22:03:18 UTC | Merge branch 'jc/1.7.0-diff-whitespace-only-status' * jc/1.7.0-diff-whitespace-only-status: diff.c: fix typoes in comments Make test case number unique diff: Rename QUIET internal option to QUICK diff: change semantics of "ignore whitespace" options Conflicts: diff.h | 26 December 2009, 22:03:18 UTC |
| 7ad9cec | Junio C Hamano | 26 December 2009, 22:03:17 UTC | Merge branch 'jc/1.7.0-push-safety' * jc/1.7.0-push-safety: Refuse deleting the current branch via push Refuse updating the current branch in a non-bare repository via push | 26 December 2009, 22:03:17 UTC |
| a19f101 | Junio C Hamano | 26 December 2009, 22:03:17 UTC | Merge branch 'jc/1.7.0-send-email-no-thread-default' * jc/1.7.0-send-email-no-thread-default: send-email: make --no-chain-reply-to the default Conflicts: git-send-email.perl | 26 December 2009, 22:03:17 UTC |
| e74f43f | Junio C Hamano | 26 December 2009, 22:03:16 UTC | Merge branch 'sr/vcs-helper' * sr/vcs-helper: tests: handle NO_PYTHON setting builtin-push: don't access freed transport->url Add Python support library for remote helpers Basic build infrastructure for Python scripts Allow helpers to report in "list" command that the ref is unchanged Fix various memory leaks in transport-helper.c Allow helper to map private ref names into normal names Add support for "import" helper command Allow specifying the remote helper in the url Add a config option for remotes to specify a foreign vcs Allow fetch to modify refs Use a function to determine whether a remote is valid Allow programs to not depend on remotes having urls Fix memory leak in helper method for disconnect Conflicts: Documentation/git-remote-helpers.txt Makefile builtin-ls-remote.c builtin-push.c transport-helper.c | 26 December 2009, 22:03:16 UTC |
| eca4460 | Junio C Hamano | 26 December 2009, 21:53:17 UTC | t4019 "grep" portability fix Input to "grep" is supposed to be "text", but we deliberately feed output from "git diff --color" to sift it into two sets of lines (ones with errors, the other without). Some implementations of "grep" only report matches with the exit status, without showing the matched lines in their output (e.g. OpenBSD 4.6, which says "Binary file .. matches"). Fortunately, "grep -a" is often a way to force the command to treat its input as text. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2009, 21:59:34 UTC |
| 15caa41 | Junio C Hamano | 26 December 2009, 21:53:45 UTC | t1200: work around a bug in some implementations of "find" "find path ..." command should exit with zero status only when all path operands were traversed successfully. When a non-existent path is given, however, some implementations of "find" (e.g. OpenBSD 4.6) exit with zero status and break the last test in t1200. Rewrite the test to check that there is no regular files in the objects fan-out directories to work around this bug; it is closer to what we are testing anyway. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2009, 21:59:31 UTC |
| 902f235 | Junio C Hamano | 23 December 2009, 19:58:52 UTC | Git 1.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2009, 20:23:11 UTC |
| b7f44fd | Robert Zeh | 23 December 2009, 17:54:11 UTC | git svn: add test for a git svn gc followed by a git svn mkdirs git svn gc will compress the unhandled.log files that git svn mkdirs reads, causing git svn mkdirs to skip directory creation. [ew: trivial whitespace cleanups] Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Robert Zeh <robert.a.zeh@gmail.com> | 23 December 2009, 19:58:05 UTC |
| 150d38c | Eric Wong | 23 December 2009, 06:40:18 UTC | git svn: branch/tag commands detect username in URLs svn+ssh:// repositories often have userinfo embedded in the URL which were stripped out of the "git-svn-id:" trailers. Since the SVN::Client::copy function takes userinfo into account when matching URLs for SVN repositories, we need to retrieve the full URL with embedded userinfo in it to avoid mismatched URLs. Tested-by: Florian Köberle <florian@fkoeberle.de> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 23 December 2009, 19:58:05 UTC |
| 129a5a6 | Junio C Hamano | 22 December 2009, 20:32:39 UTC | Merge branch 'maint' * maint: Prevent git blame from segfaulting on a missing author name | 22 December 2009, 20:32:39 UTC |
| 0fe1975 | Eric Wong | 22 December 2009, 20:15:40 UTC | git svn: lookup new parents correctly from svn:mergeinfo This appears to be a trivial case where array indices were being passed to git rev-list, instead of the contents stored in the array itself. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 22 December 2009, 20:15:40 UTC |
| c8cba79 | David Reiss | 22 December 2009, 18:51:41 UTC | Prevent git blame from segfaulting on a missing author name The human-readable author and committer name can be missing from commits imported from foreign SCM interfaces. Make sure we parse the "author" and "committer" line a bit more leniently and avoid segfaulting by assuming the name always exists. Signed-off-by: David Reiss <dreiss@facebook.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2009, 19:51:17 UTC |
| 063681d | Andrew Myrick | 21 December 2009, 22:22:54 UTC | git-svn: Remove obsolete MAXPARENT check Change git-svn not to impose a limit of 16 parents on a merge. This limit in git-svn artificially prevents cloning svn repositories that contain commits with more than 16 merge parents. The limit was removed from builtin-commit-tree.c for git v1.6.0 in commit ef98c5cafb3e799b1568bb843fcd45920dc62f16, so there is no need to check for it it in git-svn. Signed-off-by: Andrew Myrick <amyrick@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 21 December 2009, 22:33:50 UTC |
| 7a955a5 | Sam Vilain | 19 December 2009, 16:26:26 UTC | git-svn: detect cherry-picks correctly. The old function was incorrect; in some instances it marks a cherry picked range as a merged branch (because of an incorrect assumption that 'rev-list COMMIT --not RANGE' would work). This is replaced with a function which should detect them correctly, memoized to limit the expense of dealing with branches with many cherry picks to one 'merge-base' call per merge, per branch which used cherry picking. Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> | 21 December 2009, 10:32:53 UTC |
| ea020cb | Sam Vilain | 19 December 2009, 16:25:31 UTC | git-svn: exclude already merged tips using one rev-list call The old function would have to check all mentioned merge tips, every time that the mergeinfo ticket changed. This involved 1-2 rev-list operation for each listed mergeinfo line. If there are a lot of feature branches being merged into a trunk, this makes for a very expensive operation for detecting the new parents on every merge. This new version first uses a single 'rev-list' to figure out which commit ranges are already reachable from the parents. This is used to eliminate the already merged branches from the list. Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> | 21 December 2009, 10:32:52 UTC |
| 33973a5 | Sam Vilain | 19 December 2009, 16:22:42 UTC | git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges SVN's list of commit ranges in mergeinfo tickets is inclusive, whereas git commit ranges are exclusive on the left hand side. Also, the end points of the commit ranges may not exist; they simply delineate ranges of commits which may or may not exist. Fix these two mistakes. Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> | 21 December 2009, 10:32:50 UTC |
| 7d944c3 | Sam Vilain | 19 December 2009, 11:55:13 UTC | git-svn: memoize conversion of SVN merge ticket info to git commit ranges Each time the svn mergeinfo ticket changes, we look it up in the rev_map; when there are a lot of merged branches, this will result in many repeated lookups of the same information for subsequent commits. Arrange the slow part of the function so that it may be memoized, and memoize it. The more expensive revision walking operation can be memoized separately. [ew: changed "next" to "return" for function exit] Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> | 21 December 2009, 10:32:48 UTC |
| 1d144aa | Sam Vilain | 19 December 2009, 16:20:30 UTC | git-svn: expand the svn mergeinfo test suite, highlighting some failures As shown, git-svn has some problems; not all svn merges are correctly detected, and cherry picks may incorrectly be detected as real merges. These test cases will be marked as _success once the relevant fixes are in. Signed-off-by: Sam Vilain <sam@vilain.net> Acked-by: Eric Wong <normalperson@yhbt.net> | 21 December 2009, 10:32:46 UTC |
| af57b41 | Eric Wong | 21 December 2009, 10:21:33 UTC | update release notes for git svn in 1.6.6 Signed-off-by: Eric Wong <normalperson@yhbt.net> | 21 December 2009, 10:32:41 UTC |
| 577e9fc | Eric Wong | 21 December 2009, 10:06:04 UTC | git svn: fix --revision when fetching deleted paths When using the -r/--revision argument to fetch deleted history, calling SVN::Ra::get_log() from an SVN::Ra object initialized to track the deleted URL will fail. This regression was introduced in: commit 4aacaeb3dc82bb6479e70e120053dc27a399460e "fix shallow clone when upstream revision is too new" We now ignore errors from SVN::Ra::get_log() here because using --revision will always override the value of $head here if (and only if) we're tracking deleted directories. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 21 December 2009, 10:32:39 UTC |
| ab0964d | Junio C Hamano | 20 December 2009, 20:15:02 UTC | Git 1.6.6-rc4 Hopefully the last rc before the final one. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2009, 20:15:02 UTC |
| b6b9f83 | Junio C Hamano | 20 December 2009, 07:20:16 UTC | Merge branch 'maint' * maint: rebase -i: abort cleanly if the editor fails to launch technical-docs: document hash API api-strbuf.txt: fix typos and document launch_editor() | 20 December 2009, 07:20:16 UTC |
| e49ca97 | Björn Gustavsson | 19 December 2009, 12:04:03 UTC | rebase -i: abort cleanly if the editor fails to launch If the user's configured editor is emacsclient, the editor will fail to launch if emacs is not running and the git command that tried to lanuch the editor will abort. For most commands, all you have to do is to start emacs and repeat the command. The "git rebase -i" command, however, aborts without cleaning the "$GIT_DIR/rebase-merge" directory if it fails to launch the editor, so you'll need to do "git rebase --abort" before repeating the rebase command. Change "git rebase -i" to terminate using "die_abort" (instead of with "die") if the initial launch of the editor fails. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2009, 07:20:05 UTC |
| 8eca03c | Eric Wong | 20 December 2009, 07:05:57 UTC | t9146: use 'svn_cmd' wrapper Using 'svn' directly may not work for all users. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 20 December 2009, 07:06:20 UTC |
| a5b80d9 | Eric Wong | 19 December 2009, 21:49:00 UTC | git svn: make empty directory creation gc-aware The "git svn gc" command creates and appends to unhandled.log.gz files which should be parsed before the uncompressed unhandled.log files. Reported-by: Robert Zeh Signed-off-by: Eric Wong <normalperson@yhbt.net> | 19 December 2009, 22:07:24 UTC |
| afab0fe | Stephen Boyd | 18 December 2009, 00:05:29 UTC | technical-docs: document hash API Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2009, 05:54:50 UTC |
| 63b7694 | Stephen Boyd | 18 December 2009, 00:05:28 UTC | api-strbuf.txt: fix typos and document launch_editor() Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2009, 05:54:28 UTC |
| 94058a9 | Junio C Hamano | 16 December 2009, 20:50:33 UTC | Git 1.6.6-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 20:50:33 UTC |
| a1bb8f4 | Junio C Hamano | 16 December 2009, 19:09:31 UTC | Merge branch 'maint' to sync with 1.6.5.7 * maint: Git 1.6.5.7 worktree: don't segfault with an absolute pathspec without a work tree ignore unknown color configuration help.autocorrect: do not run a command if the command given is junk Illustrate "filter" attribute with an example | 16 December 2009, 20:47:15 UTC |
| 527b9d7 | Junio C Hamano | 16 December 2009, 18:23:54 UTC | Git 1.6.5.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 20:45:25 UTC |
| b3100fd | Junio C Hamano | 16 December 2009, 18:50:09 UTC | worktree: don't segfault with an absolute pathspec without a work tree If a command is run with an absolute path as a pathspec inside a bare repository, e.g. "rev-list HEAD -- /home", the code tried to run strlen() on NULL, which is the result of get_git_work_tree(), and segfaulted. It should just fail instead. Currently the function returns NULL even inside .git/ in a repository with a work tree, but that is a separate issue. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 20:45:25 UTC |
| 8b8e862 | Jeff King | 12 December 2009, 12:25:24 UTC | ignore unknown color configuration When parsing the config file, if there is a value that is syntactically correct but unused, we generally ignore it. This lets non-core porcelains store arbitrary information in the config file, and it means that configuration files can be shared between new and old versions of git (the old versions might simply ignore certain configuration). The one exception to this is color configuration; if we encounter a color.{diff,branch,status}.$slot variable, we die if it is not one of the recognized slots (presumably as a safety valve for user misconfiguration). This behavior has existed since 801235c (diff --color: use $GIT_DIR/config, 2006-06-24), but hasn't yet caused a problem. No porcelain has wanted to store extra colors, and we once a color area (like color.diff) has been introduced, we've never changed the set of color slots. However, that changed recently with the addition of color.diff.func. Now a user with color.diff.func in their config can no longer freely switch between v1.6.6 and older versions; the old versions will complain about the existence of the variable. This patch loosens the check to match the rest of git-config; unknown color slots are simply ignored. This doesn't fix this particular problem, as the older version (without this patch) is the problem, but it at least prevents it from happening again in the future. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 20:45:16 UTC |
| 06500a0 | Johannes Sixt | 15 December 2009, 07:57:18 UTC | help.autocorrect: do not run a command if the command given is junk If a given command is not found, then help.c tries to guess which one the user could have meant. If help.autocorrect is 0 or unset, then a list of suggestions is given as long as the dissimilarity between the given command and the candidates is not excessively high. But if help.autocorrect was non-zero (i.e., a delay after which the command is run automatically), the latter restriction on dissimilarity was not obeyed. In my case, this happened: $ git ..daab02 WARNING: You called a Git command named '..daab02', which does not exist. Continuing under the assumption that you meant 'read-tree' in 4.0 seconds automatically... The patch reuses the similarity limit that is also applied when the list of suggested commands is printed. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 00:21:51 UTC |
| 7ee6376 | Johannes Sixt | 15 December 2009, 08:42:06 UTC | filter-branch: remove an unnecessary use of 'git read-tree' The intent of this particular call to 'git read-tree' was to fill an index. But in fact, it only allocated an empty index. Later in the program, the index is filled anyway by calling read-tree with specific commits, and considering that elsewhere the index is even removed (i.e., it is not relied upon that the index file exists), this first call of read-tree is completely redundant. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2009, 00:20:23 UTC |
| d79f5d1 | Nanako Shiraishi | 15 December 2009, 03:11:10 UTC | Illustrate "filter" attribute with an example The example was taken from aa4ed402c9721170fde2e9e43c3825562070e65e (Add 'filter' attribute and external filter driver definition). Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2009, 06:04:30 UTC |
| f08aa01 | Stephen Boyd | 12 December 2009, 00:38:59 UTC | octopus: remove dead code MSG, PARENT, and CNT are never used, just assigned to. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2009, 07:40:24 UTC |
| 85bf49f | Stephen Boyd | 12 December 2009, 00:38:58 UTC | octopus: reenable fast-forward merges The fast-forward logic is never being triggered because $common and $MRC are never equivalent. $common is initialized to a commit id by merge-base and MRC is initialized to HEAD. Fix this by initializing $MRC to the commit id for HEAD so that its possible for $MRC and $common to be equal. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2009, 07:40:24 UTC |
| 8133450 | Stephen Boyd | 12 December 2009, 00:38:57 UTC | octopus: make merge process simpler to follow Its not very easy to understand what heads are being merged given the current output of an octopus merge. Fix this by replacing the sha1 with the (usually) better description in GITHEAD_<SHA1>. Suggested-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2009, 07:17:46 UTC |
| e25e2b4 | Björn Gustavsson | 12 December 2009, 10:21:46 UTC | bash: Support new 'git fetch' options Support the new options --all, --prune, and --dry-run for 'git fetch'. As the --multiple option was primarily introduced to enable 'git remote update' to be re-implemented in terms of 'git fetch' (16679e37) and is not likely to be used much from the command line, it does not seems worthwhile to complicate the code (to support completion of multiple remotes) to handle it. Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2009, 23:32:07 UTC |
| 3c58845 | Junio C Hamano | 12 December 2009, 07:53:41 UTC | status/commit: do not suggest "reset HEAD <path>" while merging Suggesting "'reset HEAD <path>' to unstage" is dead wrong if we are about to record a merge commit. For either an unmerged path (i.e. with unresolved conflicts), or an updated path, it would result in discarding what the other branch did. Note that we do not do anything special in a case where we are amending a merge. The user is making an evil merge starting from an already committed merge, and running "reset HEAD <path>" is the right way to get rid of the local edit that has been added to the index. Once "reset --unresolve <path>" becomes available, we might want to suggest it for a merged path that has unresolve information, but until then, just remove the incorrect advice. We might also want to suggest "checkout --conflict <path>" to revert the file in the work tree to the state of failed automerge for an unmerged path, but we never did that, and this commit does not change that. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2009, 09:22:10 UTC |
| dd20f8a | Junio C Hamano | 12 December 2009, 08:18:12 UTC | commit/status: "git add <path>" is not necessarily how to resolve When the desired resolution is to remove the path, "git rm <path>" is the command the user needs to use. Just like in "Changed but not updated" section, suggest to use "git add/rm" as appropriate. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2009, 09:21:38 UTC |
| 3098830 | Junio C Hamano | 12 December 2009, 07:45:24 UTC | commit/status: check $GIT_DIR/MERGE_HEAD only once The code checked for the MERGE_HEAD file to see if we were about to commit a merge twice in the codepath; also one of them used a variable merge_head_sha1[] which was set but was never used. Just check it once, but do so also in "git status", too, as we will be using this for status generation in the next patch. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2009, 08:47:02 UTC |
| 0a043b1 | Michael J Gruber | 10 December 2009, 14:01:10 UTC | tag -d: print sha1 of deleted tag Print the sha1 of the deleted tag (in addition to the tag name) so that one can easily recreate a mistakenly deleted tag: git tag -d tagname Deleted tag 'tagname' (was DEADBEEF) git tag 'tagname' DEADBEEF We output the previous ref also in the case of forcefully overwriting tags. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Suggested-by: Jari Aalto <jari.aalto@cante.net> Helped-by: Björn Steinbrink <B.Steinbrink@gmx.de> Helped-by: Jeff King <peff@peff.net> Helped-by: Zoltán Füzesi <zfuzesi@eaglet.hu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2009, 02:45:34 UTC |
| 4966688 | Junio C Hamano | 11 December 2009, 00:22:42 UTC | Update Release Notes for 1.6.6 to remove old bugfixes These three have already been backported to 1.6.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2009, 00:22:42 UTC |
| 4cb51a6 | Junio C Hamano | 11 December 2009, 00:20:59 UTC | Sync with 1.6.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2009, 00:20:59 UTC |
| 9861b64 | Junio C Hamano | 10 December 2009, 23:42:30 UTC | Git 1.6.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 23:42:30 UTC |
| 782a000 | Junio C Hamano | 10 December 2009, 23:27:51 UTC | Fix archive format with -- on the command line Giving --format from the command line, or using output file extention to DWIM the output format, with a pathspec that is disambiguated with an explicit double-dash on the command line, e.g. git archive -o file --format=zip HEAD -- path git archive -o file.zip HEAD -- path didn't work correctly. This was because the code reordered (when one was given) or added (when the format was inferred) a --format argument at the end, effectively making it to "archive HEAD -- path --format=zip", i.e. an extra pathspec that is unlikely to match anything. The command line argument list should always be "options, revs and then paths", and we should set a good example by inserting the --format at the beginning instead. Reported-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 23:29:05 UTC |
| 1456b04 | Junio C Hamano | 10 December 2009, 20:17:11 UTC | Remove post-upload-hook This hook runs after "git fetch" in the repository the objects are fetched from as the user who fetched, and has security implications. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 20:21:40 UTC |
| 80d9361 | Junio C Hamano | 10 December 2009, 00:21:36 UTC | Git 1.6.6-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 00:21:36 UTC |
| 529f8c6 | Junio C Hamano | 09 December 2009, 23:38:51 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: suppress RenderBadPicture X error caused by Tk bug git-gui: Increase blame viewer usability on MacOS. git-gui: search 4 directories to improve statistic of gc hint git gui: make current branch default in "remote delete branch" merge check | 09 December 2009, 23:38:51 UTC |
| 47344ee | Junio C Hamano | 09 December 2009, 23:38:42 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix selection of tags gitk: Default to the system colours on Windows gitk: Update Japanese translation gitk: Fix "git gui blame" invocation when called from top-level directory gitk: Disable checkout of remote branches gitk: Improve appearance of radiobuttons and checkbuttons gitk: Skip translation of "wrong Tcl version" message gitk: Add Japanese translation gitk: Use the --submodule option for displaying diffs when available gitk: Fix diffing committed -> staged (typo in diffcmd) gitk: Add configuration for UI colour scheme gitk: Don't compare fake children when comparing commits gitk: Show diff of commits at end of compare-commits output gitk: Add a user preference to enable/disable use of themed widgets gitk: Fix errors in the theme patch gitk: Use themed tk widgets gitk: Restore scrolling position of diff pane on back/forward in history | 09 December 2009, 23:38:42 UTC |
| 8eb65d9 | Junio C Hamano | 09 December 2009, 21:38:52 UTC | Update draft release notes to 1.6.6 before -rc2 Reword the 1.7.0 warnings, and drop deprecation of "merge <msg> HEAD <commit>..." syntax. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2009, 21:38:52 UTC |
| ff86bdd | Junio C Hamano | 09 December 2009, 06:47:09 UTC | Merge branch 'maint' * maint: add-interactive: fix deletion of non-empty files pull: clarify advice for the unconfigured error case | 09 December 2009, 06:47:09 UTC |
