| 5760a6b | Junio C Hamano | 24 August 2008, 21:47:24 UTC | GIT 1.6.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2008, 21:47:24 UTC |
| fb70928 | Junio C Hamano | 24 August 2008, 21:32:18 UTC | Merge branch 'ag/maint-combine-diff-fix' into maint * ag/maint-combine-diff-fix: Respect core.autocrlf in combined diff | 24 August 2008, 21:32:18 UTC |
| 97e5f49 | Junio C Hamano | 24 August 2008, 21:29:37 UTC | Merge branch 'mv/maint-merge-fix' into maint * mv/maint-merge-fix: merge: fix numerus bugs around "trivial merge" area | 24 August 2008, 21:29:37 UTC |
| ab54cd6 | Jonathan Nieder | 24 August 2008, 05:28:32 UTC | Documentation: clarify pager configuration The unwary user may not know how to disable the -FRSX options. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2008, 19:04:14 UTC |
| 3281808 | Jonathan Nieder | 24 August 2008, 05:38:06 UTC | Documentation: clarify pager.<cmd> configuration It was not obvious from the text that pager.<cmd> is a boolean setting. While we're changing the description, make some other improvements: lest we forget and fret, clarify that -p and pager.<cmd> do not kick in when stdout is not a tty; point to related core.pager and GIT_PAGER settings; use renamed --paginate option. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2008, 19:01:28 UTC |
| f5f7e4a | Simon Hausmann | 24 August 2008, 14:12:23 UTC | Clean up the git-p4 documentation This patch massages the documentation a bit for improved readability and cleans it up from outdated options/commands. Signed-off-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2008, 19:00:14 UTC |
| 5e568f9 | Alexander Gavrilov | 23 August 2008, 19:21:21 UTC | Respect core.autocrlf in combined diff Fix git-diff to make it produce useful 3-way diffs for merge conflicts in repositories with autocrlf enabled. Otherwise it always reports that the whole file was changed, because it uses the contents from the working tree without necessary conversion. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2008, 06:59:20 UTC |
| 7d77016 | Miklos Vajna | 23 August 2008, 22:07:55 UTC | Makefile: enable SNPRINTF_RETURNS_BOGUS for HP-UX In 81cc66a, customization has been added to Makefile for supporting HP-UX, but git commit is still problematic. This should fix the issue. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Acked-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2008, 04:53:35 UTC |
| 446247d | Junio C Hamano | 23 August 2008, 19:56:57 UTC | merge: fix numerus bugs around "trivial merge" area The "trivial merge" codepath wants to optimize itself by making an internal call to the read-tree machinery, but it does not read the index before doing so, and the codepath is never exercised. Incidentally, this failure to read the index upfront means that the safety to refuse doing anything when the index is unmerged does not kick in, either. These two problem are fixed by using read_cache_unmerged() that does read the index before checking if it is unmerged at the beginning of cmd_merge(). The primary logic of the merge, however, assumes that the process never reads the index in-core, and the call to write_cache_as_tree() it makes from write_tree_trivial() will always read from the on-disk index that is prepared the strategy back-ends. This assumption is now broken by the above fix. To fix this issue, we now call discard_cache() before calling write_tree_trivial() when it wants to write the on-disk index as a tree. When multiple strategies are tried, their results are evaluated by reading the resulting index and inspecting it. The codepath needs to make a call to read_cache() for each successful strategy, and for that to work, they need to discard_cache() the one read by the previous round. Also the "trivial merge" forgot that the current commit is one of the parents of the resulting commit. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2008, 01:17:22 UTC |
| 913e0e9 | Junio C Hamano | 23 August 2008, 19:57:30 UTC | unpack_trees(): protect the handcrafted in-core index from read_cache() unpack_trees() rebuilds the in-core index from scratch by allocating a new structure and finishing it off by copying the built one to the final index. The resulting in-core index is Ok for most use, but read_cache() does not recognize it as such. The function is meant to be no-op if you already have loaded the index, until you call discard_cache(). This change the way read_cache() detects an already initialized in-core index, by introducing an extra bit, and marks the handcrafted in-core index as initialized, to avoid this problem. A better fix in the longer term would be to change the read_cache() API so that it will always discard and re-read from the on-disk index to avoid confusion. But there are higher level API that have relied on the current semantics, and they and their users all need to get converted, which is outside the scope of 'maint' track. An example of such a higher level API is write_cache_as_tree(), which is used by git-write-tree as well as later Porcelains like git-merge, revert and cherry-pick. In the longer term, we should remove read_cache() from there and add one to cmd_write_tree(); other callers expect that the in-core index they prepared is what gets written as a tree so no other change is necessary for this particular codepath. The original version of this patch marked the index by pointing an otherwise wasted malloc'ed memory with o->result.alloc, but this version uses Linus's idea to use a new "initialized" bit, which is conceptually much cleaner. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 August 2008, 01:09:27 UTC |
| 893d340 | Tor Arvid Lund | 21 August 2008, 21:11:40 UTC | git-p4: Fix one-liner in p4_write_pipe function. The function built a p4 command string via the p4_build_cmd function, but ignored the result. Signed-off-by: Tor Arvid Lund <torarvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 August 2008, 05:40:13 UTC |
| f135aac | Eric Raible | 22 August 2008, 17:25:06 UTC | Completion: add missing '=' for 'diff --diff-filter' Signed-off-by: Eric Raible <raible@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 August 2008, 23:15:21 UTC |
| 26463c8 | Miklos Vajna | 21 August 2008, 14:21:48 UTC | Fix 'git help help' git help foo invokes man git-foo if foo is a git command, otherwise it invokes man gitfoo. 'help' is not a git command, but the manual page is called git-help, so add this special exception. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Acked-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 August 2008, 05:18:21 UTC |
| a81892d | Brandon Casey | 21 August 2008, 01:53:50 UTC | compat/snprintf.c: handle snprintf's that always return the # chars transmitted Some platforms provide a horribly broken snprintf. More broken than the platforms that return -1 when there is too little space in the target buffer for the formatted string. Some platforms provide an snprintf which _always_ returns the number of characters transmitted to the buffer, regardless of whether there was enough space or not. IRIX 6.5 is such a platform. IRIX does have a working snprintf(), but it is only provided when _NO_XOPEN5 evaluates to zero, and this only happens if _XOPEN_SOURCE is defined, but definition of _XOPEN_SOURCE prevents inclusion of many other common functions and defines. So it must be avoided. Work around these horribly broken snprintf implementations by detecting an snprintf call which results in the number of transmitted characters exactly equal to the length of our buffer and retrying with a larger buffer just to be safe. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Acked-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 August 2008, 08:53:44 UTC |
| 711521e | Eric Wong | 20 August 2008, 07:30:06 UTC | git-svn: fix dcommit to urls with embedded usernames Don't rely on the extracted URL from working_head_info since that has the username removed. Instead use the $gs->full_url method (as before with ba24e74 (git-svn: add ability to specify --commit-url for dcommit, 2008-08-07)) to give us the URL to commit to if --commit-url is not specified. Aditionally, since we clean usernames from URLs, checking the URL after rebase can fail because it doesn't match the URL we used to commit; so unconditionally provide a username-free URL for checking the result of the refetch. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 August 2008, 06:48:07 UTC |
| 4dc1db0 | Brandon Casey | 21 August 2008, 00:34:30 UTC | revision.h: make show_early_output an extern which is defined in revision.c The variable show_early_output is defined in revision.c and should be declared extern in revision.h so that the linker does not complain about multiply defined variables. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 August 2008, 02:59:06 UTC |
| 9b99e64 | Junio C Hamano | 20 August 2008, 22:19:00 UTC | Update draft release notes for 1.6.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 23:05:01 UTC |
| 3a634dc | Tarmigan Casebolt | 19 August 2008, 19:50:31 UTC | Add hints to revert documentation about other ways to undo changes Based on its name, people may read the 'git revert' documentation when they want to undo local changes, especially people who have used other SCM's. 'git revert' may not be what they had in mind, but git provides several other ways to undo changes to files. We can help them by pointing them towards the git commands that do what they might want to do. Cc: Daniel Barkalow <barkalow@iabervon.org> Cc: Lea Wiemann <lewiemann@gmail.com> Signed-off-by: Tarmigan Casebolt <tarmigan+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 23:04:45 UTC |
| 71f4637 | Johannes Sixt | 20 August 2008, 15:36:25 UTC | Install templates with the user and group of the installing personality If 'make install' was run with sufficient privileges, then the installed templates, which are copied using 'tar', would receive the user and group of whoever built git. This instructs 'tar' to ignore the user and group that are recorded in the archive. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 23:01:45 UTC |
| 9ca8f60 | Junio C Hamano | 20 August 2008, 22:09:28 UTC | "git-merge": allow fast-forwarding in a stat-dirty tree We used to refresh the index to clear stat-dirtyness before a fast-forward merge. Recent C rewrite forgot to do this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 22:49:21 UTC |
| 25b3d4d | Junio C Hamano | 20 August 2008, 21:13:42 UTC | completion: find out supported merge strategies correctly "git-merge" is a binary executable these days, and looking for assignment to $all_strategies variable with grep/sed does not work well. When asked for an unknown strategy, pre-1.6.0 and post-1.6.0 "git merge" commands respectively say: $ $HOME/git-snap-v1.5.6.5/bin/git merge -s help available strategies are: recur recursive octopus resolve stupid ours subtree $ $HOME/git-snap-v1.6.0/bin/git merge -s help Could not find merge strategy 'help'. Available strategies are: recursive octopus resolve ours subtree. both on their standard error stream. We can use this to learn what strategies are supported. The sed script is written in such a way that it catches both old and new message styles ("Available" vs "available", and the full stop at the end). It also allows future versions of "git merge" to line-wrap the list of strategies, and add extra comments, like this: $ $HOME/git-snap-v1.6.1/bin/git merge -s help Could not find merge strategy 'help'. Available strategies are: blame recursive octopus resolve ours subtree. Also you have custom strategies: theirs Make sure you spell strategy names correctly. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 22:48:52 UTC |
| 54988bd | Jeff King | 20 August 2008, 17:55:33 UTC | decorate: allow const objects to be decorated We don't actually modify the struct object, so there is no reason not to accept const versions (and this allows other callsites, like the next patch, to use the decoration machinery). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 20:30:49 UTC |
| e276c26 | Junio C Hamano | 20 August 2008, 19:29:27 UTC | for-each-ref: cope with tags with incomplete lines If you have a tag with a single, incomplete line as its payload, asking git-for-each-ref for its %(body) element accessed a NULL pointer. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 20:29:30 UTC |
| c35539e | Junio C Hamano | 20 August 2008, 18:47:55 UTC | diff --check: do not get confused by new blank lines in the middle The code remembered that the last diff output it saw was an empty line, and tried to reset that state whenever it sees a context line, a non-blank new line, or a new hunk. However, this codepath asks the underlying diff engine to feed diff without any context, and the "just saw an empty line" state was not reset if you added a new blank line in the last hunk of your patch, even if it is not the last line of the file. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 20:28:19 UTC |
| c71e917 | Jim Meyering | 19 August 2008, 18:46:30 UTC | remote.c: remove useless if-before-free test We removed a handful of these useless if-before-free tests several months ago. This change removes a new one that snuck back in. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 04:09:30 UTC |
| e9d7d10 | Jeff King | 19 August 2008, 17:28:24 UTC | mailinfo: avoid violating strbuf assertion In handle_from, we calculate the end boundary of a section to remove from a strbuf using strcspn like this: el = strcspn(buf, set_of_end_boundaries); strbuf_remove(&sb, start, el + 1); This works fine if "el" is the offset of the boundary character, meaning we remove up to and including that character. But if the end boundary didn't match (that is, we hit the end of the string as the boundary instead) then we want just "el". Asking for "el+1" caught an out-of-bounds assertion in the strbuf library. This manifested itself when we got a 'From' header that had just an email address with nothing else in it (the end of the string was the end of the address, rather than, e.g., a trailing '>' character), causing git-mailinfo to barf. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 02:36:56 UTC |
| c8c4450 | Jim Meyering | 19 August 2008, 18:42:04 UTC | git format-patch: avoid underrun when format.headers is empty or all NLs * builtin-log.c (add_header): Avoid a buffer underrun when format.headers is empty or all newlines. Reproduce with this: git config format.headers '' && git format-patch -1 Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 August 2008, 01:08:00 UTC |
| 26e08a0 | Brandon Casey | 18 August 2008, 23:17:53 UTC | t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0' Some old platforms have an old diff which doesn't have the -U option. 'git diff' can be used in its place. Adjust the comparison function to strip git's additional header lines to make this possible. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 August 2008, 06:27:14 UTC |
| da9973c | Robert Schiele | 18 August 2008, 14:17:04 UTC | adapt git-cvsserver manpage to dash-free syntax Signed-off-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 August 2008, 05:05:44 UTC |
| 289796d | Don Zickus | 14 August 2008, 15:35:42 UTC | mailinfo: re-fix MIME multipart boundary parsing Recent changes to is_multipart_boundary() caused git-mailinfo to segfault. The reason was after handling the end of the boundary the code tried to look for another boundary. Because the boundary list was empty, dereferencing the pointer to the top of the boundary caused the program to go boom. The fix is to check to see if the list is empty and if so go on its merry way instead of looking for another boundary. I also fixed a couple of increments and decrements that didn't look correct relating to content_top. The boundary test case was updated to catch future problems like this again. Signed-off-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 August 2008, 05:05:02 UTC |
| dba9194 | Junio C Hamano | 17 August 2008, 22:44:11 UTC | Start 1.6.0.X maintenance series Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2008, 22:44:11 UTC |
| ea02eef | Junio C Hamano | 17 August 2008, 18:42:10 UTC | GIT 1.6.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2008, 18:42:10 UTC |
| 373a273 | Junio C Hamano | 17 August 2008, 18:40:56 UTC | Merge git-gui 0.11.0 | 17 August 2008, 18:41:19 UTC |
| a1975c4 | Junio C Hamano | 17 August 2008, 17:53:57 UTC | Merge branch 'ak/p4' * ak/p4: Utilise our new p4_read_pipe and p4_write_pipe wrappers Add p4 read_pipe and write_pipe wrappers Put in the two other configuration elements found in the source Put some documentation in about the parameters that have been added Move git-p4.syncFromOrigin into a configuration parameters section Consistently use 'git-p4' for the configuration entries If the user has configured various parameters, use them. Switch to using 'p4_build_cmd' If we are in verbose mode, output what we are about to run (or return) Add a single command that will be used to construct the 'p4' command Utilise the new 'p4_system' function. Have a command that specifically invokes 'p4' (via system) Utilise the new 'p4_read_pipe_lines' command Create a specific version of the read_pipe_lines command for p4 invocations Conflicts: contrib/fast-import/git-p4 | 17 August 2008, 17:53:57 UTC |
| 053fd0c | Robert Blum | 01 August 2008, 19:50:03 UTC | git-p4: chdir now properly sets PWD environment variable in msysGit P4 on Windows expects the PWD environment variable to be set to the current working dir, but os.chdir in python doesn't do so. Signed-off-by: Robert Blum <rob.blum@gmail.com> Acked-by: Simon Hausmann <simon@lst.de> Acked-by: Han-Wen Nienhuys <hanwen@xs4all.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2008, 06:37:04 UTC |
| 9b752a6 | Stephan Beyer | 17 August 2008, 04:25:43 UTC | Improve error output of git-rebase "git rebase" without arguments on initial startup showed: fatal: Needed a single revision invalid upstream This patch makes it show the ordinary usage string. If .git/rebase-merge or .git/rebase-apply/rebasing exists, git-rebase will die with a message saying that a rebase is in progress and the user should try --skip/--abort/--continue. If .git/rebase-apply/applying exists, git-rebase will die with a message saying that git-am is in progress, regardless how many arguments are given. If no arguments are given and .git/rebase-apply/ exists, but neither a rebasing nor applying file is in that directory, git-rebase dies with a message saying that rebase-apply exists and no arguments were given. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2008, 06:21:18 UTC |
| 20a55f4 | Miklos Vajna | 16 August 2008, 15:17:42 UTC | t9300: replace '!' with test_must_fail Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 August 2008, 06:21:18 UTC |
| a0d74d1 | Junio C Hamano | 17 August 2008, 06:21:07 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Allow safely calling nukefile from a run queue handler | 17 August 2008, 06:21:07 UTC |
| c14c8ce | Marcus Griep | 15 August 2008, 19:53:59 UTC | Git.pm: Make File::Spec and File::Temp requirement lazy This will ensure that the API at large is accessible to nearly all Perl versions, while only the temp file caching API is tied to the File::Temp and File::Spec modules being available. Signed-off-by: Marcus Griep <marcus@griep.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2008, 09:58:22 UTC |
| 4370c2d | Miklos Vajna | 16 August 2008, 02:14:33 UTC | Documentation: document the pager.* configuration setting It was already documented in RelNotes-1.6.0, but not in the git-config manual page. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2008, 09:58:22 UTC |
| a5ab00c | Stephan Beyer | 16 August 2008, 03:27:31 UTC | git-stash: improve synopsis in help and manual page "git stash -h" showed some incomplete and ugly usage information. For example, the useful "--keep-index" option for "save" or the "--index" option for "apply" were not shown. Also in the documentation synopsis they were not shown, so that there is no incentive to scroll down and even see that such options exist. This patch improves the git-stash synopsis in the documentation by mentioning that further options to the stash commands and then copies this synopsis to the usage information string of git-stash.sh. For the latter, the dashless git command string has to be inserted on the second and the following usage lines. The code of this is taken from git-sh-setup so that all lines will show the command string. Note that the "create" command is not advertised at all now, because it was not mentioned in git-stash.txt. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2008, 09:58:18 UTC |
| 0d768f7 | Eric Blake | 15 August 2008, 15:01:03 UTC | Makefile: building git in cygwin 1.7.0 On platforms with $X, make removes any leftover scripts 'a' from earlier builds if a new binary 'a.exe' is now built. However, on cygwin 1.7.0, 'git' and 'git.exe' now consistently name the same file. Test for file equality before attempting a remove, in order to avoid nuking just-built binaries. Signed-off-by: Eric Blake <ebb9@byu.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2008, 09:34:23 UTC |
| cb3a160 | Stephan Beyer | 08 August 2008, 23:28:54 UTC | git-am: ignore --binary option The git-apply documentation says that --binary is a historical option. This patch lets git-am ignore --binary and removes advertisements of this option. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2008, 09:32:36 UTC |
| 2946ccc | Marcus Griep | 15 August 2008, 17:59:28 UTC | bash-completion: Add non-command git help files to bash-completion Git allows access to the gitattributes man page via `git help attributes`, but this is not discoverable via the bash-completion mechanism. This patch adds all current non-command man pages to the completion candidate list. Signed-off-by: Marcus Griep <marcus@griep.us> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 August 2008, 09:32:01 UTC |
| 8134a00 | Alex Riesen | 15 August 2008, 07:32:30 UTC | Fix t3700 on filesystems which do not support question marks in names Use square brackets instead. And the prominent example of the deficiency are, as usual, the filesystems of Microsoft house. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2008, 08:38:37 UTC |
| a7d3ef9 | Anand Kumria | 14 August 2008, 22:40:39 UTC | Utilise our new p4_read_pipe and p4_write_pipe wrappers Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2008, 01:14:24 UTC |
| d942919 | Anand Kumria | 14 August 2008, 22:40:38 UTC | Add p4 read_pipe and write_pipe wrappers Two additional wrappers to cover 3 places where we utilise p4 in piped form. Found by Tor Arvid Lund. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2008, 01:14:23 UTC |
| 5a13c8f | Lee Marlow | 14 August 2008, 22:41:11 UTC | bash completion: Add '--merge' long option for 'git log' Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2008, 00:49:12 UTC |
| b4c7216 | Lee Marlow | 14 August 2008, 22:41:10 UTC | bash completion: Add completion for 'git mergetool' The --tool= long option to "git mergetool" can be completed with: kdiff3 tkdiff meld xxdiff emerge vimdiff gvimdiff ecmerge opendiff Signed-off-by: Lee Marlow <lee.marlow@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2008, 00:49:12 UTC |
| f491239 | Matt McCutchen | 14 August 2008, 17:37:41 UTC | git format-patch documentation: clarify what --cover-letter does Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2008, 00:49:12 UTC |
| 7950659 | Eric Raible | 14 August 2008, 17:12:54 UTC | bash completion: 'git apply' should use 'fix' not 'strip' Bring completion up to date with the man page. Signed-off-by: Eric Raible <raible@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 August 2008, 00:49:12 UTC |
| a0653d5 | Junio C Hamano | 14 August 2008, 02:22:29 UTC | Merge branch 'maint' * maint: t5304-prune: adjust file mtime based on system time rather than file mtime Fix escaping of glob special characters in pathspecs | 14 August 2008, 02:22:29 UTC |
| 21926fe | Brandon Casey | 14 August 2008, 00:49:30 UTC | t5304-prune: adjust file mtime based on system time rather than file mtime test-chmtime can adjust the mtime of a file based on the file's mtime, or based on the system time. For files accessed over NFS, the file's mtime is set by the NFS server, and as such may vary a great deal from the NFS client's system time if the clocks of the client and server are out of sync. Since these tests are testing the expire feature of git-prune, an incorrect mtime could cause a file to be expired or not expired incorrectly and produce a test failure. Avoid this NFS pitfall by modifying the calls to test-chmtime so that the mtime is adjusted based on the system time, rather than the file's mtime. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2008, 01:18:23 UTC |
| 8caa3ac | Brandon Casey | 14 August 2008, 00:48:57 UTC | test-parse-options: use appropriate cast in length_callback OPT_CALLBACK() is passed &integer which is now an "int" rather than "unsigned long". Update the length_callback function. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2008, 01:11:44 UTC |
| ea335b5 | Kevin Ballard | 13 August 2008, 22:34:34 UTC | Fix escaping of glob special characters in pathspecs match_one implements an optimized pathspec match where it only uses fnmatch if it detects glob special characters in the pattern. Unfortunately it didn't treat \ as a special character, so attempts to escape a glob special character would fail even though fnmatch() supports it. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 August 2008, 00:11:03 UTC |
| a96dc01 | Thomas Rast | 13 August 2008, 21:41:24 UTC | rebase -i -p: fix parent rewriting The existing parent rewriting did not handle the case where a previous commit was amended (via edit or squash). Fix by always putting the new sha1 of the last commit into the $REWRITTEN map. Signed-off-by: Thomas Rast <trast@student.ethz.ch> | 13 August 2008, 22:17:10 UTC |
| 71d9451 | Thomas Rast | 13 August 2008, 21:41:23 UTC | rebase -i -p: handle index and workdir correctly 'git rebase -i -p' forgot to update the index and working directory during fast forwards. Fix this. Makes 'GIT_EDITOR=true rebase -i -p <ancestor>' a no-op again. Also, it attempted to do a fast forward even if it was instructed not to commit (via -n). Fall back to the cherry-pick code path and let that handle the issue for us. Signed-off-by: Thomas Rast <trast@student.ethz.ch> | 13 August 2008, 22:17:09 UTC |
| 65f59e2 | Junio C Hamano | 13 August 2008, 04:42:22 UTC | GIT 1.6.0-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 August 2008, 05:46:33 UTC |
| fc721b6 | Junio C Hamano | 13 August 2008, 05:46:22 UTC | Merge branch 'maint' * maint: Do not talk about "diff" in rev-list documentation. | 13 August 2008, 05:46:22 UTC |
| 9612e74 | Junio C Hamano | 11 August 2008, 18:46:56 UTC | Do not talk about "diff" in rev-list documentation. Since 8c02eee (git-rev-list(1): group options; reformat; document more options, 2006-09-01), git-rev-list documentation talks as if it supports any kind of diff output. It doesn't. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 August 2008, 05:40:44 UTC |
| c67a9e2 | Junio C Hamano | 13 August 2008, 04:41:29 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: Reduce temp file usage when dealing with non-links git-svn: Make it incrementally faster by minimizing temp files Git.pm: Add faculties to allow temp files to be cached | 13 August 2008, 04:41:29 UTC |
| 510b094 | Marcus Griep | 12 August 2008, 16:45:39 UTC | git-svn: Reduce temp file usage when dealing with non-links Currently, in sub 'close_file', git-svn creates a temporary file and copies the contents of the blob to be written into it. This is useful for symlinks because svn stores symlinks in the form: link $FILE_PATH Git creates a blob only out of '$FILE_PATH' and uses file mode to indicate that the blob should be interpreted as a symlink. As git-hash-object is invoked with --stdin-paths, a duplicate of the link from svn must be created that leaves off the first five bytes, i.e. 'link '. However, this is wholly unnecessary for normal blobs, though, as we already have a temp file with their contents. Copying the entire file gains nothing, and effectively requires a file to be written twice before making it into the object db. This patch corrects that issue, holding onto the substr-like duplication for symlinks, but skipping it altogether for normal blobs by reusing the existing temp file. Signed-off-by: Marcus Griep <marcus@griep.us> Acked-by: Eric Wong <normalperson@yhbt.net> | 13 August 2008, 03:46:54 UTC |
| 0b19138 | Marcus Griep | 12 August 2008, 16:00:53 UTC | git-svn: Make it incrementally faster by minimizing temp files Currently, git-svn would create a temp file on four occasions: 1. Reading a blob out of the object db 2. Creating a delta from svn 3. Hashing and writing a blob into the object db 4. Reading a blob out of the object db (in another place in code) Any time git-svn did the above, it would dutifully create and then delete said temp file. Unfortunately, this means that between 2-4 temporary files are created/deleted per file 'add/modify'-ed in svn (O(n)). This causes significant overhead and helps the inode counter to spin beautifully. By its nature, git-svn is a serial beast. Thus, reusing a temp file does not pose significant problems. "truncate and seek" takes much less time than "unlink and create". This patch centralizes the tempfile creation and holds onto the tempfile until they are deleted on exit. This significantly reduces file overhead, now requiring at most three (3) temp files per run (O(1)). Signed-off-by: Marcus Griep <marcus@griep.us> Acked-by: Eric Wong <normalperson@yhbt.net> | 13 August 2008, 03:46:54 UTC |
| e41352b | Marcus Griep | 12 August 2008, 16:00:18 UTC | Git.pm: Add faculties to allow temp files to be cached This patch offers a generic interface to allow temp files to be cached while using an instance of the 'Git' package. If many temp files are created and destroyed during the execution of a program, this caching mechanism can help reduce the amount of files created and destroyed by the filesystem. The temp_acquire method provides a weak guarantee that a temp file will not be stolen by subsequent requests. If a file is locked when another acquire request is made, a simple error is thrown. Signed-off-by: Marcus Griep <marcus@griep.us> Acked-by: Eric Wong <normalperson@yhbt.net> | 13 August 2008, 03:46:54 UTC |
| 70d9895 | Thomas Rast | 11 August 2008, 23:55:36 UTC | Documentation: rev-list-options: Rewrite simplification descriptions for clarity This completely rewrites the documentation of --full-history with lots of examples. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 August 2008, 00:54:06 UTC |
| 23b5beb | Gustaf Hendeby | 12 August 2008, 14:24:26 UTC | Teach git diff about BibTeX head hunk patterns All BibTeX entries starts with an @ followed by an entry type. Since there are many entry types and own can be defined, the pattern matches legal entry type names instead of just the default types (which would be a long list). The pattern also matches strings and comments since they will also be useful to position oneself in a bib-file. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 22:43:55 UTC |
| d08ed6d | Gustaf Hendeby | 12 August 2008, 14:24:25 UTC | gitattributes: Document built in hunk header patterns Since the hunk header pattern text was written patterns for Ruby and Pascal/Delphi have been added. For users to be able to find them they should be documented not only in code. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 22:41:32 UTC |
| bd7b371 | Stephen R. van den Berg | 12 August 2008, 19:36:13 UTC | git-daemon: SysV needs the signal handler reinstated. Fixes the bug on (amongst others) Solaris that only the first child ever is reaped. Signed-off-by: Stephen R. van den Berg <srb@cuci.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 22:41:08 UTC |
| 04c6e9e | Junio C Hamano | 12 August 2008, 05:15:28 UTC | diff --check: do not unconditionally complain about trailing empty lines Recently "git diff --check" learned to detect new trailing blank lines just like "git apply --whitespace" does. However this check should not trigger unconditionally. This patch makes it honor the whitespace settings from core.whitespace and gitattributes. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 05:15:28 UTC |
| 7e4ad90 | Junio C Hamano | 12 August 2008, 02:24:28 UTC | Merge branch 'maint' * maint: git-bisect: fix wrong usage of read(1) | 12 August 2008, 02:24:28 UTC |
| 5b5aa22 | Anand Kumria | 10 August 2008, 18:26:35 UTC | Put in the two other configuration elements found in the source I am not entirely clear what these parameters do but felt it useful to call them out in the documentation. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:04 UTC |
| b87a659 | Anand Kumria | 10 August 2008, 18:26:34 UTC | Put some documentation in about the parameters that have been added Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:04 UTC |
| bc02acf | Anand Kumria | 10 August 2008, 18:26:33 UTC | Move git-p4.syncFromOrigin into a configuration parameters section Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:04 UTC |
| 3cafb7d | Anand Kumria | 10 August 2008, 18:26:32 UTC | Consistently use 'git-p4' for the configuration entries Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:04 UTC |
| abcaf07 | Anand Kumria | 10 August 2008, 18:26:31 UTC | If the user has configured various parameters, use them. Some repositories require authentication and access to certain hosts. Allow git-p4 to pull this information from the configuration Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:04 UTC |
| 155af83 | Anand Kumria | 10 August 2008, 18:26:30 UTC | Switch to using 'p4_build_cmd' Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:04 UTC |
| ee06427 | Anand Kumria | 10 August 2008, 18:26:29 UTC | If we are in verbose mode, output what we are about to run (or return) Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:04 UTC |
| 21a5075 | Anand Kumria | 10 August 2008, 18:26:28 UTC | Add a single command that will be used to construct the 'p4' command Rather than having three locations where the 'p4' command is built up, refactor this into the one place. This will, eventually, allow us to have one place where we modify the evironment or pass extra command-line options to the 'p4' binary. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:04 UTC |
| 87b611d | Anand Kumria | 10 August 2008, 18:26:27 UTC | Utilise the new 'p4_system' function. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:03 UTC |
| bf9320f | Anand Kumria | 10 August 2008, 18:26:26 UTC | Have a command that specifically invokes 'p4' (via system) Similiar to our 'p4_read_pipe_lines' command, we can isolate specific changes to the invocation method in the one location with this change. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:03 UTC |
| b340fa4 | Anand Kumria | 10 August 2008, 18:26:25 UTC | Utilise the new 'p4_read_pipe_lines' command Now that we have the new command, we can utilise it and then eventually, isolate any changes required to the one place. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:03 UTC |
| 2318121 | Anand Kumria | 10 August 2008, 18:26:24 UTC | Create a specific version of the read_pipe_lines command for p4 invocations This will make it easier to isolate changes to how 'p4' is invoked (whether with parameters or not, etc.). Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 01:57:03 UTC |
| d777af8 | Thomas Rast | 11 August 2008, 23:55:35 UTC | Documentation: rev-list-options: Fix a typo Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 00:13:57 UTC |
| 7dce991 | Petr Baudis | 11 August 2008, 22:34:46 UTC | Adjust for the new way of enabling the default post-update hook The post-update hook, which is required to be enabled in order for the repository to be accessible over HTTP, is not enabled by chmod a+x anymore, but instead by dropping the .sample suffix. This patch emphasizes this change in the release notes (since I believe this is rather noticeable backwards-incompatible change). It also adjusts the documentation which still described the old way and fixes t/t5540-http-push.sh, which was broken for 1.5 month but apparently noone ever runs this test. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 August 2008, 00:07:17 UTC |
| e5d3afd | Francis Moreau | 11 August 2008, 17:37:46 UTC | git-bisect: fix wrong usage of read(1) Signed-off-by: Francis Moreau <francis.moro@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2008, 23:48:11 UTC |
| 2860b57 | Nguyễn Thái Ngọc Duy | 10 August 2008, 15:26:23 UTC | Fix typo in comments of longest_ancestor_length() Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2008, 23:44:54 UTC |
| ac39efb | Junio C Hamano | 11 August 2008, 21:28:35 UTC | Merge branch 'maint' * maint: Re-fix rev-list-options documentation | 11 August 2008, 21:28:35 UTC |
| e534735 | Junio C Hamano | 11 August 2008, 21:24:51 UTC | Re-fix rev-list-options documentation 18a2197 (Documentation: rev-list-options: Fix -g paragraph formatting, 2008-08-10) introduced the third paragraph that is continued, but it seems to confuse docbook toolchain on FC9 machines. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2008, 21:24:51 UTC |
| 10d9d88 | Junio C Hamano | 11 August 2008, 07:53:31 UTC | Merge branch 'maint' * maint: Documentation: fix invalid reference to 'mybranch' in user manual Fix deleting reflog entries from HEAD reflog reflog test: add more tests for 'reflog delete' Documentation: rev-list-options: Fix -g paragraph formatting Conflicts: Documentation/user-manual.txt | 11 August 2008, 07:53:31 UTC |
| 4f80b27 | Ivan Stankovic | 10 August 2008, 16:22:14 UTC | Documentation: fix invalid reference to 'mybranch' in user manual Signed-off-by: Ivan Stankovic <pokemon@fly.srk.fer.hr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2008, 06:56:22 UTC |
| 55beff4 | Junio C Hamano | 11 August 2008, 06:21:25 UTC | Fix deleting reflog entries from HEAD reflog dwim_ref() used to resolve HEAD symbolic ref to its target (i.e. current branch). This incorrectly removed the reflog entry from the current branch when 'git reflog delete HEAD@{1}' was asked for. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2008, 06:21:25 UTC |
| 38881a9 | Pieter de Bie | 09 August 2008, 23:33:29 UTC | reflog test: add more tests for 'reflog delete' This adds more tests for 'reflog delete' and marks it as broken, as currently a call to 'git reflog delete HEAD@{1}' deletes entries in the currently checked out branch's log, not the HEAD log. Noticed by John Wiegley Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2008, 06:15:44 UTC |
| 18a2197 | Thomas Rast | 10 August 2008, 13:04:34 UTC | Documentation: rev-list-options: Fix -g paragraph formatting - Add an escape to @{now}. Without the escape, the brace does something magic and eats half the sentence up to the closing brace at 'timestamp}'. - Join the last paragraph with a '+'. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 August 2008, 06:11:48 UTC |
| df75e86 | Alexander Gavrilov | 09 August 2008, 10:41:50 UTC | gitk: Allow safely calling nukefile from a run queue handler Originally dorunq assumed that the queue entry remained first in the queue after the script eval, and blindly removed it. However, if the handler calls nukefile, it may not be the case anymore, and a random queue entry gets dropped instead. This makes dorunq remove the entry before calling the script, and adds a global variable to allow other functions to determine if they are called from within a dorunq handler. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 August 2008, 00:13:50 UTC |
| 1c1fe10 | Shawn O. Pearce | 10 August 2008, 07:02:08 UTC | git-gui 0.11 Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 10 August 2008, 07:02:08 UTC |
| 71b9979 | Junio C Hamano | 09 August 2008, 22:11:48 UTC | Update draft RelNotes for 1.6.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2008, 22:11:48 UTC |
| 0bb3a0b | Junio C Hamano | 09 August 2008, 08:40:08 UTC | Merge branch 'maint' * maint: asciidoc markup fixes Fail properly when cloning from invalid HTTP URL Conflicts: Documentation/git-push.txt | 09 August 2008, 08:40:08 UTC |
| a9fd138 | Junio C Hamano | 09 August 2008, 08:17:24 UTC | mailinfo: fix MIME multi-part message boundary handling After finding a MIME multi-part message boundary line, the handle_body() function is supposed to first flush any accumulated contents from the previous part to the output stream. However, the code mistakenly output the boundary line it found. The old code that used one global, fixed-length buffer line[] used an alternate static buffer newline[] for keeping track of this accumulated contents and flushed newline[] upon seeing the boundary; when 3b6121f (git-mailinfo: use strbuf's instead of fixed buffers, 2008-07-13) converted a fixed-length buffer in this program to use strbuf,these two buffers were converted to "line" and "prev" (the latter of which now has a much more sensible name) strbufs, but the code mistakenly flushed "line" (which contains the boundary we have just found), instead of "prev". This resulted in the first boundary to be output in front of the first line of the message. The rewritten implementation of handle_boundary() lost the terminating newline; this would then result in the second line of the message to be stuck with the first line. The is_multipart_boundary() was designed to catch both the internal boundary and the terminating one (the one with trailing "--"); this also was broken with the rewrite, and the code in the handle_boundary() to handle the terminating boundary was never triggered. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2008, 08:26:35 UTC |
| 01144f2 | Pieter de Bie | 08 August 2008, 22:37:02 UTC | builtin-rm: Add a --force flag This adds a --force flag to git-rm, making it somewhat easier for subversion people to switch. Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 August 2008, 01:27:19 UTC |
| 222566e | Eric Wong | 08 August 2008, 08:41:58 UTC | git-svn: wrap long lines in a few places Oops, I let a few patches slip by with long lines in them. Extracted from an unrelated patch by: Marcus Griep <marcus@griep.us> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 August 2008, 23:30:12 UTC |
