| 9861b64 | Junio C Hamano | 10 December 2009, 23:42:30 UTC | Git 1.6.5.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 23:42:30 UTC |
| 782a000 | Junio C Hamano | 10 December 2009, 23:27:51 UTC | Fix archive format with -- on the command line Giving --format from the command line, or using output file extention to DWIM the output format, with a pathspec that is disambiguated with an explicit double-dash on the command line, e.g. git archive -o file --format=zip HEAD -- path git archive -o file.zip HEAD -- path didn't work correctly. This was because the code reordered (when one was given) or added (when the format was inferred) a --format argument at the end, effectively making it to "archive HEAD -- path --format=zip", i.e. an extra pathspec that is unlikely to match anything. The command line argument list should always be "options, revs and then paths", and we should set a good example by inserting the --format at the beginning instead. Reported-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 23:29:05 UTC |
| 1456b04 | Junio C Hamano | 10 December 2009, 20:17:11 UTC | Remove post-upload-hook This hook runs after "git fetch" in the repository the objects are fetched from as the user who fetched, and has security implications. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2009, 20:21:40 UTC |
| 5c30b8f | Junio C Hamano | 09 December 2009, 06:42:23 UTC | Merge branch 'mm/maint-merge-ff-error-message-fix' into maint * mm/maint-merge-ff-error-message-fix: builtin-merge: show user-friendly error messages for fast-forward too. merge-recursive: make the error-message generation an extern function Conflicts: merge-recursive.c | 09 December 2009, 06:42:23 UTC |
| 389e0ba | Junio C Hamano | 09 December 2009, 06:39:20 UTC | Merge branch 'jn/maint-pull-rebase-error-message' into maint * jn/maint-pull-rebase-error-message: pull: clarify advice for the unconfigured error case | 09 December 2009, 06:39:20 UTC |
| a876433 | Junio C Hamano | 09 December 2009, 06:37:50 UTC | Merge branch 'jk/maint-add-p-delete-fix' into maint * jk/maint-add-p-delete-fix: add-interactive: fix deletion of non-empty files | 09 December 2009, 06:37:50 UTC |
| 8947fdd | Jeff King | 08 December 2009, 07:49:35 UTC | add-interactive: fix deletion of non-empty files Commit 24ab81a fixed the deletion of empty files, but broke deletion of non-empty files. The approach it took was to factor out the "deleted" line from the patch header into its own hunk, the same way we do for mode changes. However, unlike mode changes, we only showed the special "delete this file" hunk if there were no other hunks. Otherwise, the user would annoyingly be presented with _two_ hunks: one for deleting the file and one for deleting the content. This meant that in the non-empty case, we forgot about the deleted line entirely, and we submitted a bogus patch to git-apply (with "/dev/null" as the destination file, but not marked as a deletion). Instead, this patch combines the file deletion hunk and the content deletion hunk (if there is one) into a single deletion hunk which is either staged or not. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2009, 07:52:46 UTC |
| aa03131 | Junio C Hamano | 05 December 2009, 19:08:35 UTC | Git 1.6.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2009, 19:08:35 UTC |
| 77cd6ab | Linus Torvalds | 04 December 2009, 20:07:47 UTC | Fix diff -B/--dirstat miscounting of newly added contents What used to happen is that diffcore_count_changes() simply ignored any hashes in the destination that didn't match hashes in the source. EXCEPT if the source hash didn't exist at all, in which case it would count _one_ destination hash that happened to have the "next" hash value. As a consequence, newly added material was often undercounted, making output from --dirstat and "complete rewrite" detection used by -B unrelialble. This changes it so that: - whenever it bypasses a destination hash (because it doesn't match a source), it counts the bytes associated with that as "literal added" - at the end (once we have used up all the source hashes), we do the same thing with the remaining destination hashes. - when hashes do match, and we use the difference in counts as a value, we also use up that destination hash entry (the 'd++'). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2009, 18:54:17 UTC |
| 952dfc6 | Jeff King | 04 December 2009, 11:11:58 UTC | reset: improve worktree safety valves The existing code checked to make sure we were not in a bare repository when doing a hard reset. However, we should take this one step further, and make sure we are in a worktree. Otherwise, we can end up munging files inside of '.git'. Furthermore, we should do the same check for --merge resets, which have the same properties. Actually, a merge reset of HEAD^ would already complain, since further down in the code we want a worktree. However, it is nicer to check up-front; then we are sure we cover all cases ("git reset --merge" would run, even though it wasn't doing anything) and we can give a more specific message. Add tests to t7103 to cover these cases and some missing ones. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2009, 18:28:20 UTC |
| 50d9bbb | Todd Zullinger | 04 December 2009, 17:53:21 UTC | Documentation: Avoid use of xmlto --stringparam The --stringparam option is not available on older xmlto versions. Instead, set man.base.url.for.relative.links via a .xsl file. Older docbook versions will ignore this without causing grief to users of older xmlto versions. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2009, 18:03:49 UTC |
| 165ca62 | René Scharfe | 04 December 2009, 23:11:01 UTC | archive: clarify description of path parameter Mention that path parameters are based on the current working directory. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> -- Documentation/git-archive.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2009, 23:16:40 UTC |
| e5f5917 | Jeff King | 04 December 2009, 10:35:57 UTC | rerere: don't segfault on failure to open rr-cache The rr-cache directory should always exist if we are doing garbage collection (earlier code paths check this explicitly), but we may not necessarily succeed in opening it (for example, due to permissions problems). In that case, we should print an error message rather than simply segfaulting. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2009, 17:11:58 UTC |
| adf9628 | Junio C Hamano | 03 December 2009, 22:07:32 UTC | Prepare for 1.6.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 22:07:32 UTC |
| dda8f4b | Junio C Hamano | 03 December 2009, 21:56:50 UTC | Merge branch 'uk/maint-shortlog-encoding' into maint * uk/maint-shortlog-encoding: t4201: use ISO8859-1 rather than ISO-8859-1 shortlog: respect commit encoding | 03 December 2009, 21:56:50 UTC |
| c8b1d76 | Junio C Hamano | 03 December 2009, 21:54:25 UTC | Merge branch 'fc/maint-format-patch-pathspec-dashes' into maint * fc/maint-format-patch-pathspec-dashes: format-patch: add test for parsing of "--" format-patch: fix parsing of "--" on the command line | 03 December 2009, 21:54:25 UTC |
| 99292c6 | Junio C Hamano | 03 December 2009, 21:54:11 UTC | Merge branch 'ap/maint-merge-strategy-list-fix' into maint * ap/maint-merge-strategy-list-fix: builtin-merge.c: call exclude_cmds() correctly. | 03 December 2009, 21:54:11 UTC |
| 78b77c4 | Junio C Hamano | 03 December 2009, 21:54:03 UTC | Merge branch 'jc/maint-am-keep' into maint * jc/maint-am-keep: Remove dead code from "git am" | 03 December 2009, 21:54:03 UTC |
| 957f5db | Junio C Hamano | 03 December 2009, 21:53:58 UTC | Merge branch 'rs/work-around-grep-opt-insanity' into maint * rs/work-around-grep-opt-insanity: Protect scripted Porcelains from GREP_OPTIONS insanity mergetool--lib: simplify guess_merge_tool() | 03 December 2009, 21:53:58 UTC |
| af742b9 | Junio C Hamano | 03 December 2009, 21:53:54 UTC | Merge branch 'rj/maint-cygwin-count-objects' into maint * rj/maint-cygwin-count-objects: git-count-objects: Fix a disk-space under-estimate on Cygwin | 03 December 2009, 21:53:54 UTC |
| 24807f9 | Junio C Hamano | 03 December 2009, 21:52:54 UTC | Merge branch 'mm/maint-hint-failed-merge' into maint * mm/maint-hint-failed-merge: user-manual: Document that "git merge" doesn't like uncommited changes. merge-recursive: point the user to commit when file would be overwritten. | 03 December 2009, 21:52:54 UTC |
| d718c19 | Junio C Hamano | 03 December 2009, 21:52:31 UTC | Merge branch 'th/maint-remote-update-help-string' into maint * th/maint-remote-update-help-string: Update 'git remote update' usage string to match man page. | 03 December 2009, 21:52:31 UTC |
| 3920917 | Junio C Hamano | 03 December 2009, 21:52:22 UTC | Merge branch 'rj/maint-t9700' into maint * rj/maint-t9700: t9700-perl-git.sh: Fix a test failure on Cygwin | 03 December 2009, 21:52:22 UTC |
| 2936824 | Junio C Hamano | 03 December 2009, 21:52:16 UTC | Merge branch 'ls/maint-mailinfo-no-inbody' into maint * ls/maint-mailinfo-no-inbody: git am/mailinfo: Don't look at in-body headers when rebasing | 03 December 2009, 21:52:16 UTC |
| 3c362d4 | Junio C Hamano | 03 December 2009, 21:52:11 UTC | Merge branch 'mo/maint-crlf-doc' into maint * mo/maint-crlf-doc: core.autocrlf documentation: mention the crlf attribute | 03 December 2009, 21:52:11 UTC |
| e24bd95 | Junio C Hamano | 03 December 2009, 21:51:53 UTC | Merge branch 'th/remote-usage' into maint * th/remote-usage: git remote: Separate usage strings for subcommands | 03 December 2009, 21:51:53 UTC |
| 9c1506a | Junio C Hamano | 03 December 2009, 21:51:41 UTC | Merge branch 'pb/maint-use-custom-perl' into maint * pb/maint-use-custom-perl: Make sure $PERL_PATH is defined when the test suite is run. | 03 December 2009, 21:51:41 UTC |
| d1dfc01 | Junio C Hamano | 03 December 2009, 21:51:36 UTC | Merge branch 'mm/config-pathname-tilde-expand' into maint * mm/config-pathname-tilde-expand: Documentation: avoid xmlto input error expand_user_path: expand ~ to $HOME, not to the actual homedir. Expand ~ and ~user in core.excludesfile, commit.template | 03 December 2009, 21:51:36 UTC |
| f2c0ca4 | Junio C Hamano | 03 December 2009, 21:51:26 UTC | Merge branch 'bc/grep-i-F' into maint * bc/grep-i-F: grep: Allow case insensitive search of fixed-strings | 03 December 2009, 21:51:26 UTC |
| 9a6b9cd | Junio C Hamano | 03 December 2009, 21:51:21 UTC | Merge branch 'jk/maint-break-rename-reduce-memory' into maint * jk/maint-break-rename-reduce-memory: diffcore-rename: reduce memory footprint by freeing blob data early diffcore-break: save cnt_data for other phases diffcore-break: free filespec data as we go | 03 December 2009, 21:51:21 UTC |
| c206224 | Junio C Hamano | 03 December 2009, 21:51:16 UTC | Merge branch 'rj/maint-simplify-cygwin-makefile' into maint * rj/maint-simplify-cygwin-makefile: Makefile: merge two Cygwin configuration sections into one | 03 December 2009, 21:51:16 UTC |
| dc733ef | Junio C Hamano | 03 December 2009, 21:50:41 UTC | Merge branch 'rg/doc-workflow' into maint * rg/doc-workflow: Add branch management for releases to gitworkflows | 03 December 2009, 21:50:41 UTC |
| ef3a4fd | Junio C Hamano | 03 December 2009, 21:50:24 UTC | Merge branch 'np/maint-sideband-favor-status' into maint * np/maint-sideband-favor-status: give priority to progress messages | 03 December 2009, 21:50:24 UTC |
| 59a0a0b | Junio C Hamano | 03 December 2009, 19:12:32 UTC | Documentation: xmlto 0.0.18 does not know --stringparam Newer DocBook stylesheets want man.base.url.for.relative.links parameter set when formatting manpages with external references to turn them into full URLs, and leave a helpful "you should set this parameter" message in the output. Earlier we added the MAN_BASE_URL make variable to specify the value for it. When MAN_BASE_URL is not given, it ought to be safe to set the parameter to empty; it would result in an empty leading path for older stylesheets that ignore the parameter, and newer ones would produce the same "relative URL" without the message. Unfortunately, older xmlto (at least version 0.0.18 released in early 2004 that comes with RHEL/CentOS 5) does not understand the --stringparam command line option, so we cannot add the parameter definition unconditionally to the command line. Work it around by passing the parameter only when set. If you do not have a suitable URL prefix, you can pass a quoted empty string to it, like so: $ make MAN_BASE_URL='""' Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 19:23:03 UTC |
| 3994e8a | Brandon Casey | 03 December 2009, 17:52:45 UTC | t4201: use ISO8859-1 rather than ISO-8859-1 Some ancient platforms do not have an extensive list of alternate names for character encodings. For example, Solaris 7 and IRIX 6.5 do not know that ISO-8859-1 is the same as ISO8859-1. Modern platforms do know this, so use the older name. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 18:06:13 UTC |
| 995fc2f | Jan Krüger | 27 November 2009, 14:17:05 UTC | pull: clarify advice for the unconfigured error case When pull --rebase fails because it cannot find what branch to merge against, the error message implies we are trying to merge. Say "rebase against" instead of "merge with" to avoid confusion. The configuration suggested to remedy the situation uses a confusing syntax, with variables specified in the dotted form accepted by 'git config' but separated from their values by the '=' delimiter used by config files. Since the user will have to edit this output anyway, it is more helpful to provide a config file snippet to paste into an editor and modify. Signed-off-by: Jan Krüger <jk@jk.gs> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 18:04:27 UTC |
| eefe19f | Junio C Hamano | 03 December 2009, 08:08:16 UTC | Git 1.6.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 08:08:16 UTC |
| 8dd35c7 | Junio C Hamano | 03 December 2009, 08:06:52 UTC | Unconditionally set man.base.url.for.relative.links Even setting it to empty is better than leaving it unset as it prevents the warning cruft from appearing in the output. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2009, 08:06:52 UTC |
| a479a56 | Junio C Hamano | 03 December 2009, 02:45:09 UTC | Documentation/Makefile: allow man.base.url.for.relative.link to be set from Make Signed-off-by: Junio C Hamano <junio@kernel.org> | 03 December 2009, 02:45:09 UTC |
| 28044ba | Junio C Hamano | 02 December 2009, 18:29:00 UTC | Prepare for 1.6.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:29:00 UTC |
| ce9d823 | Junio C Hamano | 02 December 2009, 18:00:58 UTC | merge: do not add standard message when message is given with -m option Even if the user explicitly gave her own message to "git merge", the command still added its standard merge message. It resulted in a useless repetition like this: % git merge -m "Merge early part of side branch" `git rev-parse side~2` % git show -s commit 37217141e7519629353738d5e4e677a15096206f Merge: e68e646 a1d2374 Author: しらいし ななこ <nanako3@lavabit.com> Date: Wed Dec 2 14:33:20 2009 +0900 Merge early part of side branch Merge commit 'a1d2374f8f52f4e8a53171601a920b538a6cec23' The gave her own message because she didn't want git to add the standard message (if she wanted to, she wouldn't have given one, or she would have prepared it using git-fmt-merge-msg command). Noticed by Nanako Shiraishi Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:02:08 UTC |
| 76bf488 | Junio C Hamano | 02 December 2009, 17:59:35 UTC | Do not misidentify "git merge foo HEAD" as an old-style invocation This was misinterpreted as an ancient style "git merge <message> HEAD <commit> <commit>..." that merges one (or more) <commit> into the current branch and record the resulting commit with the given message. Then a later sanity check found that there is no <commit> specified and gave a usage message. Tested-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2009, 18:01:59 UTC |
| af6fbf9 | David Aguilar | 01 December 2009, 19:27:34 UTC | help: Do not unnecessarily look for a repository Although 'git help' actually doesn't need to be run inside a git repository and uses no repository-specific information, it looks for a git directory. Searching for a git directory can be annoying in auto-mount environments. With this commit, 'git help' no longer searches for a repository when run without any options. 7c3baa9 originally modified 'git help -a' to not require a repository. This applies the same fix for 'git help'. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 20:10:09 UTC |
| 3c652d1 | Michael J Gruber | 01 December 2009, 09:19:05 UTC | Documentation: Fix a few i.e./e.g. mix-ups A git bundle can be transported by several means (such as e-mail), not only by snekaernet, so use e.g. instead of i.e. The mix-up in git-bundle.txt is obvious. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2009, 20:09:46 UTC |
| db9bc00 | David Soria Parra | 30 November 2009, 13:27:52 UTC | Documentation: Document --branch option in git clone synopsis Document the --branch option as [-b <name>] in git clones synopsis. Signed-off-by: David Soria Parra <dsp@php.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 16:47:54 UTC |
| e2ced7d | Matthieu Moy | 29 November 2009, 12:18:33 UTC | builtin-merge: show user-friendly error messages for fast-forward too. fadd069d03 (merge-recursive: give less scary messages when merge did not start, Sep 7 2009) introduced some friendlier error message for merge failure, but the messages were shown only for non-fast forward merges. This patch uses the same for fast-forward. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 07:52:40 UTC |
| 264b774 | Matthieu Moy | 29 November 2009, 12:18:32 UTC | merge-recursive: make the error-message generation an extern function The construction of the struct unpack_trees_error_msgs was done within git_merge_trees(), which prevented using the same messages easily from another function. [jc: backported for 1.6.5 maint before advice_commit_before_merge] Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 07:52:31 UTC |
| ed87465 | Avery Pennarun | 26 November 2009, 02:23:54 UTC | builtin-merge.c: call exclude_cmds() correctly. We need to call exclude_cmds() after the loop, not during the loop, because excluding a command from the array can change the indexes of objects in the array. The result is that, depending on file ordering, some commands weren't excluded as they should have been. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 November 2009, 02:49:11 UTC |
| c970a6f | Junio C Hamano | 27 November 2009, 23:06:37 UTC | Remove dead code from "git am" Ever since the initial implementation, "git am" had kept a dead code that never triggered due to a typo in the variable name. Worse yet, the code, if it weren't for the typo, would have attempted to add "[PATCH] " at the beginning of the Subject: header when "git am" is run with its "-k" option. However, because "git am -k" tells mailinfo to keep such prefix when parsing the input, the "[PATCH] " added by this dead code would have really been unnecessary duplicate. Embarrassing is that we kept _maintaining_ the codepath without anybody noticing for four years. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 23:11:47 UTC |
| 7e93d3b | Felipe Contreras | 26 November 2009, 19:12:00 UTC | format-patch: add test for parsing of "--" Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 05:23:55 UTC |
| 382da40 | Felipe Contreras | 26 November 2009, 19:11:59 UTC | format-patch: fix parsing of "--" on the command line When given a pathspec that does not match any path in the current work tree with an explicit "--": git format-patch <commit> -- <path> the command still complains that <path> does not exist in the current work tree and the user needs to explicitly specify "--" and errors out. This is because it incorrectly removes "--" from the command line arguments that is later passed to setup_revisions(). Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 05:16:54 UTC |
| ec7fc0b | Junio C Hamano | 25 November 2009, 10:56:54 UTC | builtin-apply.c: pay attention to -p<n> when determining the name The patch structure has def_name component that is used to validate the sanity of a "diff --git" patch by checking pathnames that appear on the patch header lines for consistency. The git_header_name() function is used to compute this out of "diff --git a/... b/..." line, but the code always stripped one level of prefix (i.e. "a/" and "b/"), without paying attention to -p<n> option. Code in find_name() function that parses other lines in the patch header (e.g. "--- a/..." and "+++ b/..." lines) however did strip the correct number of leading paths prefixes, and the sanity check between these computed values failed. Teach git_header_name() to honor -p<n> option like find_name() function does. Found and reported by Steven J. Murdoch who also wrote tests. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2009, 03:02:24 UTC |
| 79f7ca0 | Uwe Kleine-König | 25 November 2009, 19:33:28 UTC | shortlog: respect commit encoding Don't take the author name information without re-encoding from the raw commit object buffer. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 November 2009, 23:36:54 UTC |
| 4f36627 | Nicolas Pitre | 23 November 2009, 17:43:50 UTC | pack-objects: split implications of --all-progress from progress activation Currently the --all-progress flag is used to use force progress display during the writing object phase even if output goes to stdout which is primarily the case during a push operation. This has the unfortunate side effect of forcing progress display even if stderr is not a terminal. Let's introduce the --all-progress-implied argument which has the same intent except for actually forcing the activation of any progress display. With this, progress display will be automatically inhibited whenever stderr is not a terminal, or full progress display will be included otherwise. This should let people use 'git push' within a cron job without filling their logs with useless percentage displays. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Tested-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 05:33:09 UTC |
| 0b624b4 | Stephen Boyd | 23 November 2009, 07:09:12 UTC | instaweb: restart server if already running Running 'git instaweb' when an instaweb server is already running will fail (at least when the port is the same) and overwrite the pid file used to track the currently running server. This turns out to be especially annoying when the user tries to stop the previously running server with 'git instaweb --stop' and is instead greeted with an error message because the pid file has been destroyed. Instead of allowing a user to start two instaweb servers, stop the currently running server first and then start the new one. This should be fine because it was never really possible to start two instaweb servers in the first place due to the pid file issue outlined above. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 05:31:01 UTC |
| 1ddf5ef | Jeff King | 24 November 2009, 03:07:42 UTC | prune-packed: only show progress when stderr is a tty This matches the behavior of other git programs, and helps keep cruft out of things like cron job output. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 05:29:45 UTC |
| e1622bf | Junio C Hamano | 23 November 2009, 23:56:32 UTC | Protect scripted Porcelains from GREP_OPTIONS insanity If the user has exported the GREP_OPTIONS environment variable, the output from "grep" and "egrep" in scripted Porcelains may be different from what they expect. For example, we may want to count number of matching lines, by "grep" piped to "wc -l", and GREP_OPTIONS=-C3 will break such use. The approach taken by this change to address this issue is to protect only our own use of grep/egrep. Because we do not unset it at the beginning of our scripts, hook scripts run from the scripted Porcelains are exposed to the same insanity this environment variable causes when grep/egrep is used to implement logic (e.g. "grep | wc -l"), and it is entirely up to the hook scripts to protect themselves. On the other hand, applypatch-msg hook may want to show offending words in the proposed commit log message using grep to the end user, and the user might want to set GREP_OPTIONS=--color to paint the match more visibly. The approach to protect only our own use without unsetting the environment variable globally will allow this use case. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 November 2009, 00:31:07 UTC |
| 7b10422 | René Scharfe | 23 November 2009, 23:29:17 UTC | mergetool--lib: simplify guess_merge_tool() Use a case statement instead of calling grep to find out if the editor's name contains the string "vim". Remove the check for emacs, as this branch did the same as the default one anyway. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 23:38:04 UTC |
| e63ec00 | Matthieu Moy | 22 November 2009, 22:26:18 UTC | user-manual: Document that "git merge" doesn't like uncommited changes. We explain the user why uncommited changes can be problematic with merge, and point to "commit" and "stash" for the solution. While talking about commited Vs uncommited changes, we also make it clear that the result of a merge is normally commited. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 00:07:28 UTC |
| 4c371f9 | Matthieu Moy | 22 November 2009, 22:26:17 UTC | merge-recursive: point the user to commit when file would be overwritten. The commit-before-pull is well accepted in the DVCS community, but is confusing some new users. This should get them back in the right way when the problem occurs. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2009, 00:07:27 UTC |
| 0f7fb21 | Junio C Hamano | 21 November 2009, 08:37:26 UTC | Documentation: avoid xmlto input error Do not write literal "~/" or "~user" but use "{tilde}/" and "{tilde}user"; otherwise the text between them gets enclosed in "<subscript>...</subscript>". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 08:37:26 UTC |
| 382e543 | Raman Gupta | 12 November 2009, 19:46:04 UTC | Add branch management for releases to gitworkflows The current man page does a reasonable job at describing branch management during the development process, but it does not contain any guidance as to how the branches are affected by releases. Add a basic introduction to the branch management undertaken during a git.git release, so that a reader may gain some insight into how the integration, maintenance, and topic branches are affected during the release transition, and is thus able to better design the process for their own project. Other release activities such as reviews, testing, and creating distributions are currently out of scope. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 07:39:58 UTC |
| d25e515 | Lukas Sandström | 20 November 2009, 16:12:47 UTC | git am/mailinfo: Don't look at in-body headers when rebasing When we are rebasing we know that the header lines in the patch are good and that we don't need to pick up any headers from the body of the patch. This makes it possible to rebase commits whose commit message start with "From" or "Date". Test vectors by Jeff King. Signed-off-by: Lukas Sandström <luksan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 07:14:02 UTC |
| 4504107 | Tim Henigan | 20 November 2009, 23:43:13 UTC | git remote: Separate usage strings for subcommands When the usage string for a subcommand must be printed, only print the information relevant to that command. This commit also removes the complete options list from the first line of the subcommand usage string. Instead, individual options are documented in the detailed description following the general usage line. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 06:15:30 UTC |
| 809809b | Junio C Hamano | 21 November 2009, 06:13:47 UTC | diffcore-rename: reduce memory footprint by freeing blob data early After running one round of estimate_similarity(), filespecs on either side will have populated their cnt_data fields, and we do not need the blob text anymore. We used to retain the blob data to optimize for smaller projects (not freeing the blob data here would mean that the final output phase would not have to re-read it), but we are efficient enough without such optimization for smaller projects anyway, and freeing memory early will help larger projects. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2009, 06:13:47 UTC |
| 7560787 | Ramsay Jones | 19 November 2009, 18:46:24 UTC | git-count-objects: Fix a disk-space under-estimate on Cygwin Cygwin has st_blocks in struct stat, but at least on NTFS, the field counts in blocks of st_blksize bytes, not in 512-byte blocks. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2009, 07:41:29 UTC |
| aa8dc96 | Greg Price | 19 November 2009, 20:58:29 UTC | Documentation: undocument gc'd function graph_release() graph_release() was removed in 064bfbd. Cut it from the API documentation and a comment. Signed-off-by: Greg Price <price@ksplice.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2009, 07:05:17 UTC |
| 81f4026 | Ramsay Jones | 19 November 2009, 18:41:20 UTC | t9700-perl-git.sh: Fix a test failure on Cygwin The t/t9700/test.pl script uses method invocation syntax when using the Cwd module to determine the current working directory. This fails on cygwin, since cygwin perl specifically checks for any arguments to the cwd() function and croak()'s with the message "Usage: Cwd::cwd()". (In perl v5.8.8 distribution, see the file perl-5.8.8/cygwin/cygwin.c lines 139-157) In order to avoid the problem, we replace the method invocation syntax with a simple function call. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2009, 07:01:09 UTC |
| df2a79f | Matthieu Moy | 19 November 2009, 15:21:15 UTC | expand_user_path: expand ~ to $HOME, not to the actual homedir. In 395de250d (Expand ~ and ~user in core.excludesfile, commit.template), we introduced the mechanism. But expanding ~ using getpw is not what people overriding $HOME would usually expect. In particular, git looks for the user's .gitconfig using $HOME, so it's better to be consistent. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 November 2009, 18:01:12 UTC |
| 395de25 | Matthieu Moy | 17 November 2009, 17:24:25 UTC | Expand ~ and ~user in core.excludesfile, commit.template These config variables are parsed to substitute ~ and ~user with getpw entries. user_path() refactored into new function expand_user_path(), to allow dynamically allocating the return buffer. Original patch by Karl Chen, modified by Matthieu Moy, and further amended by Junio C Hamano. Signed-off-by: Karl Chen <quarl@quarl.org> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2009, 05:53:11 UTC |
| be38ca3 | Philippe Bruhat (BooK) | 17 November 2009, 08:42:39 UTC | Make sure $PERL_PATH is defined when the test suite is run. Some test scripts run Perl scripts as if they were git-* scripts, and thus need to use the same perl that will be put in the shebang line of git*.perl commands. $PERL_PATH therefore needs to be used instead of a bare "perl". The tests can fail if another perl is found in $PATH before the one defined in $PERL_PATH. Example test failure caused by this: the perl defined in $PERL_PATH has Error.pm installed, and therefore the Git.pm's Makefile.PL doesn't install the private copy. The perl from $PATH doesn't have Error.pm installed, and all git*.perl scripts invoked during the test will fail loading Error.pm. Makefile patch by Jeff King <peff@peff.net>. Signed-off-by: Philippe Bruhat (BooK) <book@cpan.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2009, 16:37:03 UTC |
| ff68668 | Matthew Ogilvie | 14 November 2009, 18:35:00 UTC | core.autocrlf documentation: mention the crlf attribute The description of the configuration variable is obsolete and wrong (saying only file content is used), not just incomplete. It has used the attribute mechanism for a long time. The documentation of gitattributes mentions the core.autocrlf configuration variable in its description of crlf attribute. Refer to the gitattributes documentation from here as well. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2009, 06:32:05 UTC |
| 5183bf6 | Brian Collins | 06 November 2009, 09:22:35 UTC | grep: Allow case insensitive search of fixed-strings "git grep" currently an error when you combine the -F and -i flags. This isn't in line with how GNU grep handles it. This patch allows the simultaneous use of those flags. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Brian Collins <bricollins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2009, 00:06:46 UTC |
| 8282de9 | Jeff King | 16 November 2009, 16:02:02 UTC | diffcore-break: save cnt_data for other phases The "break" phase works by counting changes between two blobs with the same path. We do this by splitting the file into chunks (or lines for text oriented files) and then keeping a count of chunk hashes. The "rename" phase counts changes between blobs at two different paths. However, it uses the exact same set of chunk hashes (which are immutable for a given sha1). The rename phase can therefore use the same hash data as break. Unfortunately, we were throwing this data away after computing it in the break phase. This patch instead attaches it to the filespec and lets it live through the rename phase, working under the assumption that most of the time that breaks are being computed, renames will be too. We only do this optimization for files which have actually been broken, as those ones will be candidates for rename detection (and it is a time-space tradeoff, so we don't want to waste space keeping useless data). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 21:21:12 UTC |
| f4f19fb | Jeff King | 16 November 2009, 15:56:25 UTC | diffcore-break: free filespec data as we go As we look at each changed file and consider breaking it, we load the blob data and make a decision about whether to break, which is independent of any other blobs that might have changed. However, we keep the data in memory while we consider breaking all of the other files. Which means that both versions of every file you are diffing are in memory at the same time. This patch instead frees the blob data as we finish with each file pair, leading to much lower memory usage. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 21:21:11 UTC |
| 080cbc1 | Junio C Hamano | 16 November 2009, 08:05:12 UTC | Git 1.6.5.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2009, 08:05:12 UTC |
| c6b53c8 | Junio C Hamano | 16 November 2009, 08:03:15 UTC | Merge branch 'bs/maint-pre-commit-hook-sample' into maint * bs/maint-pre-commit-hook-sample: pre-commit.sample: Diff against the empty tree when HEAD is invalid | 16 November 2009, 08:03:15 UTC |
| 5e9cb86 | Junio C Hamano | 16 November 2009, 08:02:44 UTC | Merge branch 'jk/maint-add-p-empty' into maint * jk/maint-add-p-empty: add-interactive: handle deletion of empty files | 16 November 2009, 08:02:44 UTC |
| d404a3e | Junio C Hamano | 16 November 2009, 08:01:56 UTC | Merge branch 'js/maint-diff-color-words' into maint * js/maint-diff-color-words: diff --color-words: bit of clean-up diff --color-words -U0: fix the location of hunk headers t4034-diff-words: add a test for word diff without context Conflicts: diff.c | 16 November 2009, 08:01:56 UTC |
| ee16339 | Junio C Hamano | 16 November 2009, 07:08:42 UTC | Merge branch 'tz/maint-rpm' into maint * tz/maint-rpm: Makefile: Ensure rpm packages can be read by older rpm versions | 16 November 2009, 07:08:42 UTC |
| 1f9d282 | Junio C Hamano | 16 November 2009, 07:07:49 UTC | Merge branch 'jk/maint-format-patch-p-suppress-stat' into maint * jk/maint-format-patch-p-suppress-stat: format-patch: make "-p" suppress diffstat | 16 November 2009, 07:07:49 UTC |
| 3ad1243 | Junio C Hamano | 16 November 2009, 07:07:38 UTC | Merge branch 'pb/maint-gitweb-blob-lineno' into maint * pb/maint-gitweb-blob-lineno: gitweb: Fix blob linenr links in pathinfo mode | 16 November 2009, 07:07:38 UTC |
| 958742b | Junio C Hamano | 16 November 2009, 07:07:32 UTC | Merge branch 'jk/maint-1.6.3-ls-files-i' into maint * jk/maint-1.6.3-ls-files-i: ls-files: unbreak "ls-files -i" | 16 November 2009, 07:07:32 UTC |
| 3e606ea | Junio C Hamano | 16 November 2009, 07:07:27 UTC | Merge branch 'vl/maint-openssl-signature-change' into maint * vl/maint-openssl-signature-change: imap-send.c: fix compiler warnings for OpenSSL 1.0 | 16 November 2009, 07:07:27 UTC |
| 8d324bf | Junio C Hamano | 16 November 2009, 07:07:17 UTC | Merge branch 'jk/maint-push-config' into maint * jk/maint-push-config: push: always load default config | 16 November 2009, 07:07:17 UTC |
| 061c4d0 | Junio C Hamano | 16 November 2009, 07:07:07 UTC | Merge branch 'sr/blame-incomplete' into maint * sr/blame-incomplete: blame: make sure that the last line ends in an LF | 16 November 2009, 07:07:07 UTC |
| 6dbdba0 | Junio C Hamano | 16 November 2009, 07:06:34 UTC | Merge branch 'jc/maint-blank-at-eof' into maint * jc/maint-blank-at-eof: diff -B: colour whitespace errors diff.c: emit_add_line() takes only the rest of the line diff.c: split emit_line() from the first char and the rest of the line diff.c: shuffling code around diff --whitespace: fix blank lines at end core.whitespace: split trailing-space into blank-at-{eol,eof} diff --color: color blank-at-eof diff --whitespace=warn/error: fix blank-at-eof check diff --whitespace=warn/error: obey blank-at-eof diff.c: the builtin_diff() deals with only two-file comparison apply --whitespace: warn blank but not necessarily empty lines at EOF apply --whitespace=warn/error: diagnose blank at EOF apply.c: split check_whitespace() into two apply --whitespace=fix: detect new blank lines at eof correctly apply --whitespace=fix: fix handling of blank lines at the eof | 16 November 2009, 07:06:34 UTC |
| dd2195e | Junio C Hamano | 16 November 2009, 00:38:47 UTC | Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint * jc/maint-1.6.3-graft-trailing-space: info/grafts: allow trailing whitespaces at the end of line | 16 November 2009, 00:38:47 UTC |
| 69abb19 | Junio C Hamano | 16 November 2009, 00:38:36 UTC | Merge branch 'tr/maint-roff-quote' into maint * tr/maint-roff-quote: Quote ' as \(aq in manpages | 16 November 2009, 00:38:36 UTC |
| f411c43 | Junio C Hamano | 16 November 2009, 00:38:18 UTC | Merge branch 'ja/fetch-doc' into maint * ja/fetch-doc: Documentation/merge-options.txt: order options in alphabetical groups Documentation/git-pull.txt: Add subtitles above included option files Documentation/fetch-options.txt: order options alphabetically | 16 November 2009, 00:38:18 UTC |
| 077f3d4 | Junio C Hamano | 16 November 2009, 00:37:58 UTC | Merge branch 'cb/doc-fetch-pull-merge' into maint * cb/doc-fetch-pull-merge: modernize fetch/merge/pull examples | 16 November 2009, 00:37:58 UTC |
| 04b3577 | Junio C Hamano | 16 November 2009, 00:37:53 UTC | Merge branch 'jk/maint-cvsimport-pathname' into maint * jk/maint-cvsimport-pathname: cvsimport: fix relative argument filenames | 16 November 2009, 00:37:53 UTC |
| a25a2cd | Junio C Hamano | 16 November 2009, 00:37:49 UTC | Merge branch 'jc/receive-pack-auto' into maint * jc/receive-pack-auto: receive-pack: run "gc --auto --quiet" and optionally "update-server-info" gc --auto --quiet: make the notice a bit less verboase | 16 November 2009, 00:37:49 UTC |
| 14d52b2 | Junio C Hamano | 16 November 2009, 00:37:39 UTC | Merge branch 'gb/maint-gitweb-esc-param' into maint * gb/maint-gitweb-esc-param: gitweb: fix esc_param | 16 November 2009, 00:37:39 UTC |
| 9453f8a | Junio C Hamano | 16 November 2009, 00:37:36 UTC | Merge branch 'jn/gitweb-patch' into maint * jn/gitweb-patch: gitweb: Do not show 'patch' link for merge commits | 16 November 2009, 00:37:36 UTC |
| 997c2a4 | Tim Henigan | 15 November 2009, 19:46:25 UTC | Update 'git remote update' usage string to match man page. Commit b344e161 taught 'git remote update' to understand [group | remote] as its argument. The man page was updated to document this change, but the usage string was not. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 November 2009, 20:24:46 UTC |
| a96e9c2 | Todd Zullinger | 11 November 2009, 21:59:52 UTC | Makefile: Ensure rpm packages can be read by older rpm versions The kernel.org hosts where the packages are built are now using Fedora 11, which defaults to sha256 for file digests instead of md5. Older versions of rpm can not handle these packages. Tell rpmbuild to use md5 file digests for better compatibility. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 November 2009, 23:52:39 UTC |
| 46ada61 | Stephen Boyd | 14 November 2009, 01:45:46 UTC | git-add.txt: fix formatting of --patch section Extra paragraphs should be prefixed with a plus sign. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 November 2009, 08:26:37 UTC |
| 6b59f51 | Nicolas Pitre | 11 November 2009, 22:24:42 UTC | give priority to progress messages In theory it is possible for sideband channel #2 to be delayed if pack data is quick to come up for sideband channel #1. And because data for channel #2 is read only 128 bytes at a time while pack data is read 8192 bytes at a time, it is possible for many pack blocks to be sent to the client before the progress message fifo is emptied, making the situation even worse. This would result in totally garbled progress display on the client's console as local progress gets mixed with partial remote progress lines. Let's prevent such situations by giving transmission priority to progress messages over pack data at all times. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2009, 22:39:25 UTC |
| 9deec58 | Junio C Hamano | 11 November 2009, 04:45:23 UTC | check-ref-format -h: it does not know the --print option yet Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 November 2009, 04:45:23 UTC |
