Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
Torsten Bögershausen wrote: ml/cygwin-updates: cygwin: stop forcing core.filemode=false I like that: cygwin behaves more like Unix/Linux. Just a side-comment: When working on NTFS, cygwin will set core.filemode=true, and as a result of that, the cheating lstat code is not used any more. So it is not run under the test suite (typically NTFS), and therefore untested by default. Indeed, the next branch is now fixed. :-D * rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit - cygwin: Remove the Win32 l/stat() implementation I am personally in favor of this simpler solution. Comments? Me too, thanks to all contributors Thank you for taking the time to help address this issue! ATB, Ramsay Jones -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
On Mon, Jul 22, 2013 at 2:57 AM, Junio C Hamano gits...@pobox.com wrote: * es/contacts (2013-07-21) 5 commits - contrib: contacts: add documentation - contrib: contacts: add mailmap support - contrib: contacts: interpret committish akin to format-patch - contrib: contacts: add ability to parse from committish - contrib: add git-contacts helper (this branch uses es/check-mailmap.) A helper to read from a set of format-patch output files or a range of commits and find those who may have insights to the code that the changes touch by running a series of git blame commands. Still needs to add mailmap support and other niceties but the Trivial correction: mailmap support has been added, so Still could use some niceties... basics already look sound, and the enhancements can be done in-tree. Assuming that git contact is something we may want to have as a member of the official set of commands someday, that is. Will merge to 'next'. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
Am 22.07.2013 08:57, schrieb Junio C Hamano: * jl/submodule-mv (2013-04-23) 5 commits . submodule.c: duplicate real_path's return value . rm: delete .gitmodules entry of submodules removed from the work tree . Teach mv to update the path entry in .gitmodules for moved submodules . Teach mv to move submodules using a gitfile . Teach mv to move submodules together with their work trees git mv A B when moving a submodule A does the right thing, inclusing relocating its working tree and adjusting the paths in the .gitmodules file. Ejected from 'pu', as it conflicts with nd/magic-pathspec. So I'll base my upcoming re-roll on pu, right? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
On Mon, Jul 22, 2013 at 2:32 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 22.07.2013 08:57, schrieb Junio C Hamano: * jl/submodule-mv (2013-04-23) 5 commits . submodule.c: duplicate real_path's return value . rm: delete .gitmodules entry of submodules removed from the work tree . Teach mv to update the path entry in .gitmodules for moved submodules . Teach mv to move submodules using a gitfile . Teach mv to move submodules together with their work trees git mv A B when moving a submodule A does the right thing, inclusing relocating its working tree and adjusting the paths in the .gitmodules file. Ejected from 'pu', as it conflicts with nd/magic-pathspec. So I'll base my upcoming re-roll on pu, right? The conflicted part is the use of common_prefix. I think you might be able to avoid the conflict by using quote.c:path_relative() instead of common_prefix() and prepending ../ manually. Or not, I did not read path_relative() carefully, nor your connect_work_tree_and_git_dir(). -- Duy -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
Junio C Hamano gits...@pobox.com writes:
* tr/merge-recursive-index-only (2013-07-07) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: untangle double meaning of o-call_depth
- merge-recursive: remove dead conditional in update_stages()
What's the status of this one?
I am not particularly fond of the second patch that conceptually
allows updating working tree during a virtual merge (i.e. addition
of o-no_worktree is fine, but there needs a way to make sure it is
never set to false when o-depth is not zero).
Blocking on round tuits. In any case don't merge anything until we see
that it solves git-imerge's problems, so that it has a user ;-) The next
version will implement a stateless mode too, like Michael asked for
(not writing MERGE_HEAD, etc.).
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
Am 22.07.2013 09:48, schrieb Duy Nguyen: On Mon, Jul 22, 2013 at 2:32 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 22.07.2013 08:57, schrieb Junio C Hamano: * jl/submodule-mv (2013-04-23) 5 commits . submodule.c: duplicate real_path's return value . rm: delete .gitmodules entry of submodules removed from the work tree . Teach mv to update the path entry in .gitmodules for moved submodules . Teach mv to move submodules using a gitfile . Teach mv to move submodules together with their work trees git mv A B when moving a submodule A does the right thing, inclusing relocating its working tree and adjusting the paths in the .gitmodules file. Ejected from 'pu', as it conflicts with nd/magic-pathspec. So I'll base my upcoming re-roll on pu, right? The conflicted part is the use of common_prefix. I think you might be able to avoid the conflict by using quote.c:path_relative() instead of common_prefix() and prepending ../ manually. Or not, I did not read path_relative() carefully, nor your connect_work_tree_and_git_dir(). Thanks for the pointers, I'll look into that. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
My patch is not listed. When is it merged? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
Yamada Saburo devil.tamac...@gmail.com writes: My patch is not listed. When is it merged? I do not take patches to git-gui (or gitk) directly to my tree. Because nobody acked nor nacked the latest round yet, I do not think the area maintainer has picked them up yet. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
On Sun, Jul 21, 2013 at 11:57:43PM -0700, Junio C Hamano wrote: * jk/fast-import-empty-ls (2013-06-23) 4 commits - fast-import: allow moving the root tree - fast-import: allow ls or filecopy of the root tree - fast-import: set valid mode on root tree in ls - t9300: document fast-import empty path issues Comments? This originated with a user bug report [1] so I'd like to see it merged. Any chance of some fast-import experts taking a look? [1] http://article.gmane.org/gmane.comp.version-control.git/228586 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
ml/cygwin-updates: cygwin: stop forcing core.filemode=false I like that: cygwin behaves more like Unix/Linux. Just a side-comment: When working on NTFS, cygwin will set core.filemode=true, and as a result of that, the cheating lstat code is not used any more. So it is not run under the test suite (typically NTFS), and therefore untested by default. * rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit - cygwin: Remove the Win32 l/stat() implementation I am personally in favor of this simpler solution. Comments? Me too, thanks to all contributors -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
