Re: [PATCH v3] commit.c: Replace starts_with() with skip_prefix()

2014-03-08 Thread Eric Sunshine
On Fri, Mar 7, 2014 at 5:49 AM, karthik nayak wrote: > Hello Eric, > Thanks for your reply, and for that information. should i patch again or > this should do? > And what next? Talk to the mentor? The ultimate authority deciding if a patch is ready is Junio, as it would have to be accepted into

Re: howto to run git without a master branch

2014-03-08 Thread Torsten Bögershausen
On 2014-03-08 22.37, Carlos Pereira wrote: > Hi, > git newbie here. > > I would like to work with two main branches: master-g and master-x, instead > of the usual master, and apparently git does not like this. > > After creating a local repository with these two branches, and a server > reposit

[PATCH] rebase: new option to post edit a squashed or fixed up commit

2014-03-08 Thread Nguyễn Thái Ngọc Duy
After squashing or fixing up, you may want to have a final look at the commit, edit some more if needed or even do some testing. --postedit enables that. This is (to me) a paranoid mode so either I enable it for all squashes and fixups, or none. Hence a new option, not new todo commands that give f

[PATCH/RFC] rebase: new convenient option to edit/reword/delete a single commit

2014-03-08 Thread Nguyễn Thái Ngọc Duy
Prepare the todo list for you to edit/reword/delete the given commit. Signed-off-by: Nguyễn Thái Ngọc Duy --- Allowing multiple actions is a bit too much for my shell skills. I don't really need it so I won't push it, but if somebody gives me a sketch, I'll try to polish it. --squash and --f

Potential GSOC microproject idea

2014-03-08 Thread Kyle J. McKay
On Mar 3, 2014, at 23:58, Michael Haggerty wrote: list regulars should FEEL ENCOURAGED to submit microprojects to add to the list. (Either submit them as a pull request to the GitHub repository that contains the text [1] or to the mailing list with CC to me.) Potential idea for a microproject:

remote rename

2014-03-08 Thread Matan Nassau
Hi, If I have a remote branch origin/topic/foo, running $ git remote rename origin renamed seems to leave directory traces behind: .git/refs/remotes/origin/topic I expected to see .git/refs/remotes/renamed/topic/foo but not .git/refs/remotes/origin. Is this a glitch? I see this with Git 1.9.

howto to run git without a master branch

2014-03-08 Thread Carlos Pereira
Hi, git newbie here. I would like to work with two main branches: master-g and master-x, instead of the usual master, and apparently git does not like this. After creating a local repository with these two branches, and a server repository with git init --bare, and pushing the two branches:

[PATCH v2] builtin/mv: fix out of bounds write

2014-03-08 Thread John Keeping
When commit a88c915 (mv: move submodules using a gitfile, 2013-07-30) added the submodule_gitfile array, it was not added to the block that enlarges the arrays when we are moving a directory so that we do not have to worry about it being a directory when we perform the actual move. After this, the

[PATCH] mv: prevent mismatched data when ignoring errors.

2014-03-08 Thread brian m. carlson
We shrink the source and destination arrays, but not the modes or submodule_gitfile arrays, resulting in potentially mismatched data. Shrink all the arrays at the same time to prevent this. Signed-off-by: brian m. carlson --- builtin/mv.c | 5 + 1 file changed, 5 insertions(+) diff --git a

Re: [PATCH] builtin/mv: fix out of bounds write

2014-03-08 Thread brian m. carlson
On Sat, Mar 08, 2014 at 06:35:01PM +, John Keeping wrote: > When commit a88c915 (mv: move submodules using a gitfile, 2013-07-30) > added the submodule_gitfile array, it was not added to the block that > enlarges the arrays when we are moving a directory so that we do not > have to worry about

[PATCH] builtin/mv: fix out of bounds write

2014-03-08 Thread John Keeping
When commit a88c915 (mv: move submodules using a gitfile, 2013-07-30) added the submodule_gitfile array, it was not added to the block that enlarges the arrays when we are moving a directory so that we do not have to worry about it being a directory when we perform the actual move. After this, the

Re: git 1.9.0 segfault

2014-03-08 Thread John Keeping
On Sat, Mar 08, 2014 at 04:46:51PM +, brian m. carlson wrote: > On Sat, Mar 08, 2014 at 04:23:43PM +, Guillaume Gelin wrote: > > Hi, > > > > http://pastebin.com/Np7L54ar > We're failing to rename because we got an EFAULT, and then we try to > print the failing filename, and we get a segfaul

Re: [GSoC14][RFC] Proposal Draft: Refactor tempfile handling

2014-03-08 Thread Brian Gesiak
Excellent, thank you very much for the feedback, Jeff! It was very helpful and encouraging. I've done some more research based on your comments. > Once the logic is extracted into a nice API, there are > several other places that can use it, too: ... I've found the following four areas so far: 1

Re: git 1.9.0 segfault

2014-03-08 Thread brian m. carlson
On Sat, Mar 08, 2014 at 04:23:43PM +, Guillaume Gelin wrote: > Hi, > > http://pastebin.com/Np7L54ar I can confirm this. I get the following backtrace: Core was generated by `/home/bmc/checkouts/git/git mv packages/ lisp'. Program terminated with signal 11, Segmentation fault. #0 0x000

git 1.9.0 segfault

2014-03-08 Thread Guillaume Gelin
Hi, http://pastebin.com/Np7L54ar Cheers, -- Guillaume Gelin -- 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: [PATCH v7 00/11] Add interpret-trailers builtin

2014-03-08 Thread Øystein Walle
Junio C Hamano pobox.com> writes: > > ... > > is easier to read and maintain if written like so (with using HT > properly---our MUAs may damage it and turn the indentation into > spaces): > > ... && > sed -e "s/ Z$/ /" >>expect <<-\EOF && > Fixes: Z > Acked-by

Re: [PATCH v5 01/28] path.c: make get_pathname() return strbuf instead of static buffer

2014-03-08 Thread Duy Nguyen
On Sat, Mar 8, 2014 at 1:11 PM, Torsten Bögershausen wrote: > On 2014-03-08 03.47, Nguyễn Thái Ngọc Duy wrote: >> We've been avoiding PATH_MAX whenever possible. This patch makes >> get_pathname() return a strbuf and updates the callers to take >> advantage of this. The code is simplified as we no