[ANNOUNCE] Git v2.4.6

2015-07-15 Thread Junio C Hamano
): doc: format-patch: fix typo Jeff King (2): ewah: use less generic macro name Revert stash: require a clean index to apply Joe Cridge (1): git-prompt.sh: document GIT_PS1_STATESEPARATOR Junio C Hamano (2): format-patch: do not feed tags to clear_commit_marks

[ANNOUNCE] Git v2.5.0-rc2

2015-07-13 Thread Junio C Hamano
c Sunshine, Fredrik Gustafsson, Jean-Noel Avila, Jeff King, Jim Hill, Johannes Schindelin, Johannes Sixt, Jonathan Nieder, Junio C Hamano, Karsten Blees, Karthik Nayak, Luke Diamand, Matthieu Moy, Max Kirillov, Michael Coleman, Michael Haggerty, Michael J Gruber, Mike Hommey, Nguyễn Thái Ngọc Du

[ANNOUNCE] Git v2.5.0-rc2

2015-07-13 Thread Junio C Hamano
, Fredrik Gustafsson, Jean-Noel Avila, Jeff King, Jim Hill, Johannes Schindelin, Johannes Sixt, Jonathan Nieder, Junio C Hamano, Karsten Blees, Karthik Nayak, Luke Diamand, Matthieu Moy, Max Kirillov, Michael Coleman, Michael Haggerty, Michael J Gruber, Mike Hommey, Nguyễn Thái Ngọc Duy, Patrick

[ANNOUNCE] Git v2.5.0-rc1

2015-07-01 Thread Junio C Hamano
ck-file later to maint). (merge 309a9e3 jk/skip-http-tests-under-no-curl later to maint). (merge ccd593c dl/branch-error-message later to maint). (merge 22570b6 rs/janitorial later to maint). (merge 5c2a581 mc/commit-doc-grammofix later to maint). (merge ce41720 ah/usage-strings lat

[ANNOUNCE] Git v2.5.0-rc1

2015-07-01 Thread Junio C Hamano
-doc later to maint). Changes since v2.5.0-rc0 are as follows: Joe Cridge (1): git-prompt.sh: document GIT_PS1_STATESEPARATOR Junio C Hamano (1): Git 2.5.0-rc1 Matthieu Moy (1): Documentation/describe: improve

[ANNOUNCE] Git v2.5.0-rc0

2015-06-25 Thread Junio C Hamano
continued support. Alex Henrie, brian m. carlson, Carlos Martín Nieto, Charles Bailey, David Aguilar, David Turner, Dennis Kaarsemaker, Elia Pinto, Eric Sunshine, Fredrik Gustafsson, Jean-Noel Avila, Jeff King, Jim Hill, Johannes Sixt, Jonathan Nieder, Junio C Hamano, Karthik Nayak, Luke

[ANNOUNCE] Git v2.4.5

2015-06-25 Thread Junio C Hamano
setup_git_directory: delay core.bare/core.worktree errors add quieter versions of parse_{tree,commit} silence broken link warnings with revs->ignore_missing_links suppress errors on missing UNINTERESTING links Junio C Hamano (3): t5407: use <<- to align the

[ANNOUNCE] Git v2.4.5

