| ed9fe75 | Junio C Hamano | 26 November 2012, 02:40:34 UTC | Git 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2012, 02:40:34 UTC |
| 5956732 | Junio C Hamano | 26 November 2012, 02:35:50 UTC | Merge branch 'jk/checkout-out-of-unborn' into maint * jk/checkout-out-of-unborn: checkout: print a message when switching unborn branches | 26 November 2012, 02:35:50 UTC |
| ccf1bb3 | Junio C Hamano | 26 November 2012, 02:35:46 UTC | Merge branch 'cn/config-missing-path' into maint * cn/config-missing-path: config: don't segfault when given --path with a missing value | 26 November 2012, 02:35:46 UTC |
| 326922f | Junio C Hamano | 26 November 2012, 02:35:41 UTC | Merge branch 'jk/maint-gitweb-xss' into maint Fixes an XSS vulnerability in gitweb. * jk/maint-gitweb-xss: gitweb: escape html in rss title | 26 November 2012, 02:35:41 UTC |
| 4db42b3 | Marc Khouzam | 23 November 2012, 14:02:22 UTC | Completion must sort before using uniq The user can be presented with invalid completion results when trying to complete a 'git checkout' command. This can happen when using a branch name prefix that matches multiple remote branches. For example, if available branches are: master remotes/GitHub/maint remotes/GitHub/master remotes/origin/maint remotes/origin/master When performing completion on 'git checkout ma' the user will be given the choices: maint master However, 'git checkout maint' will fail in this case, although completion previously said 'maint' was valid. Furthermore, when performing completion on 'git checkout mai', no choices will be suggested. So, the user is first told that the branch name 'maint' is valid, but when trying to complete 'mai' into 'maint', that completion is no longer valid. The completion results should never propose 'maint' as a valid branch name, since 'git checkout' will refuse it. The reason for this bug is that the uniq program only works with sorted input. The man page states "uniq prints the unique lines in a sorted file". When __git_refs uses the guess heuristic employed by checkout for tracking branches it wants to consider remote branches but only if the branch name is unique. To do that, it calls 'uniq -u'. However the input given to 'uniq -u' is not sorted. Therefore, in the above example, when dealing with 'git checkout ma', "__git_refs '' 1" will find the following list: master maint master maint master which, when passed to 'uniq -u' will remain the same. Therefore 'maint' will be wrongly suggested as a valid option. When dealing with 'git checkout mai', the list will be: maint maint which happens to be sorted and will be emptied by 'uniq -u', properly ignoring 'maint'. A solution for preventing the completion script from suggesting such invalid branch names is to first call 'sort' and then 'uniq -u'. Signed-off-by: Marc Khouzam <marc.khouzam@gmail.com> Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 November 2012, 06:35:48 UTC |
| 1c03999 | Junio C Hamano | 20 November 2012, 18:16:14 UTC | Further preparation for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2012, 18:16:14 UTC |
| 91d0cd9 | Junio C Hamano | 20 November 2012, 18:15:09 UTC | Merge branch 'mg/maint-pull-suggest-upstream-to' into maint * mg/maint-pull-suggest-upstream-to: push/pull: adjust missing upstream help text to changed interface | 20 November 2012, 18:15:09 UTC |
| cf48960 | Junio C Hamano | 20 November 2012, 18:14:55 UTC | Merge branch 'mm/maint-doc-commit-edit' into maint * mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly | 20 November 2012, 18:14:55 UTC |
| cdcd793 | Junio C Hamano | 20 November 2012, 18:14:46 UTC | Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint * as/maint-doc-fix-no-post-rewrite: commit: fixup misplacement of --no-post-rewrite description | 20 November 2012, 18:14:47 UTC |
| c5afc5b | Junio C Hamano | 20 November 2012, 18:14:41 UTC | Merge branch 'rs/lock-correct-ref-during-delete' into maint * rs/lock-correct-ref-during-delete: refs: lock symref that is to be deleted, not its target | 20 November 2012, 18:14:41 UTC |
| e87719f | Junio C Hamano | 20 November 2012, 18:14:28 UTC | Merge branch 'rf/maint-mailmap-off-by-one' into maint * rf/maint-mailmap-off-by-one: mailmap: avoid out-of-bounds memory access | 20 November 2012, 18:14:29 UTC |
| 35cae74 | Junio C Hamano | 20 November 2012, 18:03:12 UTC | Merge branch 'jk/maint-diff-grep-textconv' into maint "git diff -G<pattern>" did not honor textconv filter when looking for changes. * jk/maint-diff-grep-textconv: diff_grep: use textconv buffers for add/deleted files | 20 November 2012, 18:03:12 UTC |
| fd778c0 | Junio C Hamano | 20 November 2012, 17:57:44 UTC | Merge branch 'js/format-2047' into maint Various rfc2047 quoting issues around a non-ASCII name on the From: line in the output from format-patch have been corrected. * js/format-2047: format-patch tests: check quoting/encoding in To: and Cc: headers format-patch: fix rfc2047 address encoding with respect to rfc822 specials format-patch: make rfc2047 encoding more strict format-patch: introduce helper function last_line_length() format-patch: do not wrap rfc2047 encoded headers too late format-patch: do not wrap non-rfc2047 headers too early utf8: fix off-by-one wrapping of text | 20 November 2012, 17:57:44 UTC |
| 2808f6a | Junio C Hamano | 19 November 2012, 03:47:19 UTC | Start preparing for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 November 2012, 03:47:19 UTC |
| 8b56a47 | Junio C Hamano | 19 November 2012, 03:44:36 UTC | Merge branch 'sz/maint-curl-multi-timeout' into maint Sometimes curl_multi_timeout() function suggested a wrong timeout value when there is no file descriptors to wait on and the http transport ended up sleeping for minutes in select(2) system call. A workaround has been added for this. * sz/maint-curl-multi-timeout: Fix potential hang in https handshake | 19 November 2012, 03:44:36 UTC |
| b98769e | Junio C Hamano | 19 November 2012, 03:34:09 UTC | Merge branch 'po/maint-refs-replace-docs' into maint The refs/replace hierarchy was not mentioned in the repository-layout docs. * po/maint-refs-replace-docs: Doc repository-layout: Show refs/replace | 19 November 2012, 03:34:09 UTC |
| 611addf | Junio C Hamano | 19 November 2012, 03:33:45 UTC | Merge branch 'ph/pull-rebase-detached' into maint "git pull --rebase" run while the HEAD is detached tried to find the upstream branch of the detached HEAD (which by definition does not exist) and emitted unnecessary error messages. * ph/pull-rebase-detached: git-pull: Avoid merge-base on detached head | 19 November 2012, 03:33:45 UTC |
| 78ba7e2 | Junio C Hamano | 19 November 2012, 03:33:20 UTC | Merge branch 'mm/maint-doc-remote-tracking' into maint Update "remote tracking branch" in the documentation to "remote-tracking branch". * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch | 19 November 2012, 03:33:20 UTC |
| 3a98669 | Junio C Hamano | 19 November 2012, 03:32:58 UTC | Merge branch 'rs/branch-del-symref' into maint A symbolic ref refs/heads/SYM was not correctly removed with "git branch -d SYM"; the command removed the ref pointed by SYM instead. * rs/branch-del-symref: branch: show targets of deleted symrefs, not sha1s branch: skip commit checks when deleting symref branches branch: delete symref branch, not its target branch: factor out delete_branch_config() branch: factor out check_branch_commit() | 19 November 2012, 03:32:58 UTC |
| dca5ed5 | Junio C Hamano | 19 November 2012, 03:32:30 UTC | Merge branch 'nd/grep-true-path' into maint "git grep -e pattern <tree>" asked the attribute system to read "<tree>:.gitattributes" file in the working tree, which was nonsense. * nd/grep-true-path: grep: stop looking at random places for .gitattributes | 19 November 2012, 03:32:30 UTC |
| 4607a8c | Junio C Hamano | 19 November 2012, 03:32:11 UTC | Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint "git log -F -E --grep='<ere>'" failed to use the given <ere> pattern as extended regular expression, and instead looked for the string literally. * 'jc/grep-pcre-loose-ends' (early part): log --grep: use the same helper to set -E/-F options as "git grep" revisions: initialize revs->grep_filter using grep_init() grep: move pattern-type bits support to top-level grep.[ch] grep: move the configuration parsing logic to grep.[ch] builtin/grep.c: make configuration callback more reusable | 19 November 2012, 03:32:12 UTC |
| 6c95f53 | Junio C Hamano | 19 November 2012, 03:31:40 UTC | Merge branch 'da/mergetools-p4' into maint "git mergetool" feeds /dev/null as a common ancestor when dealing with an add/add conflict, but p4merge backend cannot handle it. Work it around by passing a temporary empty file. * da/mergetools-p4: mergetools/p4merge: Handle "/dev/null" | 19 November 2012, 03:31:40 UTC |
| 3424da1 | Junio C Hamano | 19 November 2012, 03:31:13 UTC | Merge branch 'jc/test-say-color-avoid-echo-escape' into maint The "say" function in the test scaffolding incorrectly allowed "echo" to interpret "\a" as if it were a C-string asking for a BEL output. * jc/test-say-color-avoid-echo-escape: test-lib: Fix say_color () not to interpret \a\b\c in the message | 19 November 2012, 03:31:14 UTC |
| d6ecf56 | Junio C Hamano | 19 November 2012, 03:29:44 UTC | Merge branch 'bw/config-lift-variable-name-length-limit' into maint The configuration parser had an unnecessary hardcoded limit on variable names that was not checked consistently. * bw/config-lift-variable-name-length-limit: Remove the hard coded length limit on variable names in config files | 19 November 2012, 03:29:44 UTC |
| 962c38e | Carlos Martín Nieto | 15 November 2012, 18:10:01 UTC | config: don't segfault when given --path with a missing value When given a variable without a value, such as '[section] var' and asking git-config to treat it as a path, git_config_pathname returns an error and doesn't modify its output parameter. show_config assumes that the call is always successful and sets a variable to indicate that vptr should be freed. In case of an error however, trying to do this will cause the program to be killed, as it's pointing to memory in the stack. Detect the error and return immediately to avoid freeing or accessing the uninitialed memory in the stack. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2012, 02:12:17 UTC |
| afa8c07 | Jeff King | 15 November 2012, 17:12:33 UTC | checkout: print a message when switching unborn branches When we switch to a new branch using checkout, we usually output a message indicating what happened. However, when we switch from an unborn branch to a new branch, we do not print anything, which may leave the user wondering what happened. The reason is that the unborn branch is a special case (see abe1998), and does not follow the usual switch_branches code path. Let's add a similar informational message to the special case to match the usual code path. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2012, 01:36:26 UTC |
| 0f0ecf6 | Jeff King | 12 November 2012, 21:34:28 UTC | gitweb: escape html in rss title The title of an RSS feed is generated from many components, including the filename provided as a query parameter, but we failed to quote it. Besides showing the wrong output, this is a vector for XSS attacks. Signed-off-by: Jeff King <peff@peff.net> | 12 November 2012, 21:34:53 UTC |
| a3a4391 | Michael J Gruber | 06 November 2012, 10:29:01 UTC | push/pull: adjust missing upstream help text to changed interface In case of a missing upstream, the git-parse-remote script suggests: If you wish to set tracking information for this branch you can do so with: git branch --set-upstream nsiv2 origin/<branch> But --set-upstream is deprectated. Change the suggestion to: git branch --set-upstream-to=origin/<branch> nsiv2 Reported-by: Jeroen van der Ham <vdham@uva.nl> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Jeff King <peff@peff.net> | 08 November 2012, 16:32:38 UTC |
| 77effef | Andreas Schwab | 02 November 2012, 12:26:47 UTC | commit: fixup misplacement of --no-post-rewrite description In e858af6 (commit: document a couple of options) the description of the --no-post-rewrite option was put inside the paragraph for the --amend option. Move it down after the paragraph. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Jeff King <peff@peff.net> | 02 November 2012, 13:22:02 UTC |
| ae45320 | Matthieu Moy | 02 November 2012, 10:39:30 UTC | Document 'git commit --no-edit' explicitly Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Jeff King <peff@peff.net> | 02 November 2012, 11:49:28 UTC |
| b1c2f57 | Jeff King | 28 October 2012, 11:40:00 UTC | diff_grep: use textconv buffers for add/deleted files If you use "-G" to grep a diff, we will apply a configured textconv filter to the data before generating the diff. However, if the diff is an addition or deletion, we do not bother running the diff at all, and just look for the token in the added (or removed) content. This works because we know that the diff must contain every line of content. However, while we used the textconv-derived buffers in the regular diff, we accidentally passed the original unmodified buffers to regexec when checking the added or removed content. This could lead to an incorrect answer. Worse, in some cases we might have a textconv buffer but no original buffer (e.g., if we pulled the textconv data from cache, or if we reused a working tree file when generating it). In that case, we could actually feed NULL to regexec and segfault. Reported-by: Peter Oberndorfer <kumbayo84@arcor.de> Signed-off-by: Jeff King <peff@peff.net> | 28 October 2012, 11:59:44 UTC |
| 3174bc5 | Romain Francoise | 27 October 2012, 22:49:55 UTC | mailmap: avoid out-of-bounds memory access AddressSanitizer (http://clang.llvm.org/docs/AddressSanitizer.html) complains of a one-byte buffer underflow in parse_name_and_email() while running the test suite. And indeed, if one of the lines in the mailmap begins with '<', we dereference the address just before the beginning of the buffer when looking for whitespace to remove, before checking that we aren't going too far. So reverse the order of the tests to make sure that we don't read outside the buffer. Signed-off-by: Romain Francoise <romain@orebokech.com> Signed-off-by: Jeff King <peff@peff.net> | 28 October 2012, 11:50:18 UTC |
| 11fbe18 | Philip Oakley | 21 October 2012, 20:52:37 UTC | Doc repository-layout: Show refs/replace Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Jeff King <peff@peff.net> | 25 October 2012, 10:56:39 UTC |
| a6d3bde | Matthieu Moy | 23 October 2012, 11:34:05 UTC | Documentation: remote tracking branch -> remote-tracking branch This change was already done by 0e615b252f3 (Matthieu Moy, Tue Nov 2 2010, Replace "remote tracking" with "remote-tracking"), but new instances of remote tracking (without dash) were introduced in the meantime. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Jeff King <peff@peff.net> | 25 October 2012, 10:55:46 UTC |
| e980765 | Phil Hord | 23 October 2012, 20:39:56 UTC | git-pull: Avoid merge-base on detached head git pull --rebase does some clever tricks to find the base for $upstream, but it forgets that we may not have any branch at all. When this happens, git merge-base reports its "usage" help in the middle of an otherwise successful rebase operation, because git-merge is called with one too few parameters. Since we do not need the merge-base trick in the case of a detached HEAD, detect this condition and bypass the clever trick and the usage noise. Signed-off-by: Phil Hord <hordp@cisco.com> Signed-off-by: Jeff King <peff@peff.net> | 25 October 2012, 09:32:11 UTC |
| 8c7a786 | Junio C Hamano | 21 October 2012, 20:56:23 UTC | Git 1.8.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2012, 20:56:23 UTC |
| 7202b81 | Stefan Zager | 19 October 2012, 21:04:20 UTC | Fix potential hang in https handshake It has been observed that curl_multi_timeout may return a very long timeout value (e.g., 294 seconds and some usec) just before curl_multi_fdset returns no file descriptors for reading. The upshot is that select() will hang for a long time -- long enough for an https handshake to be dropped. The observed behavior is that the git command will hang at the terminal and never transfer any data. This patch is a workaround for a probable bug in libcurl. The bug only seems to manifest around a very specific set of circumstances: - curl version (from curl/curlver.h): #define LIBCURL_VERSION_NUM 0x071307 - git-remote-https running on an ubuntu-lucid VM. - Connecting through squid proxy running on another VM. Interestingly, the problem doesn't manifest if a host connects through squid proxy running on localhost; only if the proxy is on a separate VM (not sure if the squid host needs to be on a separate physical machine). That would seem to suggest that this issue is timing-sensitive. This patch is more or less in line with a recommendation in the curl docs about how to behave when curl_multi_fdset doesn't return and file descriptors: http://curl.haxx.se/libcurl/c/curl_multi_fdset.html Signed-off-by: Stefan Zager <szager@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2012, 21:15:17 UTC |
| 13baa9f | René Scharfe | 18 October 2012, 12:08:03 UTC | branch: show targets of deleted symrefs, not sha1s git branch reports the abbreviated hash of the head commit of a deleted branch to make it easier for a user to undo the operation. For symref branches this doesn't help. Print the symref target instead for them. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:36:17 UTC |
| 0fe700e | René Scharfe | 18 October 2012, 12:07:11 UTC | branch: skip commit checks when deleting symref branches Before a branch is deleted, we check that it points to a valid commit. With -d we also check that the commit is a merged; this check is not done with -D. The reason for that is that commits pointed to by branches should never go missing; if they do then something broke and it's better to stop instead of adding to the mess. And a non-merged commit may contain changes that are worth preserving, so we require the stronger option -D instead of -d to get rid of them. If a branch consists of a symref, these concerns don't apply. Deleting such a branch can't make a commit become unreferenced, so we don't need to check if it is merged, or even if it is actually a valid commit. Skip them in that case. This allows us to delete dangling symref branches. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:36:17 UTC |
| 566c770 | René Scharfe | 18 October 2012, 12:05:17 UTC | branch: delete symref branch, not its target If a branch that is to be deleted happens to be a symref to another branch, the current code removes the targeted branch instead of the one it was called for. Change this surprising behaviour and delete the symref branch instead. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:36:16 UTC |
| 22ed792 | René Scharfe | 18 October 2012, 12:04:08 UTC | branch: factor out delete_branch_config() Provide a small helper function for deleting branch config sections. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:36:16 UTC |
| f5d0e16 | René Scharfe | 18 October 2012, 12:02:51 UTC | branch: factor out check_branch_commit() Move the code to perform checks on the tip commit of a branch to its own function. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:36:16 UTC |
| 25dc8da | Jan H. Schönherr | 18 October 2012, 14:43:34 UTC | format-patch tests: check quoting/encoding in To: and Cc: headers git-format-patch does currently not parse user supplied extra header values (e. g., --cc, --add-header) and just replays them. That forces users to add them RFC 2822/2047 conform in encoded form, e.g. --cc '=?UTF-8?q?Jan=20H=2E=20Sch=C3=B6nherr?= <...>' which is inconvenient. We would want to update git-format-patch to accept human-readable input --cc 'Jan H. Schönherr <...>' and handle the encoding, wrapping and quoting internally in the future, similar to what is already done in git-send-email. The necessary code should mostly exist in the code paths that handle the From: and Subject: headers. Whether we want to do this only for the git-format-patch options --to and --cc (and the corresponding config options) or also for user supplied headers via --add-header, is open for discussion. For now, add test_expect_failure tests for To: and Cc: headers as a reminder and fix tests that would otherwise fail should this get implemented. Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:24:42 UTC |
| 41dd00b | Jan H. Schönherr | 18 October 2012, 14:43:33 UTC | format-patch: fix rfc2047 address encoding with respect to rfc822 specials According to RFC 2047 and RFC 822, rfc2047 encoded words and and rfc822 quoted strings do not mix. Since add_rfc2047() no longer leaves RFC 822 specials behind, the quoting is also no longer necessary to create a standard-conforming mail. Remove the quoting, when RFC 2047 encoding takes place. This actually requires to refactor add_rfc2047() a bit, so that the different cases can be distinguished. With this patch, my own name gets correctly decoded as Jan H. Schönherr (without quotes) and not as "Jan H. Schönherr" (with quotes). Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:24:16 UTC |
| 0fcec2c | Jan H. Schönherr | 18 October 2012, 14:43:32 UTC | format-patch: make rfc2047 encoding more strict RFC 2047 requires more characters to be encoded than it is currently done. Especially, RFC 2047 distinguishes between allowed remaining characters in encoded words in addresses (From, To, etc.) and other headers, such as Subject. Make add_rfc2047() and is_rfc2047_special() location dependent and include all non-allowed characters to hopefully be RFC 2047 conformant. This especially fixes a problem, where RFC 822 specials (e. g. ".") were left unencoded in addresses, which was solved with a non-standard-conforming workaround in the past (which is going to be removed in a follow-up patch). Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:23:34 UTC |
| f9b7204 | Jan H. Schönherr | 18 October 2012, 14:43:31 UTC | format-patch: introduce helper function last_line_length() Currently, an open-coded loop to calculate the length of the last line of a string buffer is used in multiple places. Move that code into a function of its own. Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:23:29 UTC |
| 94f6cdf | Jan H. Schönherr | 18 October 2012, 14:43:30 UTC | format-patch: do not wrap rfc2047 encoded headers too late Encoded characters add more than one character at once to an encoded header. Include all characters that are about to be added in the length calculation for wrapping. Additionally, RFC 2047 imposes a maximum line length of 76 characters if that line contains an rfc2047 encoded word. Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:23:19 UTC |
| 7a76e68 | Jan H. Schönherr | 18 October 2012, 14:43:29 UTC | format-patch: do not wrap non-rfc2047 headers too early Do not wrap the second and later lines of non-rfc2047-encoded headers substantially before the 78 character limit. Instead of passing the remaining length of the first line as wrapping width, use the correct maximum length and tell strbuf_add_wrapped_bytes() how many characters of the first line are already used. Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:23:12 UTC |
| 14e1a4e | Jan H. Schönherr | 18 October 2012, 14:43:28 UTC | utf8: fix off-by-one wrapping of text The wrapping logic in strbuf_add_wrapped_text() does currently not allow lines that entirely fill the allowed width, instead it wraps the line one character too early. For example, the text "This is the sixth commit." formatted via "%w(11,1,2)" (wrap at 11 characters, 1 char indent of first line, 2 char indent of following lines) results in four lines: " This is", " the", " sixth", " commit." This is wrong, because " the sixth" is exactly 11 characters long, and thus allowed. Fix this by allowing the (width+1) character of a line to be a valid wrapping point if it is a whitespace character. Signed-off-by: Jan H. Schönherr <schnhrr@cs.tu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2012, 21:20:49 UTC |
| 8ead1bf | Junio C Hamano | 17 October 2012, 22:55:46 UTC | Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui git-gui 0.17.0 * tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui: git-gui 0.17 git-gui: Don't prepend the prefix if value looks like a full path git-gui: Detect full path when parsing arguments git-gui: remove .git/CHERRY_PICK_HEAD after committing git-gui: Fix a loose/lose mistake git-gui: Fix semi-working shortcuts for unstage and revert git-gui: de.po: translate "remote" as "extern" git-gui: de.po: translate "bare" as "bloß" git-gui: de.po: consistently add untranslated hook names within braces git-gui: preserve commit messages in utf-8 git-gui: open console when using --trace on windows git-gui: fix a typo in po/ files git-gui: Use PWD if it exists on Mac OS X git-gui: fix git-gui crash due to uninitialized variable | 17 October 2012, 22:55:46 UTC |
| f6dd784 | Pat Thoyts | 17 October 2012, 20:57:29 UTC | git-gui 0.17 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 October 2012, 20:57:29 UTC |
| df46eda | Andrew Wong | 02 October 2012, 16:25:15 UTC | git-gui: Don't prepend the prefix if value looks like a full path When argument parsing fails to detect a file name, "git-gui" will try to use the previously detected "head" as the file name. We should avoid prepending the prefix if "head" looks like a full path. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 October 2012, 20:47:50 UTC |
| e3d06ca | Andrew Wong | 02 October 2012, 16:25:14 UTC | git-gui: Detect full path when parsing arguments When running "git-gui blame" from a subfolder (which means prefix is non-empty), if we pass a full path as argument, the argument parsing will fail to recognize the argument as a file name, because prefix is prepended to the argument. This patch handles that scenario by adding an additional branch that checks the file name without using the prefix. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 17 October 2012, 20:47:49 UTC |
| 87a5461 | Junio C Hamano | 17 October 2012, 17:39:44 UTC | Git 1.8.0-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2012, 17:39:44 UTC |
| 3d0a2d6 | Junio C Hamano | 17 October 2012, 17:37:40 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: vi.po: update from v1.8.0-rc2-4-g42e55 l10n: Update Swedish translation (1964t0f0u) | 17 October 2012, 17:37:40 UTC |
| d2bfef2 | Junio C Hamano | 17 October 2012, 17:37:32 UTC | Sync with 1.7.12.4 | 17 October 2012, 17:37:32 UTC |
| 7e20105 | Junio C Hamano | 17 October 2012, 17:36:01 UTC | Git 1.7.12.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 October 2012, 17:36:42 UTC |
| e98fa64 | Junio C Hamano | 17 October 2012, 17:29:24 UTC | Merge branch 'jk/maint-http-half-auth-push' into maint * jk/maint-http-half-auth-push: http: fix segfault in handle_curl_result | 17 October 2012, 17:29:24 UTC |
| 5a77ff7 | Junio C Hamano | 17 October 2012, 17:28:56 UTC | Merge branch 'rr/git-uri-doc' into maint * rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them | 17 October 2012, 17:28:56 UTC |
| c15fada | Junio C Hamano | 17 October 2012, 17:28:48 UTC | Merge branch 'bw/cp-a-is-gnuism' into maint * bw/cp-a-is-gnuism: tests: "cp -a" is a GNUism | 17 October 2012, 17:28:48 UTC |
| 530d710 | Junio C Hamano | 17 October 2012, 17:28:42 UTC | Merge branch 'nd/doc-ignore' into maint * nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning | 17 October 2012, 17:28:42 UTC |
| 352611f | Junio C Hamano | 17 October 2012, 17:28:34 UTC | Merge branch 'jc/doc-long-options' into maint * jc/doc-long-options: gitcli: parse-options lets you omit tail of long options | 17 October 2012, 17:28:34 UTC |
| 26c21f8 | Junio C Hamano | 17 October 2012, 17:28:19 UTC | Merge branch 'jc/maint-t1450-fsck-order-fix' into maint * jc/maint-t1450-fsck-order-fix: t1450: the order the objects are checked is undefined | 17 October 2012, 17:28:19 UTC |
| ff3ec8a | Junio C Hamano | 17 October 2012, 17:27:28 UTC | Merge branch 'rr/test-use-shell-path-not-shell' into maint * rr/test-use-shell-path-not-shell: test-lib: use $SHELL_PATH, not $SHELL | 17 October 2012, 17:27:28 UTC |
| 5178ee1 | Junio C Hamano | 17 October 2012, 17:27:21 UTC | Merge branch 'rr/test-make-sure-we-have-git' into maint * rr/test-make-sure-we-have-git: t/test-lib: make sure Git has already been built | 17 October 2012, 17:27:21 UTC |
| 756583f | Junio C Hamano | 17 October 2012, 17:27:10 UTC | Merge branch 'po/maint-docs' into maint * po/maint-docs: Doc branch: show -vv option and alternative Doc clean: add See Also link Doc add: link gitignore Doc: separate gitignore pattern sources Doc: shallow clone deepens _to_ new depth | 17 October 2012, 17:27:10 UTC |
| 8c4bcd3 | Junio C Hamano | 17 October 2012, 17:26:51 UTC | Merge branch 'jc/ll-merge-binary-ours' into maint * jc/ll-merge-binary-ours: ll-merge: warn about inability to merge binary files only when we can't attr: "binary" attribute should choose built-in "binary" merge driver merge: teach -Xours/-Xtheirs to binary ll-merge driver | 17 October 2012, 17:26:51 UTC |
| 19100d3 | Junio C Hamano | 17 October 2012, 17:25:37 UTC | Merge branch 'db/doc-custom-xmlto' into maint * db/doc-custom-xmlto: Documentation/Makefile: Allow custom XMLTO binary | 17 October 2012, 17:25:37 UTC |
| b408887 | Jiang Xin | 17 October 2012, 01:38:30 UTC | Merge branch 'master' of https://github.com/nafmo/git-l10n-sv * 'master' of https://github.com/nafmo/git-l10n-sv: l10n: Update Swedish translation (1964t0f0u) | 17 October 2012, 01:38:30 UTC |
| 0303abc | Jiang Xin | 17 October 2012, 01:37:30 UTC | Merge branch 'master' of git://github.com/vnwildman/git * 'master' of git://github.com/vnwildman/git: l10n: vi.po: update from v1.8.0-rc2-4-g42e55 | 17 October 2012, 01:37:30 UTC |
| 34a1664 | Tran Ngoc Quan | 17 October 2012, 01:15:28 UTC | l10n: vi.po: update from v1.8.0-rc2-4-g42e55 * translate 3 new messages * review quotes Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 17 October 2012, 01:15:28 UTC |
| d25c58c | Thomas Ackermann | 16 October 2012, 17:26:23 UTC | Documentation/RelNotes: remove "updated up to this revision" markers These were used to keep track of the last commit a release notes entry was written for, and should have been removed when cutting the final release. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2012, 22:35:00 UTC |
| 4a182f6 | Junio C Hamano | 16 October 2012, 20:27:23 UTC | Update draft release notes to 1.8.0 We are almost there... Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2012, 20:27:23 UTC |
| 053a08f | Junio C Hamano | 16 October 2012, 18:44:37 UTC | Merge branch 'jk/maint-http-half-auth-push' Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1) and master (v1.8.0-rc0). * jk/maint-http-half-auth-push: http: fix segfault in handle_curl_result | 16 October 2012, 18:44:37 UTC |
| 547d058 | René Scharfe | 16 October 2012, 10:22:15 UTC | refs: lock symref that is to be deleted, not its target When delete_ref is called on a symref then it locks its target and then either deletes the target or the symref, depending on whether the flag REF_NODEREF was set in the parameter delopt. Instead, simply pass the flag to lock_ref_sha1_basic, which will then either lock the target or the symref, and delete the locked ref. This reimplements part of eca35a25 (Fix git branch -m for symrefs.). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2012, 17:08:23 UTC |
| 8f69ccc | Peter Krefting | 16 October 2012, 07:38:11 UTC | l10n: Update Swedish translation (1964t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 16 October 2012, 07:38:11 UTC |
| 9306b5b | Jiang Xin | 16 October 2012, 00:39:10 UTC | l10n: Update git.pot (3 new, 6 removed messages) This po/git.pot update is generated from v1.8.0-rc2-4-g42e55. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 16 October 2012, 00:39:10 UTC |
| 6de030d | Jiang Xin | 16 October 2012, 00:31:22 UTC | Merge branch 'master' of git://github.com/vnwildman/git * 'master' of git://github.com/vnwildman/git: l10n: vi.po: update translation upto cc76011 | 16 October 2012, 00:31:22 UTC |
| 03c82da | Tran Ngoc Quan | 15 October 2012, 07:35:49 UTC | l10n: vi.po: update translation upto cc76011 * translate all new messages (100%) * review some others Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 15 October 2012, 07:35:49 UTC |
| 42e55a5 | Junio C Hamano | 14 October 2012, 06:05:54 UTC | Merge branch 'maint' * maint: Fix spelling error in post-receive-email hook | 14 October 2012, 06:05:54 UTC |
| 7703477 | Richard Fearn | 13 October 2012, 22:32:50 UTC | Fix spelling error in post-receive-email hook Signed-off-by: Richard Fearn <richardfearn@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 October 2012, 04:50:14 UTC |
| fc364c7 | Junio C Hamano | 12 October 2012, 18:36:06 UTC | Merge branch 'maint' * maint: gitweb.cgi: fix "comitter_tz" typo in feed | 12 October 2012, 18:36:06 UTC |
| 188923f | Jeff King | 12 October 2012, 06:22:49 UTC | http: fix segfault in handle_curl_result When we create an http active_request_slot, we can set its "results" pointer back to local storage. The http code will fill in the details of how the request went, and we can access those details even after the slot has been cleaned up. Commit 8809703 (http: factor out http error code handling) switched us from accessing our local results struct directly to accessing it via the "results" pointer of the slot. That means we're accessing the slot after it has been marked as finished, defeating the whole purpose of keeping the results storage separate. Most of the time this doesn't matter, as finishing the slot does not actually clean up the pointer. However, when using curl's multi interface with the dumb-http revision walker, we might actually start a new request before handing control back to the original caller. In that case, we may reuse the slot, zeroing its results pointer, and leading the original caller to segfault while looking for its results inside the slot. Instead, we need to pass a pointer to our local results storage to the handle_curl_result function, rather than relying on the pointer in the slot struct. This matches what the original code did before the refactoring (which did not use a separate function, and therefore just accessed the results struct directly). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 October 2012, 16:42:31 UTC |
| debf29d | Dylan Alex Simon | 11 October 2012, 20:40:35 UTC | gitweb.cgi: fix "comitter_tz" typo in feed gitweb's feeds sometimes contained committer timestamps in the wrong timezone due to a misspelling. Signed-off-by: Dylan Simon <dylan@dylex.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 October 2012, 15:43:12 UTC |
| 55c6168 | Nguyễn Thái Ngọc Duy | 12 October 2012, 10:49:38 UTC | grep: stop looking at random places for .gitattributes grep searches for .gitattributes using "name" field in struct grep_source but that field is not real on-disk path name. For example, "grep pattern rev" fills the field with "rev:path", and Git looks for .gitattributes in the (non-existent but exploitable) path "rev:path" instead of "path". This patch passes real paths down to grep_source_load_driver() when: - grep on work tree - grep on the index - grep a commit (or a tag if it points to a commit) so that these cases look up .gitattributes at proper paths. .gitattributes lookup is disabled in all other cases. Initial-work-by: Jeff King <peff@peff.net> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 October 2012, 15:24:44 UTC |
| 3facc60 | David Aguilar | 11 October 2012, 03:22:36 UTC | mergetools/p4merge: Handle "/dev/null" p4merge does not properly handle the case where "/dev/null" is passed as a filename. Work it around by creating a temporary file for this purpose. Reported-by: Jeremy Morton <admin@game-point.net> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Needs to be amended with Tested-by when a report comes... | 11 October 2012, 18:50:00 UTC |
| cd46259 | Junio C Hamano | 11 October 2012, 18:18:56 UTC | Git 1.8.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 October 2012, 18:18:56 UTC |
| 7bc0911 | Junio C Hamano | 11 October 2012, 17:40:36 UTC | test-lib: Fix say_color () not to interpret \a\b\c in the message When running with color disabled (e.g. under prove to produce TAP output), say_color() helper function is defined to use echo to show the message. With a message that ends with "\c", echo is allowed to interpret it as "Do not end the line with LF". Use printf "%s\n" to emit the message literally. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 October 2012, 17:40:36 UTC |
| c5fe239 | Junio C Hamano | 10 October 2012, 21:57:26 UTC | Merge branch 'rr/git-uri-doc' * rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them | 10 October 2012, 21:57:26 UTC |
| b7804cf | Junio C Hamano | 10 October 2012, 21:57:09 UTC | Merge branch 'bw/cp-a-is-gnuism' * bw/cp-a-is-gnuism: tests: "cp -a" is a GNUism | 10 October 2012, 21:57:09 UTC |
| 4321fe0 | Junio C Hamano | 10 October 2012, 21:57:02 UTC | Merge branch 'nd/doc-ignore' * nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning | 10 October 2012, 21:57:02 UTC |
| 0115042 | Junio C Hamano | 10 October 2012, 21:56:52 UTC | Merge branch 'jc/doc-long-options' * jc/doc-long-options: gitcli: parse-options lets you omit tail of long options | 10 October 2012, 21:56:52 UTC |
| 8d47dc7 | Junio C Hamano | 10 October 2012, 21:54:25 UTC | Sync with maint * maint: attr: a note about the order of .gitattributes lookup | 10 October 2012, 21:54:33 UTC |
| d5e7c0c | Junio C Hamano | 10 October 2012, 20:53:56 UTC | Merge git://bogomips.org/git-svn * git://bogomips.org/git-svn: svn test: escape peg revision separator using empty peg rev git svn: work around SVN 1.7 mishandling of svn:special changes | 10 October 2012, 20:53:56 UTC |
| 44bc5ac | Jonathan Nieder | 09 October 2012, 08:41:45 UTC | svn test: escape peg revision separator using empty peg rev This test script uses "svn cp" to create a branch with an @-sign in its name: svn cp "pr ject/trunk" "pr ject/branches/not-a@{0}reflog" That sets up for later tests that fetch the branch and check that git svn mangles the refname appropriately. Unfortunately, modern svn versions interpret path arguments with an @-sign as an example of path@revision syntax (which pegs a path to a particular revision) and truncate the path or error out with message "svn: E205000: Syntax error parsing peg revision '{0}reflog'". When using subversion 1.6.x, escaping the @ sign as %40 avoids trouble (see 08fd28bb, 2010-07-08). Newer versions are stricter: $ svn cp "$repo/pr ject/trunk" "$repo/pr ject/branches/not-a%40{reflog}" svn: E205000: Syntax error parsing peg revision '%7B0%7Dreflog' The recommended method for escaping a literal @ sign in a path passed to subversion is to add an empty peg revision at the end of the path ("branches/not-a@{0}reflog@"). Do that. Pre-1.6.12 versions of Subversion probably treat the trailing @ as another literal @-sign (svn issue 3651). Luckily ever since v1.8.0-rc0~155^2~7 (t9118: workaround inconsistency between SVN versions, 2012-07-28) the test can survive that. Tested with Debian Subversion 1.6.12dfsg-6 and 1.7.5-1 and r1395837 of Subversion trunk (1.8.x). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Tested-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 10 October 2012, 20:11:57 UTC |
| b8c78e2 | Jonathan Nieder | 09 October 2012, 10:12:39 UTC | git svn: work around SVN 1.7 mishandling of svn:special changes Subversion represents symlinks as ordinary files with content starting with "link " and the svn:special property set to "*". Thus a file can switch between being a symlink and a non-symlink simply by toggling its svn:special property, and new checkouts will automatically write a file of the appropriate type. Likewise, in subversion 1.6 and older, running "svn update" would notice changes in filetype and update the working copy appropriately. Starting in subversion 1.7 (issue 4091), changes to the svn:special property trip an assertion instead: $ svn up svn-tree Updating 'svn-tree': svn: E235000: In file 'subversion/libsvn_wc/update_editor.c' \ line 1583: assertion failed (action == svn_wc_conflict_action_edit \ || action == svn_wc_conflict_action_delete || action == \ svn_wc_conflict_action_replace) Revisions prepared with ordinary svn commands ("svn add" and not "svn propset") don't trip this because they represent these filetype changes using a replace operation, which is approximately equivalent to removal followed by adding a new file and works fine. Follow suit. Noticed using t9100. After this change, git-svn's file-to-symlink changes are sent in a format that modern "svn update" can handle and tests t9100.11-13 pass again. [ew: s,git-svn\.perl,perl/Git/SVN/Editor.pm,g] Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 10 October 2012, 20:02:33 UTC |
| 1266686 | Ramsay Jones | 06 October 2012, 17:33:08 UTC | MALLOC_CHECK: Allow checking to be disabled from config.mak The malloc checks can be disabled using the TEST_NO_MALLOC_CHECK variable, either from the environment or command line of an 'make test' invocation. In order to allow the malloc checks to be disabled from the 'config.mak' file, we add TEST_NO_MALLOC_CHECK to the environment using an export directive. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 October 2012, 18:15:35 UTC |
| 40701ad | Nguyen Thai Ngoc Duy | 10 October 2012, 13:55:52 UTC | attr: a note about the order of .gitattributes lookup This is the documentation part of 1a9d7e9 (attr.c: read .gitattributes from index as well. - 2007-08-14) 06f33c1 (Read attributes from the index that is being checked out - 2009-03-13) Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 October 2012, 18:09:20 UTC |
| 34a4ae5 | Junio C Hamano | 03 October 2012, 21:50:51 UTC | log --grep: use the same helper to set -E/-F options as "git grep" The command line option parser for "git log -F -E --grep='<ere>'" did not flip the "fixed" bit, violating the general "last option wins" principle among conflicting options. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 October 2012, 06:21:29 UTC |
| 918d4e1 | Junio C Hamano | 09 October 2012, 23:40:03 UTC | revisions: initialize revs->grep_filter using grep_init() Instead of using the hand-rolled initialization sequence, use grep_init() to populate the necessary bits. This opens the door to allow the calling commands to optionally read grep.* configuration variables via git_config() if they want to. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 October 2012, 06:21:29 UTC |
