| 218bf69 | Junio C Hamano | 07 June 2008, 20:05:34 UTC | GIT 1.5.6-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 June 2008, 20:05:34 UTC |
| dceab83 | Junio C Hamano | 07 June 2008, 20:01:14 UTC | Merge 1.5.5.4 in Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 June 2008, 20:01:14 UTC |
| 7064ca5 | Junio C Hamano | 07 June 2008, 18:45:48 UTC | GIT 1.5.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 June 2008, 18:45:48 UTC |
| 03300c0 | Adam Simpkins | 05 June 2008, 09:28:13 UTC | git log --graph: print '*' for all commits, including merges Previously, merge commits were printed with 'M' instead of '*'. This had the potential to confuse users when not all parents of the merge commit were included in the log output. As Junio has pointed out, merge commits can almost always be easily identified from the log message, anyway. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 18:56:43 UTC |
| 1b9a946 | Daniel Barkalow | 06 June 2008, 03:15:19 UTC | Use nonrelative paths instead of absolute paths for cloned repositories Particularly for the "alternates" file, if one will be created, we want a path that doesn't depend on the current directory, but we want to retain any symlinks in the path as given and any in the user's view of the current directory when the path was given. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 18:23:10 UTC |
| 9e1f0a8 | Christian Couder | 06 June 2008, 07:07:32 UTC | documentation: move git(7) to git(1) As the "git" man page describes the "git" command at the end-user level, it seems better to move it to man section 1. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 18:18:28 UTC |
| 30eba7b | Christian Couder | 06 June 2008, 07:07:28 UTC | documentation: convert "diffcore" and "repository-layout" to man pages This patch renames the following documents and at the same time converts them to the man format: diffcore.txt -> gitdiffcore.txt (man section 7) repository-layout.txt -> gitrepository-layout.txt (man section 5) Other documents that reference the above ones are changed accordingly. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 18:14:52 UTC |
| a0ebe57 | Adam Simpkins | 05 June 2008, 08:56:19 UTC | graph API: fix "git log --graph --first-parent" This change teaches the graph API that only the first parent of each commit is interesting when "--first-parent" was specified. This change also consolidates the graph parent walking logic into two new internal functions, first_interesting_parent() and next_interesting_parent(). A simpler fix would have been to simply break at the end of the 2 existing for loops when graph->revs->first_parent_only is set. However, this change seems nicer, especially if we ever need to add any new loops over the parent list in the future. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 16:23:09 UTC |
| b7d9681 | Teemu Likonen | 05 June 2008, 21:15:36 UTC | Print info about "git help COMMAND" on git's main usage pages Git's main usage pages did not show "git help" as a way to get more information on a specific subcommand. This patch adds an info line after the list of git commands currently printed by "git", "git help", "git --help" and "git help --all". Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 16:22:18 UTC |
| e919cb3 | Junio C Hamano | 06 June 2008, 16:21:48 UTC | Merge branch 'maint' * maint: git-for-each-ref.txt: minor improvements name-rev: Fix segmentation fault when using --all | 06 June 2008, 16:21:48 UTC |
| c0f6dc9 | Lea Wiemann | 05 June 2008, 21:01:38 UTC | git-for-each-ref.txt: minor improvements Rewrapped synopsis and removed wrong asterisk behind --count option; clarified --sort=<key> description for multiple keys; documented that for-each-ref supports not only glob patterns but also prefixes like "refs/heads" as patterns, and that multiple patterns can be given. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 15:39:54 UTC |
| a83123d | Björn Steinbrink | 05 June 2008, 23:31:55 UTC | name-rev: Fix segmentation fault when using --all In commit da2478db "describe --always: fall back to showing an abbreviated object name" we lost the check that skips empty entries in the object hash table when iterating over it in cmd_name_rev. That may cause a NULL pointer being handed to show_name(), leading to a segmentation fault. So add that check back again. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 June 2008, 04:01:45 UTC |
| 7f718e8 | Jakub Narebski | 03 June 2008, 14:47:10 UTC | gitweb: Add charset info to "raw" output of 'text/plain' blobs Earlier "blob_plain" view sent "charset=utf-8" only when gitweb guessed the content type to be text by reading from it, and not when the MIME type was obtained from /etc/mime.types, or when gitweb couldn't guess mimetype and used $default_blob_plain_mimetype. This fixes the bug by always add charset info from $default_text_plain_charset (if it is defined) to "raw" (a=blob_plain) output for 'text/plain' blobs. Generating information for Content-Type: header got separated into blob_contenttype() subroutine; adding charset info in a special case was removed from blob_mimetype(), which now should return mimetype only. While at it cleanup code a bit: put subroutine parameter initialization first, make error message more robust (when $file_name is not defined) if more cryptic, remove unnecessary '"' around variable ("$var" -> $var). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 22:05:01 UTC |
| dd613e6 | Miklos Vajna | 04 June 2008, 21:20:05 UTC | Strbuf documentation: document most functions All functions in strbuf.h are documented, except launch_editor(). Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 22:02:42 UTC |
| 9e3fd41 | Dirk Suesserott | 04 June 2008, 20:50:31 UTC | Documentation/git-mailsplit: Enhanced description of -o option Added '-o' in the description of '-o<directory>' for consistency reasons. Signed-off-by: Dirk Suesserott <newsletter@dirk.my1.cc> | 04 June 2008, 21:51:34 UTC |
| 541fc21 | Jeff King | 04 June 2008, 18:38:58 UTC | Fix "git clone http://$URL" to check out the worktree when asked The builtin-clone now does the http commit walking and the tree unpacking in the same process, and the commit walker leaves the in-core objects in a funny state. When forgetting the data read from the tree object, the object should be marked "not parsed yet" for later users. Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 20:33:25 UTC |
| 60727b5 | Junio C Hamano | 04 June 2008, 20:15:59 UTC | Merge branch 'maint' * maint: describe: match pattern for lightweight tags too | 04 June 2008, 20:15:59 UTC |
| 4ed19a3 | Michael Dressel | 04 June 2008, 19:06:31 UTC | describe: match pattern for lightweight tags too The <pattern> given "git describe --match" was used only to filter tag objects, and not to filter lightweight tags. This fixes it. [jc: made the log to clarify this is a bugfix, not an enhancement, with additional test] Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 20:08:03 UTC |
| de5825c | Junio C Hamano | 04 June 2008, 19:10:01 UTC | t7502: honor SHELL_PATH Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 19:11:59 UTC |
| adf60f1 | Junio C Hamano | 04 June 2008, 06:56:56 UTC | Documentation: git-log cannot use rev-list specific options The log family and git-rev-list share the same set of options that come from revision walking machinery, but they both have options unique to them. Notably, --header, --timestamp, --stdin and --quiet apply only to rev-list. Exclude them from the git-log documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 06:56:56 UTC |
| 70ca472 | Alex Riesen | 03 June 2008, 22:16:26 UTC | Fix t5516 on cygwin: it does not like double slashes at the beginning of a path The double slashes "//" result from url./$TRASH/. expansion and the current directory, which even in cygwin contains "/" as first character. In cygwin such strings have special meaning: UNC path. Accessing an UNC path built for test purpose usually fails. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 05:12:08 UTC |
| a3c91e0 | Junio C Hamano | 04 June 2008, 01:10:08 UTC | t7502: tighten loosely written test sequence We would like to catch breakage at any step in the sequence. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 01:13:33 UTC |
| 7845944 | Junio C Hamano | 04 June 2008, 01:08:08 UTC | t7502: do not globally unset GIT_COMMITTER_* environment variables One particular test wants to check the behaviour of the command when these variables are not set, but the later tests should have the reliable committer identity for repeatable tests. Move the "unset" of the variables inside a subshell in the test that wants to unset them. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 June 2008, 01:08:08 UTC |
| 422b206 | Lea Wiemann | 03 June 2008, 18:34:17 UTC | cat-file --batch: flush stdout also when objects are missing cat-file --batch/--batch-check only flushes stdout when the object exists, but not when it doesn't ("<object> missing"). This makes bidirectional pipes hang. Signed-off-by: Lea Wiemann <LeWiemann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2008, 19:40:12 UTC |
| 02c1719 | Junio C Hamano | 03 June 2008, 07:17:22 UTC | GIT v1.5.6-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2008, 07:17:22 UTC |
| 67bfc03 | Junio C Hamano | 03 June 2008, 05:17:42 UTC | commit: drop duplicated parents The scripted version of git-commit internally used git-commit-tree which omitted duplicated parents given from the command line. This prevented a nonsensical octopus merge from getting created even when you said "git merge A B" while you are already on branch A. However, when git-commit was rewritten in C, this sanity check was lost. This resurrects it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2008, 06:55:57 UTC |
| 69e66f5 | Johannes Sixt | 02 June 2008, 14:01:40 UTC | rebase --interactive: Compute upstream SHA1 before switching branches If the upstream argument to rebase (the first argument) was relative to HEAD and the name of the branch to rebase (the second argument) was given, the upstream would have been interpreted relative to the second argument. In particular, this command git rebase -i HEAD topic would always finish with "Nothing to do". (a1bf91e fixed the same issue for non-interactive rebase.) Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2008, 03:36:14 UTC |
| c5833f6 | Kevin Ballard | 30 May 2008, 21:43:40 UTC | Documentation/git-filter-branch.txt: Fix description of --commit-filter The old description was misleading and logically impossible. It claimed that the ancestors of the original commit would be re-written to have the multiple emitted ids as parents. Not only would this modify existing objects, but it would create a cycle. What this actually does is pass the multiple emitted ids to the newly-created children to use as parents. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2008, 03:36:09 UTC |
| f70dda2 | Jakub Narebski | 02 June 2008, 09:54:41 UTC | gitweb: Fix "next" link on bottom of page Fix search form generation to not modify $cgi->param(...)'s. In git_header_html() we used to use $cgi->hidden(-name => "a") etc. to generate hidden fields; unfortunately to use this form it is required to modify $cgi->param("a") etc., which makes href(-replay,...) use wrong replay values. This for example made the "next" link on the bottom of the page has a=search instead of a=$action, and thus fails to get you to the next page. Because in CGI the value of a hidden field is "sticky", there is no way to modify it short of modifying $cgi->param(...). Therefore it got replaced by generating <input type="hidden" ...> element [semi] directly. Alternate solution would be for href(-replay,...) to use values saved in global variables, such as $action etc., instead of (re)reading them from $cgi->param($symbol). The bad link was reported by Kai Blin through http://bugs.debian.org/481902 Reported-by: Kai Blin <kai.blin@gmail.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Tested-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2008, 03:36:02 UTC |
| 3db4723 | Karl Hasselström | 02 June 2008, 22:41:44 UTC | Revert "git.el: Set process-environment instead of invoking env" This reverts commit dbe48256b41c1e94d81f2458d7e84b1fdcb47026, which caused mis-encoding of non-ASCII author/committer names when the git-status mode is used to create commits. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2008, 02:07:12 UTC |
| 06f60e8 | Junio C Hamano | 02 June 2008, 06:45:41 UTC | Merge branch 'sb/am-tests' * sb/am-tests: Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh Add test cases for git-am | 02 June 2008, 06:45:41 UTC |
| f0d2a05 | Junio C Hamano | 02 June 2008, 06:45:37 UTC | Merge branch 'lw/test-fix' * lw/test-fix: t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons | 02 June 2008, 06:45:37 UTC |
| 0cc01c9 | Junio C Hamano | 02 June 2008, 06:43:30 UTC | Merge branch 'sp/remote' * sp/remote: Make "git-remote rm" delete refs acccording to fetch specs Make "git-remote prune" delete refs according to fetch specs Remove unused remote_prefix member in builtin-remote | 02 June 2008, 06:43:30 UTC |
| d8ad63a | Junio C Hamano | 02 June 2008, 06:43:21 UTC | Merge branch 'lt/pack-sync' * lt/pack-sync: Remove now unnecessary 'sync()' calls Make pack creation always fsync() the result | 02 June 2008, 06:43:21 UTC |
| a44a5c0 | Junio C Hamano | 02 June 2008, 06:39:24 UTC | Merge branch 'np/pack-check' * np/pack-check: make verify-pack a bit more useful with bad packs | 02 June 2008, 06:39:24 UTC |
| 6241360 | Nicolas Pitre | 29 May 2008, 21:34:50 UTC | make verify-pack a bit more useful with bad packs When a pack gets corrupted, its SHA1 checksum will fail. However, this is more useful to let the test go on in order to find the actual problem location than only complain about the SHA1 mismatch and bail out. Also, it is more useful to compare the stored pack SHA1 with the one in the index file instead of the computed SHA1 since the computed SHA1 from a corrupted pack won't match the one stored in the index either. Finally a few code and message cleanups were thrown in as a bonus. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2008, 06:25:38 UTC |
| 310b9de | Junio C Hamano | 02 June 2008, 06:14:11 UTC | Merge branch 'jb/reset-q' * jb/reset-q: git-reset: honor -q and do not show progress message | 02 June 2008, 06:14:11 UTC |
| 8f1b063 | Junio C Hamano | 02 June 2008, 05:55:33 UTC | Merge branch 'jc/checkout' * 'jc/checkout': checkout: "best effort" checkout unpack_trees(): allow callers to differentiate worktree errors from merge errors checkout: consolidate reset_{to_new,clean_to_new}() checkout: make reset_clean_to_new() not die by itself | 02 June 2008, 05:55:36 UTC |
| 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 |