2015-06-25 Thread Junio C Hamano
quieter versions of parse_{tree,commit} silence broken link warnings with revs-ignore_missing_links suppress errors on missing UNINTERESTING links Junio C Hamano (3): t5407: use - to align the expected output xmmap(): drop Out of memory? Git 2.4.5 Matthieu Moy (2

[ANNOUNCE] Git v2.5.0-rc0

2015-06-25 Thread Junio C Hamano
continued support. Alex Henrie, brian m. carlson, Carlos Martín Nieto, Charles Bailey, David Aguilar, David Turner, Dennis Kaarsemaker, Elia Pinto, Eric Sunshine, Fredrik Gustafsson, Jean-Noel Avila, Jeff King, Jim Hill, Johannes Sixt, Jonathan Nieder, Junio C Hamano, Karthik Nayak, Luke

[ANNOUNCE] Git v2.4.4

2015-06-16 Thread Junio C Hamano
e: reorder --dissociate and --reference options Jim Hill (1): sha1_file: pass empty buffer to index empty file Junio C Hamano (1): Git 2.4.4 Matthieu Moy (2): Documentation/log: clarify what --raw means Documentation/log: clarify sha1 non-abbreviation in log --raw Michael Col

[ANNOUNCE] Git v2.4.4

2015-06-16 Thread Junio C Hamano
): sha1_file: pass empty buffer to index empty file Junio C Hamano (1): Git 2.4.4 Matthieu Moy (2): Documentation/log: clarify what --raw means Documentation/log: clarify sha1 non-abbreviation in log --raw Michael Coleman (1): Documentation/git-commit: grammofix Michael J Gruber (3

[ANNOUNCE] Git v2.4.3

2015-06-05 Thread Junio C Hamano
doc/add: reformat `--edit` option doc: convert \--option to --option doc: drop backslash quoting of some curly braces doc: put example URLs and emails inside literal backticks doc: convert AsciiDoc {?foo} to ifdef::foo[] rerere: exit silently on "forget"

[ANNOUNCE] Git v2.4.3

2015-06-05 Thread Junio C Hamano
to --option doc: drop backslash quoting of some curly braces doc: put example URLs and emails inside literal backticks doc: convert AsciiDoc {?foo} to ifdef::foo[] rerere: exit silently on forget when rerere is disabled Junio C Hamano (7): t0302: unreadable test needs

[ANNOUNCE] Git v2.4.2

2015-05-26 Thread Junio C Hamano
h-object --literally tests Jeff King (7): limit_list: avoid quadratic behavior from still_interesting t3903: stop hard-coding commit sha1s t3903: avoid applying onto dirty index stash: require a clean index to apply stop putting argv[0] dirname at front of PATH

[ANNOUNCE] Git v2.4.2

2015-05-26 Thread Junio C Hamano
commit sha1s t3903: avoid applying onto dirty index stash: require a clean index to apply stop putting argv[0] dirname at front of PATH rebase: silence git checkout for noop rebase filter-branch: avoid passing commit message through sed Junio C Hamano (3

[ANNOUNCE] Git v2.4.1

2015-05-13 Thread Junio C Hamano
t core.worktree when initializing /.git type_from_string_gently: make sure length matches reachable: only mark local objects as recent sha1_file: freshen pack objects before loose sha1_file: only freshen packs once per run Junio C Hamano (10): diff-no-

[ANNOUNCE] Git v2.4.1

2015-05-13 Thread Junio C Hamano
reachable: only mark local objects as recent sha1_file: freshen pack objects before loose sha1_file: only freshen packs once per run Junio C Hamano (10): diff-no-index: DWIM diff D F into diff D/F F diff-no-index: align D/F handling with that of normal Git

[ANNOUNCE] Git v2.3.8

2015-05-11 Thread Junio C Hamano
--date=now" or anything that relies on approxidate lost the daylight-saving-time offset. Also contains typofixes, documentation updates and trivial code clean-ups. -------- Changes since v2.3.7 are as follows: Junio C Hamano (5):

[ANNOUNCE] Git v2.3.8

2015-05-11 Thread Junio C Hamano
-saving-time offset. Also contains typofixes, documentation updates and trivial code clean-ups. Changes since v2.3.7 are as follows: Junio C Hamano (5): diff-no-index: DWIM diff D F into diff D/F F diff-no-index: align D/F

[ANNOUNCE] Git v2.4.0

2015-04-30 Thread Junio C Hamano
-Noel Avila, Jeff King, Jiang Xin, Johannes Sixt, John Keeping, John Szakmeister, Jonathan Nieder, Jonathon Mah, Junio C Hamano, Kirill A. Shutemov, Kyle J. McKay, Lukas Fleischer, Luke Diamand, Mårten Kongstad, Matthieu Moy, Max Kirillov, Michael Haggerty, Michael J Gruber, Michal Sojka

[ANNOUNCE] Git v2.4.0

2015-04-30 Thread Junio C Hamano
-Noel Avila, Jeff King, Jiang Xin, Johannes Sixt, John Keeping, John Szakmeister, Jonathan Nieder, Jonathon Mah, Junio C Hamano, Kirill A. Shutemov, Kyle J. McKay, Lukas Fleischer, Luke Diamand, Mårten Kongstad, Matthieu Moy, Max Kirillov, Michael Haggerty, Michael J Gruber, Michal Sojka

[ANNOUNCE] Git v2.3.7

2015-04-27 Thread Junio C Hamano
d trivial code clean-ups. Changes since v2.3.6 are as follows: Junio C Hamano (2): push --signed: tighten what the receiving end can ask to sign Git 2.3.7 Márcio Almada (1): completion: fix global bash variable lea

[ANNOUNCE] Git v2.3.7

2015-04-27 Thread Junio C Hamano
. Changes since v2.3.6 are as follows: Junio C Hamano (2): push --signed: tighten what the receiving end can ask to sign Git 2.3.7 Márcio Almada (1): completion: fix global bash variable leak on __gitcompappend

[ANNOUNCE] Git v2.4.0-rc3

2015-04-22 Thread Junio C Hamano
-index-v4 later to maint). (merge 599d223 jk/simplify-csum-file-sha1fd-check later to maint). (merge 260d585 sg/completion-gitcomp-nl-for-refs later to maint). (merge 777c55a jc/report-path-error-to-dir later to maint). (merge fddfaf8 ph/push-doc-cas later to maint). (merge d50d

[ANNOUNCE] Git v2.4.0-rc3

2015-04-22 Thread Junio C Hamano
a 'recursive' checkbox in the clone menu. Junio C Hamano (6): push --signed: tighten what the receiving end can ask to sign Revert merge: pass verbosity flag down to merge-recursive Hopefully the last batch for 2.4 RelNotes: merge --quiet change has been reverted Git 2.3.6

[ANNOUNCE] Git v2.3.6

2015-04-21 Thread Junio C Hamano
. Welcome to the Git development community! Ivan Ukhov, Jérôme Zago, Julian Gindi, and Paul Tan. Returning contributors who helped this release are as follows. Thanks for your continued support. Jeff King, Jonathan Nieder, Junio C Hamano, and Kyle J. McKay

[ANNOUNCE] Git v2.3.6

2015-04-21 Thread Junio C Hamano
. Welcome to the Git development community! Ivan Ukhov, Jérôme Zago, Julian Gindi, and Paul Tan. Returning contributors who helped this release are as follows. Thanks for your continued support. Jeff King, Jonathan Nieder, Junio C Hamano, and Kyle J. McKay

[ANNOUNCE] Git v2.4.0-rc2

2015-04-14 Thread Junio C Hamano
es since v2.4.0-rc1 are as follows: Alex Henrie (2): l10n: ca.po: update translation l10n: ca.po: update translation Alexander Shopov (1): l10n: Updated Bulgarian translation of git (2305t,0f,0u) Dimitriy Ryazantcev (3): l10n: ru: added Russian translation l10n: ru

[ANNOUNCE] Git v2.4.0-rc2

2015-04-14 Thread Junio C Hamano
): streaming.c: fix a memleak Jonathan Nieder (1): fast-import doc: remove suggested 16-parent limit Julian Gindi (1): CodingGuidelines: update 'rough' rule count Junio C Hamano (2): push-to-deploy: allow pushing into an unborn branch and updating it Git 2.4.0-rc2 Jérôme Zago (1

[ANNOUNCE] Git v2.4.0-rc1

2015-04-02 Thread Junio C Hamano
(merge 9bdc517 ct/prompt-untracked-fix later to maint). * Code cleanups and documentation updates. (merge 2ce63e9 rs/simple-cleanups later to maint). (merge 33baa69 rj/no-xopen-source-for-cygwin later to maint). (merge 817d03e jc/diff-test-updates later to maint). (merge eb32c66 ak/t5516

[ANNOUNCE] Git v2.4.0-rc1

2015-04-02 Thread Junio C Hamano
to maint). (merge fddfaf8 ph/push-doc-cas later to maint). (merge 129260c ss/pull-rebase-preserve later to maint). Changes since v2.4.0-rc0 are as follows: Junio C Hamano (6): add_to_index(): free unused cache-entry

[ANNOUNCE] Git v2.3.5

2015-03-31 Thread Junio C Hamano
weren't in v2.3.4 are as follows. Welcome to the Git development community! Cody A Taylor, and Wilhelm Schuermann. Returning contributors who helped this release are as follows. Thanks for your continued support. Jeff King, John Szakmeister, Junio C Hamano, Nguyễn Thái Ngọc Duy, Phil Hord

[ANNOUNCE] Git v2.3.5

2015-03-31 Thread Junio C Hamano
weren't in v2.3.4 are as follows. Welcome to the Git development community! Cody A Taylor, and Wilhelm Schuermann. Returning contributors who helped this release are as follows. Thanks for your continued support. Jeff King, John Szakmeister, Junio C Hamano, Nguyễn Thái Ngọc Duy, Phil Hord

[ANNOUNCE] Git v2.4.0-rc0

2015-03-26 Thread Junio C Hamano
An early preview release Git v2.4.0-rc0 is now available for testing at the usual places. This cycle is turning out to be a "product excellence" release---majority of the changes are bugfixes, about one-third of which are also already in the v2.3.x maintenance track. The tarballs are found at:

[ANNOUNCE] Git v2.4.0-rc0

2015-03-26 Thread Junio C Hamano
An early preview release Git v2.4.0-rc0 is now available for testing at the usual places. This cycle is turning out to be a product excellence release---majority of the changes are bugfixes, about one-third of which are also already in the v2.3.x maintenance track. The tarballs are found at:

[ANNOUNCE] Git v2.3.4

2015-03-23 Thread Junio C Hamano
contributors who helped this release are as follows. Thanks for your continued support. Alexander Kuleshov, Eric Sunshine, Junio C Hamano, Kyle J. McKay, Michael J Gruber, René Scharfe, SZEDER Gábor, and Torsten Bögershausen. Git

[ANNOUNCE] Git v2.3.4

2015-03-23 Thread Junio C Hamano
contributors who helped this release are as follows. Thanks for your continued support. Alexander Kuleshov, Eric Sunshine, Junio C Hamano, Kyle J. McKay, Michael J Gruber, René Scharfe, SZEDER Gábor, and Torsten Bögershausen. Git

[ANNOUNCE] Git v2.3.3

2015-03-14 Thread Junio C Hamano
for your continued support. Anders Kaseorg, Ben Walton, Jeff King, Johannes Sixt, Junio C Hamano, Mårten Kongstad, Michael J Gruber, Michal Sojka, Nguyễn Thái Ngọc Duy, and René Scharfe. Git v2.3.3 Release Notes

[ANNOUNCE] Git v2.3.3

2015-03-14 Thread Junio C Hamano
for your continued support. Anders Kaseorg, Ben Walton, Jeff King, Johannes Sixt, Junio C Hamano, Mårten Kongstad, Michael J Gruber, Michal Sojka, Nguyễn Thái Ngọc Duy, and René Scharfe. Git v2.3.3 Release Notes

[ANNOUNCE] Git v2.3.2

2015-03-06 Thread Junio C Hamano
ushing back a random character for_each_loose_file_in_objdir: take an optional strbuf path fast-import: avoid running end_packfile recursively Jonathon Mah (1): sha1_file: fix iterating loose alternate objects Junio C Hamano (7): tests: correct misuses of P

[ANNOUNCE] Git v2.3.2

2015-03-06 Thread Junio C Hamano
integer overflow config_buf_ungetc: warn when pushing back a random character for_each_loose_file_in_objdir: take an optional strbuf path fast-import: avoid running end_packfile recursively Jonathon Mah (1): sha1_file: fix iterating loose alternate objects Junio C Hamano (7

[ANNOUNCE] Git v2.3.1

2015-02-24 Thread Junio C Hamano
read_and_strip_branch: fix typo'd address-of operator do not check truth value of flex arrays Jonathan Nieder (1): rerere: error out on autoupdate failure Junio C Hamano (6): apply.c: typofix apply: make update_pre_post_images() sanity check the given postlen apply: c

[ANNOUNCE] Git v2.3.1

2015-02-24 Thread Junio C Hamano
use xstrdup_or_null to replace ternary conditionals dumb-http: do not pass NULL path to parse_pack_index read_and_strip_branch: fix typo'd address-of operator do not check truth value of flex arrays Jonathan Nieder (1): rerere: error out on autoupdate failure Junio C

[ANNOUNCE] Git v2.3.0

2015-02-05 Thread Junio C Hamano
The latest feature release Git v2.3.0 is now available at the usual places. This one ended up to be a release with lots of small corrections and improvements without big uncomfortably exciting features. It is a lot smaller release than other recent feature releases, consisting of 255 non-merge

[ANNOUNCE] Git v2.3.0

2015-02-05 Thread Junio C Hamano
The latest feature release Git v2.3.0 is now available at the usual places. This one ended up to be a release with lots of small corrections and improvements without big uncomfortably exciting features. It is a lot smaller release than other recent feature releases, consisting of 255 non-merge

[Git BUG] Please do not use "-B -M" in "diff" family for now

2015-01-31 Thread Junio C Hamano
Please avoid the combination "-B -M" when running "diff" family of commands, as it can produce incorrect results [*1*] in corner cases. Use of either "-B" or "-M" by itself is fine, but not both at the same time. This problem exists even in Git v1.7.12, and I have no reason to suspect that it

[Git BUG] Please do not use -B -M in diff family for now

2015-01-31 Thread Junio C Hamano
Please avoid the combination -B -M when running diff family of commands, as it can produce incorrect results [*1*] in corner cases. Use of either -B or -M by itself is fine, but not both at the same time. This problem exists even in Git v1.7.12, and I have no reason to suspect that it worked

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King writes: > But could we instead pull this check to just before the write-out time? > That is, to let any horrible thing happen in-core, as long as what we > write out to the index and the filesystem is sane? The check in-core is somewhat tricky, because we would need to (1) catch a

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King writes: > Ah, OK. Yeah, doing it progressively can only be accurate if our > name-checks follow the same order as applying, because we are checking > against a particular state. > > But could we instead pull this check to just before the write-out time? > That is, to let any horrible

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King writes: > Hrm. That only works in the current code because we apply the deletion > in the directory (and then clean up the now-empty directory) first. So I > think you would need to check the paths progressively as you apply them, > since those other parts of the diff "haven't happened

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King writes: > I had the impression that we did not apply in any arbitrary order that > could work, but rather that we did deletions first followed by > additions. But I am fairly ignorant of the apply code. No, you are thinking about the write-out of the finished result, which may have to

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Junio C Hamano writes: > Jeff King writes: > >>> + if (!patch->is_delete && path_is_beyond_symlink(patch->new_name)) >>> + return error(_("affected file '%s' is beyond a symbolic link"), >>> +patch-

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King writes: >> +if (!patch->is_delete && path_is_beyond_symlink(patch->new_name)) >> +return error(_("affected file '%s' is beyond a symbolic link"), >> + patch->new_name); > > Why does this not kick in when deleting a file? If it is not OK to > add

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King writes: > On Thu, Jan 29, 2015 at 12:45:22PM -0800, Junio C Hamano wrote: > >> +if (!patch->is_delete && path_is_beyond_symlink(patch->new_name)) >> +return error(_("affected file '%s' is beyond a symbolic link"), >> +

Re: [PATCH 2/1] apply: reject input that touches outside $cwd

2015-01-30 Thread Junio C Hamano
Jeff King writes: > It looks like your new --allow-uplevel goes to verify_path(). So this > isn't just about "..", but it will also protect against applying a patch > inside ".git". Which seems like a good thing to me, but I wonder if the > option name is a little misleading. True; not just

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King p...@peff.net writes: Ah, OK. Yeah, doing it progressively can only be accurate if our name-checks follow the same order as applying, because we are checking against a particular state. But could we instead pull this check to just before the write-out time? That is, to let any

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King p...@peff.net writes: But could we instead pull this check to just before the write-out time? That is, to let any horrible thing happen in-core, as long as what we write out to the index and the filesystem is sane? The check in-core is somewhat tricky, because we would need to (1)

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King p...@peff.net writes: I had the impression that we did not apply in any arbitrary order that could work, but rather that we did deletions first followed by additions. But I am fairly ignorant of the apply code. No, you are thinking about the write-out of the finished result, which

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King p...@peff.net writes: +if (!patch-is_delete path_is_beyond_symlink(patch-new_name)) +return error(_(affected file '%s' is beyond a symbolic link), + patch-new_name); Why does this not kick in when deleting a file? If it is not OK to add

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Thu, Jan 29, 2015 at 12:45:22PM -0800, Junio C Hamano wrote: +if (!patch-is_delete path_is_beyond_symlink(patch-new_name)) +return error(_(affected file '%s' is beyond a symbolic link), + patch-new_name); Why does

Re: [PATCH 2/1] apply: reject input that touches outside $cwd

2015-01-30 Thread Junio C Hamano
Jeff King p...@peff.net writes: It looks like your new --allow-uplevel goes to verify_path(). So this isn't just about .., but it will also protect against applying a patch inside .git. Which seems like a good thing to me, but I wonder if the option name is a little misleading. True; not

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Jeff King p...@peff.net writes: Hrm. That only works in the current code because we apply the deletion in the directory (and then clean up the now-empty directory) first. So I think you would need to check the paths progressively as you apply them, since those other parts of the diff haven't

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-30 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: + if (!patch-is_delete path_is_beyond_symlink(patch-new_name)) + return error(_(affected file '%s' is beyond a symbolic link), +patch-new_name); Why does this not kick in when

[PATCH 2/1] apply: reject input that touches outside $cwd

2015-01-29 Thread Junio C Hamano
a "better GNU patch", the user can pass `--allow-uplevel` option to override this safety check. This cannot be used to escape outside the working tree when using `--index` or `--cached` to apply the patch to the index. The new test was stolen from Jeff King with slight enhancements. Si

[PATCH] apply: refuse touching a file beyond symlink

2015-01-29 Thread Junio C Hamano
olic link will cause problems, if a new symbolic link that will cause problems will appear, etc. Signed-off-by: Junio C Hamano --- * At least I convinced myself enough to say that I do not seem to be breaking things with this patch, after taking patches out of dozens of random pairs of co

[PATCH] apply: refuse touching a file beyond symlink

2015-01-29 Thread Junio C Hamano
problems, if a new symbolic link that will cause problems will appear, etc. Signed-off-by: Junio C Hamano gits...@pobox.com --- * At least I convinced myself enough to say that I do not seem to be breaking things with this patch, after taking patches out of dozens of random pairs of commits from

[PATCH 2/1] apply: reject input that touches outside $cwd

2015-01-29 Thread Junio C Hamano
GNU patch, the user can pass `--allow-uplevel` option to override this safety check. This cannot be used to escape outside the working tree when using `--index` or `--cached` to apply the patch to the index. The new test was stolen from Jeff King with slight enhancements. Signed-off-by: Junio C

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-28 Thread Junio C Hamano
Junio C Hamano writes: > Subject: [PATCH] apply: refuse touching a file beyond symlink > > Because Git tracks symbolic links as symbolic links, a path that has > a symbolic link in its leading part (e.g. path/to/dir being a > symbolic link to somewhere else, be it inside or outs

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-28 Thread Junio C Hamano
Junio C Hamano writes: > Junio C Hamano writes: > >> If the user wants to apply a patch that touches ../etc/shadow, is >> the tool in the place to complain?" > > Let me take this part back. > > I think "git apply" should behave closely to "git

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-28 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Junio C Hamano gits...@pobox.com writes: If the user wants to apply a patch that touches ../etc/shadow, is the tool in the place to complain? Let me take this part back. I think git apply should behave closely to git apply --index (which is used

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-28 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Subject: [PATCH] apply: refuse touching a file beyond symlink Because Git tracks symbolic links as symbolic links, a path that has a symbolic link in its leading part (e.g. path/to/dir being a symbolic link to somewhere else, be it inside or outside

[ANNOUNCE] Git v2.3.0-rc2

2015-01-27 Thread Junio C Hamano
since v2.3.0-rc1 are as follows: Alex Henrie (1): l10n: ca.po: update translation Alexander Kuleshov (1): cat-file: use "type" and "size" from outer scope Benedikt Heine (1): l10n: de.po: fix typo Jean-Noel Avila (2): l10n: fr.po v2.3.0 round 1

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-27 Thread Junio C Hamano
Junio C Hamano writes: > Linus Torvalds writes: > >> Ugh. I don't see anything we can do about this on the git side, and I >> do kind of understand why 'patch' would be worried about '..' files. >> In a perfect world, patch would parse the filename and see that it >&

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-27 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Linus Torvalds torva...@linux-foundation.org writes: Ugh. I don't see anything we can do about this on the git side, and I do kind of understand why 'patch' would be worried about '..' files. In a perfect world, patch would parse the filename and see

[ANNOUNCE] Git v2.3.0-rc2

2015-01-27 Thread Junio C Hamano
-rc0 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: zh_CN: various fixes on command arguments l10n: correct indentation of show-branch usage Joan Perals (1): l10n: ca.po: various fixes Johannes Sixt (1): t1050-large: generate large files without dd Junio C Hamano (1

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Junio C Hamano
Linus Torvalds writes: > Ugh. I don't see anything we can do about this on the git side, and I > do kind of understand why 'patch' would be worried about '..' files. > In a perfect world, patch would parse the filename and see that it > stays within the directory structure of the project, but

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Junio C Hamano
On Mon, Jan 26, 2015 at 1:30 PM, Linus Torvalds wrote: > On Mon, Jan 26, 2015 at 1:07 PM, Josh Boyer wrote: >> >> Or did I miss a way that git-apply can take a git patch and apply it >> to a tree that isn't a git repo? > > Exactly. "git apply" works as a straight "patch" replacement outside > of

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Junio C Hamano
On Mon, Jan 26, 2015 at 1:30 PM, Linus Torvalds torva...@linux-foundation.org wrote: On Mon, Jan 26, 2015 at 1:07 PM, Josh Boyer jwbo...@fedoraproject.org wrote: Or did I miss a way that git-apply can take a git patch and apply it to a tree that isn't a git repo? Exactly. git apply works as

Re: patch-2.7.3 no longer applies relative symbolic link patches

2015-01-26 Thread Junio C Hamano
Linus Torvalds torva...@linux-foundation.org writes: Ugh. I don't see anything we can do about this on the git side, and I do kind of understand why 'patch' would be worried about '..' files. In a perfect world, patch would parse the filename and see that it stays within the directory

[ANNOUNCE] Git v2.3.0-rc1

2015-01-20 Thread Junio C Hamano
9 rc/for-each-ref-tracking later to maint). Changes since v2.3.0-rc0 are as follows: Adam Williamson (1): correct smtp-ssl-cert-path description Alexander Kuleshov (4): show-branch: line-wrap show-branch usage git.c: rem

[ANNOUNCE] Git v2.3.0-rc1

2015-01-20 Thread Junio C Hamano
prompt for ignored pwd Johannes Schindelin (2): git remote: allow adding remotes agreeing with url.insteadOf Add a regression test for 'git remote add existing same-url' Junio C Hamano (2): Fifth batch for 2.3 cycle Git 2.3.0-rc1 Kyle J. McKay (3): log.c: fix

[ANNOUNCE] Git v2.3.0-rc0

2015-01-12 Thread Junio C Hamano
builtin/notes: improve naming builtin/notes: refactor note file path into struct note_data builtin/notes: simplify early exit code in add() builtin/notes: split create_note() to clarify add vs. remove logic builtin/notes: add --allow-empty, to allow storing empty notes notes: e

[ANNOUNCE] Git v2.2.2

2015-01-12 Thread Junio C Hamano
f to parse_ref_line read_packed_refs: use skip_prefix instead of static array is_hfs_dotgit: loosen over-eager match of \u{..47} Johannes Sixt (1): Windows: correct detection of EISDIR in mingw_open() Jonathan Nieder (2): Makefile: simplify by using SCRIPT_{PERL,SH}_GEN ma

[ANNOUNCE] Git v2.2.2

2015-01-12 Thread Junio C Hamano
: correct detection of EISDIR in mingw_open() Jonathan Nieder (2): Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros Makefile: have python scripts depend on NO_PYTHON setting Junio C Hamano (2): Prepare for 2.2.2 Git 2.2.2 Michael Haggerty (1): create_default_files

[ANNOUNCE] Git v2.3.0-rc0

2015-01-12 Thread Junio C Hamano
sh.exe as sh Jonathan Nieder (2): Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros Makefile: have python scripts depend on NO_PYTHON setting Junio C Hamano (38): checkout: report upstream correctly even with loosely defined branch.*.merge clone: --dissociate option

[ANNOUNCE] Git v2.2.1 (and updates to older maintenance tracks)

2014-12-18 Thread Junio C Hamano
otgit() helper read-cache: optionally disallow HFS+ .git variants fsck: complain about HFS+ ".git" aliases in trees Johannes Schindelin (3): path: add is_ntfs_dotgit() helper read-cache: optionally disallow NTFS .git variants fsck: complain about NTFS ".

[ANNOUNCE] Git v2.2.1 (and updates to older maintenance tracks)

2014-12-18 Thread Junio C Hamano
disallow NTFS .git variants fsck: complain about NTFS .git aliases in trees Junio C Hamano (6): Start post 2.2 cycle Git 1.8.5.6 Git 1.9.5 Git 2.0.5 Git 2.1.4 Git 2.2.1 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body

[ANNOUNCE] Git v2.2.0

2014-11-26 Thread Junio C Hamano
The latest feature release Git v2.2 is now available at the usual places. Big thanks go to 77 contributors, among which 20 are new people, who made 550+ changes in total since Git v2.1 was released. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following

[ANNOUNCE] Git v2.2.0

2014-11-26 Thread Junio C Hamano
The latest feature release Git v2.2 is now available at the usual places. Big thanks go to 77 contributors, among which 20 are new people, who made 550+ changes in total since Git v2.1 was released. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following

[ANNOUNCE] Git v2.2.0-rc3

2014-11-21 Thread Junio C Hamano
9dbbd jk/cache-tree-protect-from-broken-libgit2 later to maint). * "git fetch" into a repository where branch B was deleted earlier back when it had reflog enabled, and then branch B/C is fetched into it without reflog enabled, which is arguably an unlikely corner case, unnecessari

[ANNOUNCE] Git v2.2.0-rc3

2014-11-21 Thread Junio C Hamano
change l10n: remove a superfluous translation for push.c Junio C Hamano (2): Documentation/git-commit: clarify that --only/--include records the working tree contents Git 2.2.0-rc3 Max Horn (1): doc: add some crossrefs between manual pages Ralf Thielow (4): l10n

[ANNOUNCE] Git v2.2.0-rc2

2014-11-14 Thread Junio C Hamano
ched into it without reflog enabled, which is arguably an unlikely corner case, unnecessarily failed. (merge aae828b jk/fetch-reflog-df-conflict later to maint). * "git log --first-parent -L..." used to crash. (merge a8787c5 tm/line-log-first-parent later to maint). ---

[ANNOUNCE] Git v2.2.0-rc2

2014-11-14 Thread Junio C Hamano
round 1 (62 new, 23 removed) l10n: zh_CN: translations for git v2.2.0-rc0 John Szakmeister (1): diff-highlight: exit when a pipe is broken Junio C Hamano (2): Update draft release notes to 2.2 Git 2.2.0-rc2 Nicolas Dermine (1): config.txt: fix typo Peter Krefting

[ANNOUNCE] Git v2.2.0-rc1

2014-11-07 Thread Junio C Hamano
eld' breaks the auto-detection we use to see if they are new enough to support the `--output` option. (merge b12d045 da/mergetool-meld later to maint). * "git pack-objects" forgot to disable the codepath to generate object reachability bitmap when it needs to split the res

Re: [RFC][PATCH 10/12 v3] seq-buf: Make seq_buf_bprintf() conditional on CONFIG_BINARY_PRINTF

2014-11-07 Thread Junio C Hamano
Petr Mladek writes: > On Wed 2014-11-05 15:42:03, Steven Rostedt wrote: > ... >> >> OK, 'git rebase' is SUPER AWESOME!!! >> >> I just did a git rebase, moved this change to before the file move, and >> git somehow knew that the change was for the old file, and updated it >> without any

Re: [RFC][PATCH 10/12 v3] seq-buf: Make seq_buf_bprintf() conditional on CONFIG_BINARY_PRINTF

2014-11-07 Thread Junio C Hamano
Petr Mladek pmla...@suse.cz writes: On Wed 2014-11-05 15:42:03, Steven Rostedt wrote: ... OK, 'git rebase' is SUPER AWESOME!!! I just did a git rebase, moved this change to before the file move, and git somehow knew that the change was for the old file, and updated it without any

[ANNOUNCE] Git v2.2.0-rc1

2014-11-07 Thread Junio C Hamano
: split out ref writing from bundle_create fetch: load all default config at startup ignore stale directories when checking reflog existence docs/credential-store: s/--store/--file/ Junio C Hamano (3): bundle: split out a helper function to create pack data bundle: split out

[ANNOUNCE] Git v2.2.0-rc0

2014-10-31 Thread Junio C Hamano
An early preview release Git v2.2.0-rc0 is now available for testing at the usual places. Please give it a test. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following public repositories all have a copy of the 'v2.2.0-rc0' tag and the 'master' branch

[ANNOUNCE] Git v2.2.0-rc0

2014-10-31 Thread Junio C Hamano
An early preview release Git v2.2.0-rc0 is now available for testing at the usual places. Please give it a test. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following public repositories all have a copy of the 'v2.2.0-rc0' tag and the 'master' branch

[ANNOUNCE] Git v2.1.3

2014-10-29 Thread Junio C Hamano
ut` configurable and more robust Eric Sunshine (1): mailinfo: work around -Wstring-plus-int warning Jeff King (2): mailinfo: make ">From" in-body header check more robust pack-objects: turn off bitmaps when we split packs Junio C Hamano (1): Git 2.1.3 René Scharfe

<    1   2   3   4   5   6   7   8   9   >