| 6810053 | Junio C Hamano | 02 June 2008, 05:54:16 UTC | Merge branch 'lr/init-bare' * lr/init-bare: git-init: accept --bare option | 02 June 2008, 05:54:16 UTC |
| 32d8050 | Lea Wiemann | 01 June 2008, 20:34:47 UTC | Git.pm: fix return value of config method If config is called in array context, it is supposed to return all values set for the given option key. This works for all cases except if there is no value set at all. In that case, it wrongly returns (undef) instead of (). This fixes the return statement so that it returns undef in scalar context but an empty array in array context. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2008, 05:28:27 UTC |
| 850d3a7 | Lea Wiemann | 01 June 2008, 18:15:33 UTC | glossary: improve a few links They now point to more specific/appropriate targets. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2008, 05:26:37 UTC |
| 497c833 | Christian Couder | 29 May 2008, 17:21:46 UTC | Documentation: convert "glossary" and "core-tutorial" to man pages This patch renames the following documents and at the same time converts them to the man format: core-tutorial.txt -> gitcore-tutorial.txt glossary.txt -> gitglossary.txt But as the glossary is included in the user manual and as the new gitglossary man page cannot be included as a whole in the user manual, the actual glossary content is now in its own "glossary-content.txt" new file. And this file is included by both the user manual and the gitglossary man page. Other documents that reference the above ones are changed accordingly and sometimes improved a little too. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2008, 05:23:10 UTC |
| 58c8dd2 | Lea Wiemann | 01 June 2008, 20:26:25 UTC | Git.pm: fix documentation of hash_object The documentation of hash_object incorrectly states that it accepts a file handle -- in fact it doesn't, and there is even a TODO comment for this. This fixes the documentation. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2008, 05:21:05 UTC |
| f1979d6 | Adam Simpkins | 01 June 2008, 20:56:58 UTC | graph API: avoid printing unnecessary padding before some octopus merges When an octopus merge is printed, several lines are printed before it to move over existing branch lines to its right. This is needed to make room for the children of the octopus merge. For example: | | | | | | \ \ | | \ \ | | \ \ | M---. \ \ | |\ \ \ \ \ However, this step isn't necessary if there are no branch lines to the right of the octopus merge. Therefore, skip this step when it is not needed, to avoid printing extra lines that don't really serve any purpose. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2008, 04:44:47 UTC |
| 3395908 | Adam Simpkins | 01 June 2008, 20:56:57 UTC | graph API: improve display of merge commits This change improves the way merge commits are displayed, to eliminate a few visual artifacts. Previously, merge commits were displayed as: | M \ | |\ | As pointed out by Teemu Likonen, this didn't look nice if the rightmost branch line was displayed as '\' on the previous line, as it then appeared to have an extra space in it: | |\ | M \ | |\ | This change updates the code so that branch lines to the right of merge commits are printed slightly differently depending on how the previous line was displayed: | |\ | | | | | / | M \ | M | | M | | |\ \ | |\ \ | |\ \ Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2008, 21:50:52 UTC |
| b7166cc | Christian Engwer | 27 May 2008, 08:46:55 UTC | git-svn fails in prop_walk if $self->{path} is not empty If url://repo/trunk is the current Git branch, prop_walk strips trunk from the path name. That is useful as, for example "git svn show-ignore" should not return results like trunk/foo but foo if svn:ignore for trunk includes foo. The problem now is that prop_walk strips trunk from the path and then calls itself recursively. But now trunk is missing in the path and get_dir fails, because it is called for a non existing path. The attached patch fixed the problem, by adding the previously stipped $self->{path} in the recursive call. I tested it with my current git-svn repository for the commands show-ignore and show-external. Patch was submitted through http://bugs.debian.org/477393 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2008, 21:29:50 UTC |
| 7d45e14 | Seth Falcon | 20 May 2008, 03:29:17 UTC | Add a --dry-run option to git-svn rebase When working with multiple branches in an svn repository, it can be useful to verify the svn repository and local tracking branch that will be used for the rebase operation. Signed-off-by: Seth Falcon <seth@userprimary.net> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2008, 21:29:50 UTC |
| d72ab8c | Karl Hasselström | 17 May 2008, 15:07:09 UTC | Fix path duplication in git svn commit-diff Given an SVN repo file:///tmp/svntest/repo, trying to commit changes to a file proj/trunk/foo.txt in that repo with this command line git svn commit-diff -r2 HEAD^ HEAD file:///tmp/svntest/repo/proj/trunk gave the error message Filesystem has no item: File not found: transaction '2-6', path '/proj/trunk/proj/trunk/foo.txt' This fixes the duplication. Signed-off-by: Karl Hasselström <kha@treskal.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2008, 21:29:50 UTC |
| 7ad2458 | Shawn O. Pearce | 01 June 2008, 04:28:04 UTC | Make "git-remote rm" delete refs acccording to fetch specs A remote may be configured to fetch into tracking branches that don't match its name. A user may have created a remote by hand that will fetch to a different tracking branch namespace: [remote "alt"] url = git://repo.or.cz/alt-git.git fetch = refs/heads/*:refs/remotes/origin/* When deleting remote alt we should clean up the refs whose names start with "refs/remotes/origin/", even though the remote itself was named alt by the user. To avoid deleting refs used by another remote we only clear refs that are unique to this remote. This prevents `git prune rm alt` from removing the refs used by say origin if alt was just using a different URL for the same repository. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2008, 06:55:50 UTC |
| c175a7a | Shawn O. Pearce | 01 June 2008, 03:58:05 UTC | Make "git-remote prune" delete refs according to fetch specs A remote may be configured to fetch into tracking branches that do not match the remote name. For example a user may have created extra remotes that will fetch to the same tracking branch namespace, but from different URLs: [remote "origin"] url = git://git.kernel.org/pub/scm/git/git.git fetch = refs/heads/*:refs/remotes/origin/* [remote "alt"] url = git://repo.or.cz/alt-git.git fetch = refs/heads/*:refs/remotes/origin/* When running `git remote prune alt` we expect stale branches to be removed from "refs/remotes/origin/*" and not from the unused namespace of "refs/remotes/alt/*". Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2008, 06:55:15 UTC |
| 6a15bc0 | Shawn O. Pearce | 01 June 2008, 03:57:48 UTC | Remove unused remote_prefix member in builtin-remote Not sure when this became unused, but no code references it, other than to populate the strbuf with an initial value. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2008, 06:54:10 UTC |
| 1bd9c64 | Lea Wiemann | 31 May 2008, 21:11:21 UTC | t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons Without this, some tests will fail because they compare command output of subprocesses (such as git) with $PWD -- but subprocesses have the physical path as their working directory, whereas $PWD contains the symlinked path. This fixes it. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2008, 01:32:17 UTC |
| 5aa965a | Jamis Buck | 01 June 2008, 01:10:58 UTC | git-reset: honor -q and do not show progress message When running git-reset in a non-interactive setting, the -q switch works for everything except the progress updates. This squelches it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2008, 01:10:58 UTC |
| 8ec00d0 | Stephan Beyer | 31 May 2008, 22:11:43 UTC | Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh This patch moves the am test cases in t4150-am.sh and the am subdirectory test cases from t/t4150-am-subdir.sh into t/4151-am.sh. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 22:42:12 UTC |
| d3a7b8f | Stephan Beyer | 31 May 2008, 22:11:42 UTC | Add test cases for git-am Add t/t4151-am.sh that does basic testing of git-am functionality, including: * am applies patch correctly * am changes committer and keeps author * am --signoff adds Signed-off-by: line * am stays in branch * am --signoff does not add Signed-off-by: line if already there * am without --keep removes Re: and [PATCH] stuff * am --keep really keeps the subject * am -3 falls back to 3-way merge * am pauses on conflict * am --skip works * am --resolved works * am takes patches from a Pine mailbox * am fails on mail without patch * am fails on empty patch Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 22:42:12 UTC |
| 54352bb | Linus Torvalds | 30 May 2008, 15:54:46 UTC | Remove now unnecessary 'sync()' calls Since the pack-files are now always created stably on disk, there is no need to sync() before pruning lose objects or old stale pack-files. [jc: with Nico's clean-up] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 21:49:29 UTC |
| 4c81b03 | Linus Torvalds | 30 May 2008, 15:42:16 UTC | Make pack creation always fsync() the result This means that we can depend on packs always being stable on disk, simplifying a lot of the object serialization worries. And unlike loose objects, serializing pack creation IO isn't going to be a performance killer. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 21:46:57 UTC |
| 5812473 | John J. Franey | 29 May 2008, 17:32:31 UTC | Clarify description of <repository> argument to pull/fetch for naming remotes. Alter the description of <repository> in OPTIONS section to explicitly state that a 'remote name' is accepted. Rewrite REMOTES section to more directly identify the different kinds of remote-name permitted. Signed-off-by: John J. Franey <jjfraney@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 21:46:24 UTC |
| ad5fa3c | Paolo Bonzini | 29 May 2008, 14:55:53 UTC | rollback lock files on more signals than just SIGINT Other signals are also common, for example SIGTERM and SIGHUP. This patch modifies the lock file mechanism to catch more signals. It also modifies http-push.c which was missing SIGTERM. Signed-off-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 21:33:59 UTC |
| c16570c | Miklos Vajna | 31 May 2008, 00:18:08 UTC | Revision walking documentation: document most important functions Unfortunately the list is not complete, but includes the essential ones. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 21:32:56 UTC |
| 6ab69bf | Jakub Narebski | 31 May 2008, 18:28:18 UTC | gitweb: Remove gitweb/test/ directory Testing if gitweb handles filenames with spaces, filenames with plus sign ('+') which encodes spaces in CGI parameters (in URLs), and filenames with Unicode characters should be handled by gitweb tests. Those files are remainder of the time when gitweb was project on its own, not a part of git (with its testsuite). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 21:18:40 UTC |
| aa9349d | Marius Storm-Olsen | 30 May 2008, 12:38:35 UTC | Add shortcut in refresh_cache_ent() for marked entries. When a cache entry has been marked as CE_VALID, the user has promised us that any change in the work tree does not matter. Just mark the entry as up-to-date, and continue. Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 21:18:20 UTC |
| b7f685a | Marius Storm-Olsen | 30 May 2008, 11:14:24 UTC | Clearify the documentation for core.ignoreStat The previous documentation didn't make it clear that the "assume unchanged" was on per file basis, and not a global flag. Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 May 2008, 20:09:39 UTC |
| 291d823 | Junio C Hamano | 28 May 2008, 22:26:59 UTC | checkout: "best effort" checkout When unpack_trees() returned an error while switching branches, we used to stop right there, exiting without writing the index out or switching HEAD. This is Ok when unpack_trees() returned an error because it detected untracked files or locally modified paths that could be overwritten by branch switching, because that error return is done before we start to modify the work tree. But it is undesirable if unpack_trees() already started to update the work tree and a failure is returned because some but not all paths are updated in the work tree, perhaps because a directory that some files need to go in was read-only by mistake, or a file that will be overwritten by branch switching had a mandatory lock on it and we failed to unlink it. This changes the behaviour upon such an error to complete the branch switching; the files updated in the work tree will hopefully be much more consistent with the index and HEAD derived from the switched-to branch. We still issue error messages, and exit the command with non-zero status, so scripted callers need to notice it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 May 2008, 00:35:22 UTC |
| 2e2b887 | Junio C Hamano | 28 May 2008, 22:12:30 UTC | unpack_trees(): allow callers to differentiate worktree errors from merge errors Instead of uniformly returning -1 on any error, this teaches unpack_trees() to return -2 when the merge itself is Ok but worktree refuses to get updated. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 May 2008, 00:35:21 UTC |
| 6286a08 | Junio C Hamano | 28 May 2008, 21:59:40 UTC | checkout: consolidate reset_{to_new,clean_to_new}() These two were very similar functions with only tiny bit of difference. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 May 2008, 00:35:10 UTC |
| 74d3b23 | Luciano Rocha | 28 May 2008, 18:53:57 UTC | git-init: accept --bare option It is unfortunate that "git init --bare" does not work and the only reason why "init" did not learn its own "--bare" option is because "git --bare init" already does the job (and as an option to the git 'potty', it is more generic solution). This teaches "git init" its own "--bare" option, so that both "git --bare init" and "git init --bare" works mostly the same way. [jc: rewrote the log message and added test] Signed-off-by: Luciano Rocha <strange@nsk.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2008, 01:31:19 UTC |
| 84a5750 | Junio C Hamano | 28 May 2008, 21:54:02 UTC | checkout: make reset_clean_to_new() not die by itself Instead, have its error percolate up through the callchain and let it be the exit status of the main command. No semantic changes yet. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2008, 00:38:21 UTC |
| d2b3691 | Junio C Hamano | 28 May 2008, 21:48:57 UTC | "git checkout -- paths..." should error out when paths cannot be written When "git checkout -- paths..." cannot update work tree for whatever reason, checkout_entry() correctly issued an error message for the path to the end user, but the command ignored the error, causing the entire command to succeed. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2008, 00:38:20 UTC |
| a7052d3 | Junio C Hamano | 29 May 2008, 00:03:46 UTC | Documentation: git-cherry uses git-patch-id Geoffrey Irving noticed that git-cherry talks about comparing commits without hinting how they are compared. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2008, 00:03:46 UTC |
| 56ae8df | Junio C Hamano | 28 May 2008, 23:55:27 UTC | Manual subsection to refer to other pages is SEE ALSO Consistently say so in all caps as it is customary to do so. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 23:59:40 UTC |
| 823ea12 | Christian Couder | 28 May 2008, 16:57:02 UTC | bisect: use "$GIT_DIR/BISECT_START" to check if we are bisecting It seems simpler and safer to use the BISECT_START file everywhere to decide if we are bisecting or not, instead of using it in some places and BISECT_NAMES in other places. In commit 6459c7c6786aa9bda0c7a095c9db66c36da0e5f0 (Nov 18 2007, Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.), we decided to use BISECT_NAMES but code changed a lot and we now have to check BISECT_START first in the "bisect_start" function anyway. This patch also makes things a little bit safer by creating the BISECT_START file first and deleting it last, and also by adding checks in "bisect_clean_state". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 18:47:58 UTC |
| efb98b4 | Dmitry V. Levin | 28 May 2008, 15:29:36 UTC | builtin-fetch.c (store_updated_refs): Honor update_local_ref() return value Sync with builtin-fetch--tool.c where append_fetch_head() honors update_local_ref() return value. This fixes non fast forward fetch exit status, http://bugzilla.altlinux.org/show_bug.cgi?id=15037 Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 17:47:12 UTC |
| 6eec46b | Junio C Hamano | 28 May 2008, 16:47:43 UTC | fix sha1_pack_index_name() An earlier commit 633f43e (Remove redundant code, eliminate one static variable, 2008-05-24) had a thinko (perhaps an eyeno) that broke sha1_pack_index_name() function. One symptom of this was that the http walker is now completely broken. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 17:24:32 UTC |
| d683a0e | Junio C Hamano | 28 May 2008, 06:33:22 UTC | Git::cat_blob: allow using an empty blob to fix git-svn breakage Recent "git-svn optimization" series introduced Git::cat_blob() subroutine whose interface was broken in that it returned the size of the blob but signalled an error by returning 0. You can never use an empty blob with such an interface. This fixes the interface to return a negative value to signal an error. Reported by Björn Steinbrink. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 06:35:55 UTC |
| b2a42f5 | Junio C Hamano | 28 May 2008, 06:12:29 UTC | t5100: Avoid filename "nul" There are broken filesystems that cannot have a file whose name is "nul" anywhere on it. Rename the test file to make ourselves more portable. Noticed by Mark Levedahl. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 06:12:29 UTC |
| b71ce7f | Junio C Hamano | 28 May 2008, 05:22:47 UTC | Merge 1.5.5.3 in | 28 May 2008, 05:34:19 UTC |
| 28bc302 | Junio C Hamano | 28 May 2008, 05:20:53 UTC | GIT 1.5.5.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:32:47 UTC |
| d5350fd | Gerrit Pape | 27 May 2008, 08:59:16 UTC | commit --interactive: properly update the index before commiting When adding files through git commit --interactive, and 'quit' afterwards, the message in the editor of the commit message indicates that many (maybe all) files are deleted from the tree. Dismissing that and running git commit afterwards does the right thing. This commit fixes git commit --interactive to properly update the index before commiting. Reported by Jiří Paleček through http://bugs.debian.org/480429 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:32:47 UTC |
| 1f684dc | Lea Wiemann | 27 May 2008, 23:25:42 UTC | gitweb: only display "next" links in logs if there is a next page There was a bug in the implementation of the "next" links in format_paging_nav (for log and shortlog), which caused the next links to always be displayed, even if there is no next page. This fixes it. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:27:30 UTC |
| a17171b | Johannes Sixt | 26 May 2008, 19:09:18 UTC | Revert "filter-branch: subdirectory filter needs --full-history" This reverts commit cfabd6eee1745cfec58cfcb794ce8847e43b888a. I had implemented it without understanding what --full-history does. Consider this history: C--M--N / / / A--B / \ / D-/ where B and C modify a path, X, in the same way so that the result is identical, and D does not modify it at all. With the path limiter X and without --full-history this is simplified to A--B i.e. only one of the paths via B or C is chosen. I had assumed that --full-history would keep both paths like this C--M / / A--B removing the path via D; but in fact it keeps the entire history. Currently, git does not have the capability to simplify to this intermediary case. However, the other extreme to keep the entire history is not wanted either in usual cases. I think we can expect that histories like the above are rare, and in the usual cases we want a simplified history. So let's remove --full-history again. (Concerning t7003, subsequent tests depend on what the test case sets up, so we can't just back out the entire test case.) Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:27:30 UTC |
| 049c1ad | Gerrit Pape | 27 May 2008, 08:51:22 UTC | Documentation/git-bundle.txt: fix synopsis The <git-rev-list args> are mandatory to git bundle create, not optional. The usage output of git bundle is already right on this. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 05:01:31 UTC |
| 37b78c2 | Jeff King | 27 May 2008, 14:28:43 UTC | clone: make sure we support the transport type If we use an unsupported transport (e.g., http when curl support is not compiled in), transport_get reports an error to the user, but we still get a transport object. We need to manually check and abort the clone process at that point, or we end up with a segfault. Noticed by Thomas Rast. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 04:30:16 UTC |
| cb418b5 | Johannes Sixt | 27 May 2008, 07:36:22 UTC | t5700-clone-reference: Quote $U The new "trash directory" bites again. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 04:29:01 UTC |
| 40672a1 | Karl Hasselström | 25 May 2008, 16:14:29 UTC | Add some tests for git update-ref -d Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2008, 03:56:22 UTC |
| 3beb56b | Junio C Hamano | 27 May 2008, 05:38:19 UTC | Merge branch 'jc/diff-no-no-index' * jc/diff-no-no-index: git diff --no-index: default to page like other diff frontends git-diff: allow --no-index semantics a bit more "git diff": do not ignore index without --no-index diff-files: do not play --no-index games tests: do not use implicit "git diff --no-index" | 27 May 2008, 05:38:19 UTC |
| b3fde6c | Junio C Hamano | 27 May 2008, 05:35:07 UTC | git diff --no-index: default to page like other diff frontends Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 May 2008, 05:35:07 UTC |
| 0403660 | Junio C Hamano | 27 May 2008, 04:54:23 UTC | git-diff: allow --no-index semantics a bit more Even when inside a git work tree, if two paths are given and at least one is clearly outside the work tree, it cannot be a request to diff a tracked path anyway; allow such an invocation to use --no-index semantics. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 May 2008, 04:54:23 UTC |
| 2fe1839 | Junio C Hamano | 27 May 2008, 02:49:01 UTC | Merge branch 'maint' * maint: Documentation: fix graph in git-rev-parse.txt show-branch --current: do not barf on detached HEAD | 27 May 2008, 02:49:01 UTC |
| 109440c | Junio C Hamano | 27 May 2008, 02:15:03 UTC | Merge branch 'gp/bisect-fix' into maint * gp/bisect-fix: bisect: print an error message when "git rev-list --bisect-vars" fails git-bisect.sh: don't accidentally override existing branch "bisect" | 27 May 2008, 02:15:03 UTC |
| 2d3cfd7 | Junio C Hamano | 27 May 2008, 02:10:43 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Vertically align textboxes with labels git-gui: Handle workdir detection when CYGWIN=nowinsymlinks git-gui: Add a --trace command line option | 27 May 2008, 02:10:43 UTC |
| df2740b | Michele Ballabio | 26 May 2008, 13:24:02 UTC | Documentation: fix graph in git-rev-parse.txt Preformatted html and man pages show a mangled graph, caused by a backslash. Commit f1ec6b22a8c1ab1cca0f1875f85aea5d2434e5a6 fixed this same issue, but it seems that new versions of the Asciidoc toolchain changed their behaviour. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 May 2008, 02:10:03 UTC |
| 95dcfa3 | Twiinz | 19 May 2008, 04:01:58 UTC | git-gui: Vertically align textboxes with labels In git-gui after clicking either on 'Create New Repository' or 'Open Existing Repository' the form elements aren't centered like they are pretty much everywhere else in the app. At least when ran on a mac, haven't checked on other platforms. Using grid instead of pack seems to fix this. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 27 May 2008, 01:05:20 UTC |
| f8fcb57 | Junio C Hamano | 26 May 2008, 22:09:51 UTC | show-branch --current: do not barf on detached HEAD The code assumed that there always is the current branch, but the result from resolve_ref() on detached HEAD does not even start with "refs/heads/". Originally noticed and fixed by Stephan Beyer. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 22:09:56 UTC |
| d3d20b8 | Junio C Hamano | 26 May 2008, 21:56:19 UTC | Makefile: fix dependency on wt-status.h Noticed by Hannes, reported by Dscho. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 21:56:19 UTC |
| 37a12dd | Johannes Schindelin | 26 May 2008, 13:20:54 UTC | hg-to-git: add --verbose option This patch adds an option to make hg-to-git quiet by default. Note: it only suppresses those messages that would be printed when everything was up-to-date. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Stelian Pop <stelian@popies.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 17:43:39 UTC |
| 2d3922d | Junio C Hamano | 26 May 2008, 04:14:09 UTC | Documentation/git.txt: link to 1.5.5.2 documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 05:43:14 UTC |
| 8366b7b | Junio C Hamano | 26 May 2008, 05:43:05 UTC | Merge branch 'maint' * maint: builtin-fast-export: Only output a single parent per line Release Notes for 1.5.5.2 Conflicts: RelNotes | 26 May 2008, 05:43:05 UTC |
| a2f5be5 | Junio C Hamano | 26 May 2008, 05:34:23 UTC | Merge branch 'jk/maint-send-email-compose' into maint * jk/maint-send-email-compose: send-email: rfc2047-quote subject lines with non-ascii characters send-email: specify content-type of --compose body | 26 May 2008, 05:34:23 UTC |
| 93c7b9c | Junio C Hamano | 26 May 2008, 05:34:20 UTC | Merge branch 'hb/maint-send-email-quote-recipients' into maint * hb/maint-send-email-quote-recipients: Fix recipient santitization | 26 May 2008, 05:34:20 UTC |
| 6abf189 | Junio C Hamano | 26 May 2008, 05:34:05 UTC | Merge branch 'maint-1.5.4' into maint * maint-1.5.4: builtin-fast-export: Only output a single parent per line | 26 May 2008, 05:34:05 UTC |
| 5070b49 | Pieter de Bie | 24 May 2008, 23:21:53 UTC | builtin-fast-export: Only output a single parent per line According to the git-fast-import man-page, you can only put a single committish per merge: line, like this: merge :10 merge :11 However, git-fast-export puts all parents on a single line, like this: merge :10 :11 This changes fast-export to output a single parent per line. Otherwise neither git-fast-import nor bzr-fast-import can read its output. [jc: fix-up to remove excess LF in the output that makes fast-import barf] Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 05:26:24 UTC |
| 20bd3b0 | Junio C Hamano | 26 May 2008, 04:11:24 UTC | Release Notes for 1.5.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 04:11:24 UTC |
| fa620f1 | Shawn O. Pearce | 26 May 2008, 02:18:05 UTC | Ignore no-op changes in paranoid update hook If the hook gets invoked with identical old and new ids there is no change taking place. We probably should not have been called, but instead of failing silently allow the no-op. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 03:29:30 UTC |
| 50b7b2e | Shawn O. Pearce | 26 May 2008, 02:18:01 UTC | Don't load missing ACL files in paranoid update hook If a user or group ACL file does not exist in the current tip revision of the acl repository we will get an error from cat-file when we ask for that blob as it cannot be resolved. A quick look at the history by rev-list can tell us if there is a path there or not. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 03:29:30 UTC |
| 97561ff | Shawn O. Pearce | 26 May 2008, 02:17:57 UTC | Don't diff empty tree on branch creation in paranoid update hook Listing all files in a branch during branch creation is silly; the user's file-level ACLs probably don't mean anything at this point. We now treat the base case of 0{40} as an empty diff, as this happens only when the user is creating the branch and there are file level ACLs that diff against the old value of the branch. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 03:29:30 UTC |
| 48ded91 | Junio C Hamano | 26 May 2008, 03:19:30 UTC | log --pretty: do not accept bogus "--prettyshort" ... nor bogus "format.pretty = '=short'". Both are syntax errors. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 03:29:07 UTC |
| 37869f4 | Junio C Hamano | 26 May 2008, 03:19:25 UTC | log --graph: do not accept log --graphbogus An obvious fix to the argument parser. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 03:28:58 UTC |
| f53bc09 | Junio C Hamano | 26 May 2008, 01:28:37 UTC | Update draft release notes for 1.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 May 2008, 01:28:37 UTC |
| c11ff12 | Paul Mackerras | 26 May 2008, 00:11:33 UTC | gitk: Handle detached heads better This draws the currently checked-out head with a yellow circle, as suggested by Linus Torvalds, and fixes various places in the code where we assumed that the current head always had a branch. Now we can display the fake commits for local changes on a detached head. Signed-off-by: Paul Mackerras <paulus@samba.org> | 26 May 2008, 00:11:33 UTC |
| 9bd81e4 | Junio C Hamano | 25 May 2008, 21:25:02 UTC | Merge branch 'js/config-cb' * js/config-cb: Provide git_config with a callback-data parameter Conflicts: builtin-add.c builtin-cat-file.c | 25 May 2008, 21:25:02 UTC |
| 450c5ae | Junio C Hamano | 25 May 2008, 21:05:11 UTC | Merge branch 'as/graph' * as/graph: get_revision(): honor the topo_order flag for boundary commits Fix output of "git log --graph --boundary" log --graph --left-right: show left/right information in place of '*' graph API: don't print branch lines for uninteresting merge parents graph API: fix graph mis-alignment after uninteresting commits | 25 May 2008, 21:05:11 UTC |
| cc26efb | Junio C Hamano | 25 May 2008, 21:05:09 UTC | Merge branch 'js/mailinfo' * js/mailinfo: mailsplit: minor clean-up in read_line_with_nul() mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths mailsplit and mailinfo: gracefully handle NUL characters | 25 May 2008, 21:05:09 UTC |
| 0166592 | Junio C Hamano | 25 May 2008, 21:03:50 UTC | Merge branch 'jc/add-n-u' * jc/add-n-u: Make git add -n and git -u -n output consistent "git-add -n -u" should not add but just report Conflicts: builtin-add.c builtin-mv.c cache.h read-cache.c | 25 May 2008, 21:03:50 UTC |
| 488ee2f | Junio C Hamano | 25 May 2008, 20:49:16 UTC | Merge branch 'ar/t6031' * ar/t6031: Fix t6031 on filesystems without working exec bit | 25 May 2008, 20:49:16 UTC |
| b84c343 | Junio C Hamano | 25 May 2008, 20:38:44 UTC | Merge branch 'db/clone-in-c' * db/clone-in-c: Add test for cloning with "--reference" repo being a subset of source repo Add a test for another combination of --reference Test that --reference actually suppresses fetching referenced objects clone: fall back to copying if hardlinking fails builtin-clone.c: Need to closedir() in copy_or_link_directory() builtin-clone: fix initial checkout Build in clone Provide API access to init_db() Add a function to set a non-default work tree Allow for having for_each_ref() list extra refs Have a constant extern refspec for "--tags" Add a library function to add an alternate to the alternates file Add a lockfile function to append to a file Mark the list of refs to fetch as const Conflicts: cache.h t/t5700-clone-reference.sh | 25 May 2008, 20:41:37 UTC |
| 0dbaa5b | Junio C Hamano | 25 May 2008, 20:38:31 UTC | Merge branch 'jc/apply-whitespace' * jc/apply-whitespace: builtin-apply: do not declare patch is creation when we do not know it builtin-apply: accept patch to an empty file builtin-apply: typofix | 25 May 2008, 20:38:31 UTC |
| a24d287 | Junio C Hamano | 25 May 2008, 20:38:27 UTC | Merge branch 'jc/unpack-trees-reword' * jc/unpack-trees-reword: unpack-trees: allow Porcelain to give different error messages | 25 May 2008, 20:38:27 UTC |
| 2931344 | Junio C Hamano | 25 May 2008, 20:38:06 UTC | Merge branch 'ar/batch-cat' * ar/batch-cat: change quoting in test t1006-cat-file.sh builtin-cat-file.c: use parse_options() git-svn: Speed up fetch Git.pm: Add hash_and_insert_object and cat_blob Git.pm: Add command_bidi_pipe and command_close_bidi_pipe git-hash-object: Add --stdin-paths option Add more tests for git hash-object Move git-hash-object tests from t5303 to t1007 git-cat-file: Add --batch option git-cat-file: Add --batch-check option git-cat-file: Make option parsing a little more flexible git-cat-file: Small refactor of cmd_cat_file Add tests for git cat-file | 25 May 2008, 20:38:06 UTC |
| 325566c | Junio C Hamano | 25 May 2008, 20:38:03 UTC | Merge branch 'cc/bisect' * cc/bisect: bisect: use a detached HEAD to bisect bisect: trap critical errors in "bisect_start" bisect: fix left over "BISECT_START" file when starting with junk rev bisect: add test cases to check that "git bisect start" is atomic | 25 May 2008, 20:38:03 UTC |
| 834836b | Junio C Hamano | 25 May 2008, 20:37:25 UTC | Merge branch 'ap/svn' * ap/svn: git-svn: add test for --add-author-from and --use-log-author git-svn: add documentation for --add-author-from option. git-svn: Add --add-author-from option. git-svn: add documentation for --use-log-author option. | 25 May 2008, 20:37:25 UTC |
| 6c99f18 | Junio C Hamano | 25 May 2008, 20:37:20 UTC | Merge branch 'js/cvsexportcommit' * js/cvsexportcommit: cvsexportcommit: introduce -W for shared working trees (between Git and CVS) cvsexportcommit: chomp only removes trailing whitespace Conflicts: git-cvsexportcommit.perl | 25 May 2008, 20:37:20 UTC |
| 7e83003 | Junio C Hamano | 25 May 2008, 20:37:08 UTC | Merge branch 'js/ignore-submodule' * js/ignore-submodule: Ignore dirty submodule states during rebase and stash Teach update-index about --ignore-submodules diff options: Introduce --ignore-submodules | 25 May 2008, 20:37:08 UTC |
| 58dd491 | Junio C Hamano | 25 May 2008, 20:37:04 UTC | Merge branch 'mo/cvsserver' * mo/cvsserver: Documentation: Fix skipped section level git-cvsserver: add ability to guess -kb from contents implement gitcvs.usecrlfattr git-cvsserver: add mechanism for managing working tree and current directory | 25 May 2008, 20:37:04 UTC |
| edc5594 | Junio C Hamano | 25 May 2008, 08:23:55 UTC | mailsplit: minor clean-up in read_line_with_nul() Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:23:57 UTC |
| 9aa2309 | Junio C Hamano | 25 May 2008, 08:16:05 UTC | mailinfo: apply the same fix not to lose NULs in BASE64 and QP codepaths Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:22:18 UTC |
| cce8d6f | Johannes Schindelin | 16 May 2008, 13:03:30 UTC | mailsplit and mailinfo: gracefully handle NUL characters The function fgets() has a big problem with NUL characters: it reads them, but nobody will know if the NUL comes from the file stream, or was appended at the end of the line. So implement a custom read_line_with_nul() function. Noticed by Tommy Thorn. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:21:40 UTC |
| 6a491a1 | Clemens Buchacher | 25 May 2008, 18:27:44 UTC | http-push: remove remote locks on exit signals If locks are not cleaned up the repository is inaccessible for 10 minutes. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:07:24 UTC |
| a129293 | Clemens Buchacher | 25 May 2008, 18:26:50 UTC | Reset the signal being handled This did not cause any problems, because remove_lock_file_on_signal is only registered for SIGINT. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:06:55 UTC |
| 509792b | Paul Oliver | 23 May 2008, 18:29:22 UTC | Make git-cvsimport remove ['s from tags, as bad_ref_char doesn't allow them. Signed-off-by: Paul Oliver <puzza007@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 20:06:49 UTC |
| 4603ec0 | Adam Simpkins | 24 May 2008, 23:02:05 UTC | get_revision(): honor the topo_order flag for boundary commits Now get_revision() sorts the boundary commits when topo_order is set. Since sort_in_topological_order() takes a struct commit_list, it first places the boundary commits into revs->commits. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 19:22:24 UTC |
| 3c68d67 | Adam Simpkins | 24 May 2008, 23:02:04 UTC | Fix output of "git log --graph --boundary" Previously the graphing API wasn't aware of the revs->boundary flag, and it always assumed that commits marked UNINTERESTING would not be displayed. As a result, the boundary commits were printed at the end of the log output, but they didn't have any branch lines connecting them to their children in the graph. There was also another bug in the get_revision() code that caused graph_update() to be called twice on the first boundary commit. This caused the graph API to think that a commit had been skipped, and print a "..." line in the output. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 19:16:56 UTC |
| 7528f27 | Adam Simpkins | 25 May 2008, 07:07:21 UTC | log --graph --left-right: show left/right information in place of '*' With the --graph option, the graph already outputs 'o' instead of '*' for boundary commits. Make it emit '<' or '>' when --left-right is specified. (This change also disables the '^' prefix for UNINTERESTING commits. The graph code currently doesn't print anything special for these commits, since it assumes no UNINTERESTING, non-BOUNDARY commits are displayed. This is potentially a bug if UNINTERESTING non-BOUNDARY commits can actually be displayed via some code path.) [jc: squashed the left-right change from Dscho and Adam's fixup into one] Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 19:06:52 UTC |
| 37a75ab | Adam Simpkins | 24 May 2008, 02:24:11 UTC | graph API: don't print branch lines for uninteresting merge parents Previously, the graphing code printed lines coming out of a merge commit for all of its parents, even if some of them were uninteresting. Now it only prints lines for interesting commits. For example, for a merge commit where only the first parent is interesting, the code now prints: * merge commit * interesting child instead of: M merge commit |\ * interesting child Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 18:43:22 UTC |
| 2ecbd0a | Adam Simpkins | 24 May 2008, 02:24:10 UTC | graph API: fix graph mis-alignment after uninteresting commits The graphing code had a bug that caused it to output branch lines incorrectly after ignoring an uninteresting commit. When computing how to match up the branch lines from the current commit to the next one, it forgot to take into account that it needed to initially start with 2 empty spaces where the missing commit would have gone. So, instead of drawing this, | * | <- Commit with uninteresting parent | / * | It used to incorrectly draw this: | * | <- Commit with uninteresting parent * | Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 18:42:44 UTC |
| b27a23e | Christian Couder | 24 May 2008, 18:56:44 UTC | Documentation: convert tutorials to man pages This patch renames the following documents and at the same time converts them to the man page format: cvs-migration.txt -> gitcvs-migration.txt tutorial.txt -> gittutorial.txt tutorial-2.txt -> gittutorial-2.txt These new man pages are put in section 7, and other documents that reference the above ones are change accordingly. [jc: with help from Nanako to clean things up] Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 05:28:16 UTC |
| 0b0b8cd | Miklos Vajna | 22 May 2008, 23:26:09 UTC | CodingGuidelines: Add a note to avoid assignments inside if() Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 05:13:19 UTC |
| 633f43e | Heikki Orsila | 23 May 2008, 22:43:55 UTC | Remove redundant code, eliminate one static variable Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2008, 05:05:06 UTC |
