Re: [PATCH 1/2] Modified flag field type in rev_list_info struct in bisect.h. There is no need for flag field to be signed, as it is not supposed to be used as decimal.

Stefan Beller writes: > Maybe my exposure to the code was accidentally in a way such that > I ever only saw the version without int. The older part of the code tends to spell flag words with "unsigned" without "int", which is primarily historical fault of mine. -- To

Re: [PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

On Fri, Mar 25, 2016 at 11:54 AM, Eric Sunshine wrote: > On Fri, Mar 25, 2016 at 2:06 AM, Pranit Bauva wrote: >> On Fri, Mar 25, 2016 at 5:27 AM, Eric Sunshine >> wrote: >>> Agreed that this needs proper justification in

Re: [GSoC] Proposal

Well, I should have done some search before ask. -- 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: GSoC 2016 | Proposal | Incremental Rewrite of git bisect

On Thu, Mar 24, 2016 at 12:27 AM, Pranit Bauva wrote: > Hey! > > I have prepared a proposal for Google Summer of Code 2016. I know this > is a bit late, but please try to give your comments and suggestions. > My proposal could greatly improve from this. Some questions: > >

Re: GSoC 2016 | Proposal | Incremental Rewrite of git bisect

Christian Couder writes: > On Thu, Mar 24, 2016 at 12:27 AM, Pranit Bauva wrote: > >> Unification of bisect.c and bisect--helper.c >> >> This will unify the algorithmic and non-algorithmic parts of bisect >> bringing them under one heading to

Re: [PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

On Fri, Mar 25, 2016 at 2:06 AM, Pranit Bauva wrote: > On Fri, Mar 25, 2016 at 5:27 AM, Eric Sunshine > wrote: >> Agreed that this needs proper justification in the commit message. >> And, the justification is to make each test more

Re: [PATCH/GSoC] add a add.patch config variable

On Thu, Mar 24, 2016 at 10:09 PM, XZS wrote: > > diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh > index deae948..25e4b2e 100755 > --- a/t/t3701-add-interactive.sh > +++ b/t/t3701-add-interactive.sh > @@ -380,4 +380,13 @@ test_expect_success 'patch mode

Re: [PATCH v3/GSoC 1/5] path.c: implement strbuf_mkpath()

So, are there some additional points I could improve? 2016-03-23 18:13 GMT+08:00 Hui Yiqun : > There were already `mkpath`, `mkpathdup` and `mksnpath` for build > filename, but lacked a version of `strbuf_` just like `strbuf_git_path`. > > It is convenient to build a path and

Re: [PATCH v10 0/2] introduce --[no-]autostash command line flag

On Mon, Mar 21, 2016 at 2:18 PM, Mehul Jain wrote: > Changes introduced w.r.t. previous patch: > [...] > * Two more tests are added to checkout for error when "git pull > --[no-]autostash" is called. Here I'm forced to use "test_i18ncmp" > instead of "test_i18ngrep"

Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag

On Mon, Mar 21, 2016 at 4:12 PM, Mehul Jain wrote: > If rebase.autoStash configuration variable is set, there is no way to > override it for "git pull --rebase" from the command line. > > Teach "git pull --rebase" the --[no-]autostash command line flag which > overrides

Re: [PATCH 3/4] submodule--helper list: lose the extra prefix option

Stefan Beller writes: > The usual early machinery of Git is to change the directory to > the top level of the working tree and pass the actual path inside > the working tree as `prefix` to the command being run. > > This is the case both for commands written in C (where the >

Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag

Mehul Jain writes: > +--autostash:: > +--no-autostash:: > + Before starting rebase, stash local modifications away (see > + linkgit:git-stash[1]) if needed, and apply the stash when > + done. `--no-autostash` is useful to override the `rebase.autoStash` > +

Re: Regarding GSoC 2016

Mehul Jain wrote: > On Thu, Mar 24, 2016 at 11:13 PM, Saurabh Jain > wrote: > > The proposal can be accessed here. > > > 5mWF_cqoZS6IUvGr6CVu5SmkbZk/edit?usp=sharing> > > It's broken I

Re: [PATCH v9 3/3] commit: add a commit.verbose config variable

On Fri, Mar 25, 2016 at 5:35 AM, Eric Sunshine wrote: > On Thu, Mar 24, 2016 at 4:25 AM, Pranit Bauva wrote: >> Add commit.verbose configuration variable as a convenience for those >> who always prefer --verbose. > > The implementation looks

Re: [PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

On Fri, Mar 25, 2016 at 5:27 AM, Eric Sunshine wrote: > On Thu, Mar 24, 2016 at 7:00 AM, SZEDER Gábor wrote: >>> Also remove test_set_editor from global scope and use it in whichever >>> test it is required. >> >> Why? >> >> test_set_editor sets and

Re: [PATCH/GSoC] add a add.patch config variable

Dominik Fischer writes: > As the configuration variable can be overwritten by a command line > option, I am tempted to amend this by replacing all occurrences of > "git add" in other scripts with "git add --no-patch" to ensure the > expected behavior. Don't even think about

Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag

On Fri, Mar 25, 2016 at 4:31 AM, Eric Sunshine wrote: > for i in --autostash --no-autostash > do > test_expect_success "pull $i (without --rebase) is illegal" " >test_must_fail git pull $i . copy 2>actual && >test_i18ngrep 'only

Re: [PATCH v3/GSoC 3/5] git-credential-cache: put socket to xdg-compatible path

On Wed, Mar 23, 2016 at 06:13:23PM +0800, Hui Yiqun wrote: > move .git-credential-cache/socket to xdg_runtime_dir("credential-cache.sock") Motivation? > diff --git a/credential-cache.c b/credential-cache.c > index f4afdc6..40d838b 100644 > --- a/credential-cache.c > +++ b/credential-cache.c >

Re: [PATCH v3/GSoC 2/5] path.c: implement xdg_runtime_dir()

On Wed, Mar 23, 2016 at 06:13:22PM +0800, Hui Yiqun wrote: > +/** > + * this function does the following: > + * > + * 1. if $XDG_RUNTIME_DIR is non-empty, `$XDG_RUNTIME_DIR/git` is used in > next > + * step, otherwise `/tmp/git-$uid` is taken. > + * 2. ensure that above directory does exist.

Re: GSoC 2016 | Proposal | Incremental Rewrite of git bisect

On Fri, Mar 25, 2016 at 2:45 PM, Matthieu Moy wrote: > Christian Couder writes: > >> On Thu, Mar 24, 2016 at 12:27 AM, Pranit Bauva >> wrote: >> >>> Unification of bisect.c and bisect--helper.c >>> >>> This will

[RFC/GSOC] Git Beginner | Warnings for potentially destructive commands

Hi, I made an attempt at writing warning messages for the commands the beginners will be warned against, and would like to request your comments and feedback on them. I tried to keep them simple, beginner friendly and educative of the outcome of those commands. I'd also like to ask if `git

Re: [PATCH v2] worktree: add: introduce --checkout option

Thanks for the clarification. By the way, Duy, another unrelated question: why worktree name under .git/worktrees is being named after the working tree path basename? I think branch name is more reasonable since we don't allow checking out the same branch twice. 2016-03-25 9:49 GMT+08:00 Duy

Re: GSoC 2016 | Proposal | Incremental Rewrite of git bisect

On Fri, Mar 25, 2016 at 2:32 PM, Christian Couder wrote: > On Thu, Mar 24, 2016 at 12:27 AM, Pranit Bauva wrote: >> Hey! >> >> I have prepared a proposal for Google Summer of Code 2016. I know this >> is a bit late, but please try to give your

Re: [PATCH v3/GSoC 1/5] path.c: implement strbuf_mkpath()

On Wed, Mar 23, 2016 at 06:13:21PM +0800, Hui Yiqun wrote: > There were already `mkpath`, `mkpathdup` and `mksnpath` for build > filename, but lacked a version of `strbuf_` just like `strbuf_git_path`. > > It is convenient to build a path and manipulate the result later with > strbuf. Makes

Re: GSoC 2016 | Proposal | Incremental Rewrite of git bisect

On Fri, Mar 25, 2016 at 11:15 AM, Pranit Bauva wrote: >> - you will add an option to "git bisect--helper" to perform what the >> git-bisect.sh function did, and >> - you will create a test script for "git bisect--helper" in which you >> will test each option? > > I had

Re: [PATCH v3 0/5] Expanding tabs in "git log" output

On 2016-03-24 19.22, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> Would it make sense to have >> git log --tab-size=8 >> (or similar) >> >> and add a config variable like >> git config ui.logtabsize >> which is 0 by default to get the old handling and 8 for the new

[PATCH v3] worktree: add: introduce --checkout option

By adding this option which defaults to true, we can use the corresponding --no-checkout to make some customizations before the checkout, like sparse checkout, etc. Signed-off-by: Ray Zhang --- 1. reword on `--no-checkout` in Documentation/git-worktree.txt 2. update the

Re: [PATCH v2] worktree: add: introduce --checkout option

On Fri, Mar 25, 2016 at 6:31 PM, Zhang Lei wrote: > By the way, Duy, another unrelated question: why worktree name under > .git/worktrees is being named > after the working tree path basename? I think branch name is more > reasonable since we don't allow checking out > the

Re: GSoC 2016 | Proposal | Incremental Rewrite of git bisect

On Fri, Mar 25, 2016 at 5:10 PM, Christian Couder wrote: > On Fri, Mar 25, 2016 at 11:15 AM, Pranit Bauva wrote: >>> - you will add an option to "git bisect--helper" to perform what the >>> git-bisect.sh function did, and >>> - you will create

Re: [PATCH v2] worktree: add: introduce --checkout option

Yes, path basename makes sense. I am asking this question because we have some legacy code requires that working tree called something like 'src', as a result, multiple branch would have src1 src2 src3 under .git/worktrees which could not be easy to maintain. I agreed with you, we should give

Re: [PATCH v2] worktree: add: introduce --checkout option

Please don't top-post. On Fri, Mar 25, 2016 at 7:06 PM, Zhang Lei wrote: > Yes, path basename makes sense. > I am asking this question because we have some legacy code requires > that working tree > called something like 'src', as a result, multiple branch would have >

Re: GSoC 2016 | Proposal | Incremental Rewrite of git bisect

> - you will add an option to "git bisect--helper" to perform what the > git-bisect.sh function did, and > - you will create a test script for "git bisect--helper" in which you > will test each option? I had very initially planned to do this. But Matthieu pointed out that it would be much better

Re: [PATCH] branch: update all per-worktree HEADs when renaming a branch

Hello, On 03/22/2016 03:41 AM, Eric Sunshine wrote: >> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh >> @@ -126,7 +126,19 @@ test_expect_success 'git branch -M foo bar should fail >> when bar is checked out' >> test_expect_success 'git branch -M baz bam should

Duplicate -s entry in git-format-patch(1)

Hi all, I've noticed for some time now that the man page for git-format-patch is quite confusing because it includes two entries for the -s option: - "-s, --no-patch", which is pulled by "include::diff-options.txt[]"in Documentation/git-format-patch.txt - "-s, --signoff", which is directly part

Re: [PATCH] branch: update all per-worktree HEADs when renaming a branch

On Tue, Mar 22, 2016 at 07:49:00AM +0700, Duy Nguyen wrote: > On Tue, Mar 22, 2016 at 12:41 AM, Eric Sunshine > wrote: > >> diff --git a/worktree.c b/worktree.c > >> @@ -217,3 +217,41 @@ char *find_shared_symref(const char *symref, const > >> char *target) > >> +int

Re: [PATCH 1/2] Modified flag field type in rev_list_info struct in bisect.h. There is no need for flag field to be signed, as it is not supposed to be used as decimal.

Yep. Thanks for your remarks. I have made a bit more research about using old rev_list_info struct (with signed int flag) and realized, that it doesn't appear in expressions, where using signed integer will differ from unsigned one. I'll take using 'unsigned' instead of 'unsigned int' in

Re: [PATCH v2] worktree: add: introduce --checkout option

On Fri, Mar 25, 2016 at 7:41 AM, Duy Nguyen wrote: > On Fri, Mar 25, 2016 at 6:31 PM, Zhang Lei wrote: >> By the way, Duy, another unrelated question: why worktree name under >> .git/worktrees is being named >> after the working tree path basename? I

Re: [PATCH v3/GSoC 4/5] test-lib.sh: unset all environment variables defined in xdg base dir spec[1]

On Wed, Mar 23, 2016 at 06:13:24PM +0800, Hui Yiqun wrote: > Otherwise, on environments where these variables and set, an assignment > to one of these variables will cause the variable being implicitly exported. Yes, that's one problem, though I think the more general problem is simply that they

Re: [PATCH v3 0/5] Expanding tabs in "git log" output

This is copy-paste replacement for the last commit. (Most probably it is white space damaged) I'm not sure, is it's worth it ? If yes, I can send a proper patch later. git show HEAD commit 3ac551127d51cd59b24f49729d9ce4dd011a09a1 Author: Junio C Hamano Date: Wed Mar 23

How to use @{-1} with push?

I have an alias that I'm working on to do a push and delete of a topic branch: # Push HEAD, delete branch local & remote # # $1 = remote name # $2 = branch name pushdel = "!f() { : git push ; git push \"$1\" HEAD \":$2\" && git branch -d \"$2\" ; }; f" I use it after I

Re: parse-options does not recognize "unspecified" behavior

> Deprecating doesn't mean "removing". It merely means that we add a note > to the documentation stating that the option in question is deprecated, > but we will keep supporting it for several years and releases to come. Okay. Didn't know. > This means that '--verbose' and '--show-diff' must

Re: [PATCH v3/GSoC 2/5] path.c: implement xdg_runtime_dir()

2016-03-25 17:59 GMT+08:00 Jeff King : > On Wed, Mar 23, 2016 at 06:13:22PM +0800, Hui Yiqun wrote: > >> +/** >> + * this function does the following: >> + * >> + * 1. if $XDG_RUNTIME_DIR is non-empty, `$XDG_RUNTIME_DIR/git` is used in >> next >> + * step, otherwise `/tmp/git-$uid`

Re: [PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

Quoting Eric Sunshine : On Thu, Mar 24, 2016 at 7:00 AM, SZEDER Gábor wrote: diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh index 2ddf28c..cf95efb 100755 --- a/t/t7507-commit-verbose.sh +++ b/t/t7507-commit-verbose.sh @@ -3,12

Re: parse-options does not recognize "unspecified" behavior

Quoting Pranit Bauva : On Sat, Mar 19, 2016 at 4:55 PM, SZEDER Gábor wrote: Yes, I think in general, "-v" and "-q" should work as opposites. But that is not the case with commit, where "-v" and "-q" operate on totally separate messages. I think that

Re: [PATCH v3/GSoC 2/5] path.c: implement xdg_runtime_dir()

> I find there are some similar leakage in this file. I'll fix them in > another patch. > > Do you think we need some additional comments for the release of strbuf? For example, in strbuf.h. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH v3/GSoC 3/5] git-credential-cache: put socket to xdg-compatible path

2016-03-25 18:00 GMT+08:00 Jeff King : > On Wed, Mar 23, 2016 at 06:13:23PM +0800, Hui Yiqun wrote: > >> move .git-credential-cache/socket to xdg_runtime_dir("credential-cache.sock") > > Motivation? I will improve my commit message. > >> diff --git a/credential-cache.c

Re: [PATCH] tag.c: move PGP verification code from plumbing

> > - signal(SIGPIPE, SIG_IGN); > > while (i < argc) > > - if (verify_tag(argv[i++], flags)) > > + name = argv[i++]; > > + if (get_sha1(name, sha1)) > > + return error("tag '%s' not found.", name); > > + > > +

Re: [PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

On Fri, Mar 25, 2016 at 8:16 PM, SZEDER Gábor wrote: > By redirecting grep's output to a file in the editor script, like this > patch wanted to, we can count the lines in the test script itself after > 'git commit' finished. This way we could use test_line_count, with > all

Re: [PATCH 3/4] submodule--helper list: lose the extra prefix option

Junio C Hamano writes: > Stefan Beller writes: > >> The usual early machinery of Git is to change the directory to >> the top level of the working tree and pass the actual path inside >> the working tree as `prefix` to the command being run. >> >> This is

Re: [PATCH v3 0/5] Expanding tabs in "git log" output

Torsten Bögershausen writes: > On 2016-03-24 19.22, Junio C Hamano wrote: >> Torsten Bögershausen writes: >> >>> Would it make sense to have >>> git log --tab-size=8 >>> (or similar) >>> >>> and add a config variable like >>> git config ui.logtabsize >>> which is

Re: [PATCH 1/4] submodule: fix recursive path printing from non root directory

Stefan Beller writes: > Recursing into submodules currently works by just calling > (cd $submodule && eval ) for update, sync and status > command. > > Say you have the following setup > > repo/ # a superproject repository > repo/untracked/ # an untracked dir in repo/ >

Re: [PATCH 2/4] submodule: fix recursive execution from non root directory

Stefan Beller writes: > Most times that directory doesn't exist and we error out. Fix this bug > by clearing wt_prefix, such that any recursive instances of will assume > to operate from the respective root of the respective submodule. As long as the recursive instances do

Re: [PATCH 1/4] submodule: fix recursive path printing from non root directory

On Fri, Mar 25, 2016 at 9:43 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> Recursing into submodules currently works by just calling >> (cd $submodule && eval ) for update, sync and status >> command. >> >> Say you have the following setup >> >>

Re: [PATCH 1/2] Modified flag field type in rev_list_info struct in bisect.h. There is no need for flag field to be signed, as it is not supposed to be used as decimal.

[please respond inline rather than top-posting] On Fri, Mar 25, 2016 at 8:53 AM, work wrote: > On 03/25/2016 09:18 AM, Junio C Hamano wrote: >> Stefan Beller writes: >>> Maybe my exposure to the code was accidentally in a way such that >>> I ever only

Re: [PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

On Fri, Mar 25, 2016 at 10:46 AM, SZEDER Gábor wrote: > Quoting Eric Sunshine : >> On Thu, Mar 24, 2016 at 7:00 AM, SZEDER Gábor wrote: -cat >check-for-diff <>>> -#!$SHELL_PATH -exec grep '^diff --git' "\$1"

Re: [PATCH v3/GSoC 2/5] path.c: implement xdg_runtime_dir()

On Fri, Mar 25, 2016 at 09:55:59AM -0700, Junio C Hamano wrote: > 惠轶群 writes: > > >> There's a lot of "what" here that the caller doesn't really care about, > >> and which may go stale with respect to the implementation over time. Can > >> we make something more succinct

Re: [PATCH v3/GSoC 2/5] path.c: implement xdg_runtime_dir()

Jeff King writes: >> > That's clearer, but if I were the caller, I would worry about the >> > security of the path. >> > How about adding: >> > >> > The security of the path is ensured by file permission. >> >> Is "by file permission" descriptive enough? >> >> To protect

Re: [PATCH v10 0/2] introduce --[no-]autostash command line flag

On Fri, Mar 25, 2016 at 12:53 PM, Eric Sunshine wrote: > On Mon, Mar 21, 2016 at 2:18 PM, Mehul Jain wrote: >> Changes introduced w.r.t. previous patch: >> [...] >> * Two more tests are added to checkout for error when "git pull >>

Re: How to use @{-1} with push?

On Fri, Mar 25, 2016 at 12:45 PM, Junio C Hamano wrote: > You can ask rev-parse to give you --symbolic-full-name, error out if > it is empty (i.e. detached HEAD), and otherwise use the result, no? > > $ git checkout next > $ git checkout master > $ git rev-parse

Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag

On Fri, Mar 25, 2016 at 2:01 PM, Eric Sunshine wrote: >> +test_expect_success 'pull --rebase --autostash & rebase.autostash=true' ' > > Nit: Some of the test titles spell this as "rebase.autostash" while > others use "rebase.autoStash". That's a mistake. All test titles

Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag

On Fri, Mar 25, 2016 at 2:35 PM, Matthieu Moy wrote: > Mehul Jain writes: > >> +--autostash:: >> +--no-autostash:: >> + Before starting rebase, stash local modifications away (see >> + linkgit:git-stash[1]) if needed, and apply the

Re: How to use @{-1} with push?

On Fri, Mar 25, 2016 at 1:02 PM, Robert Dailey wrote: > On Fri, Mar 25, 2016 at 12:45 PM, Junio C Hamano wrote: >> You can ask rev-parse to give you --symbolic-full-name, error out if >> it is empty (i.e. detached HEAD), and otherwise use the result,

Re: [PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

On Fri, Mar 25, 2016 at 10:34 PM, Eric Sunshine wrote: > That works too, simplifying the overall implementation, and > eliminating the need for the introductory patch which moves > 'test_set_editor' into each test. Wouldn't it be cleaner if the introductory patch

Re: [GSoC] A late proposal: a modern send-email

惠轶群 writes: > # Purpose > The current implementation of send-email is based on perl and has only > a tui, it has two problems: > - user must install a ton of dependencies before submit a single patch. > - tui and parameter are both not quite friendly to new users. Is "a ton

Re: [PATCH v2] api-parse-options.txt: document OPT_CMDMODE()

I have used bits from your email. I forgot to add "Helped-by: Junio C Hamano " . Could you squash it in? On Sat, Mar 26, 2016 at 12:28 AM, Pranit Bauva wrote: > OPT_CMDMODE mechanism was introduced in the release of 1.8.5 to actively > notice when

Re: [RFC/GSOC] Git Beginner | Warnings for potentially destructive commands

On Fri, Mar 25, 2016 at 10:38 AM, Junio C Hamano wrote: > The above two examples make me wonder if these should be static > text. "ggit rebase" and "ggit reset" have full information of the > concrete branch names, commit object names and the actual topology > of the history,

[PATCH 1/2] mergetools: create mergetool_find_win32_cmd() helper function for winmerge

Signed-off-by: Jacob Nisnevich --- git-mergetool--lib.sh | 25 + mergetools/winmerge | 21 + 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index

[PATCH 2/2] mergetools: add support for ExamDiff

Signed-off-by: Jacob Nisnevich --- mergetools/examdiff | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 mergetools/examdiff diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index 000..7b524d4 --- /dev/null

Re: [PATCHv3 1/5] submodule: prepare recursive path from non root directory

Stefan Beller writes: > diff --git a/git-submodule.sh b/git-submodule.sh > index 43c68de..d83608c 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -825,8 +825,9 @@ Maybe you want to use 'update --init'?")" > if test -n "$recursive" >

Re: [PATCHv3 5/5] submodule--helper clone: lose the extra prefix option

Junio C Hamano writes: > This helper is called from the root level of the superproject's > working tree (after cd_to_toplevel is done), and has options like > --url. If the user named --url with a relative pathname to a local > repository directory (or a bundle file),

Re: [PATCHv3 5/5] submodule--helper clone: lose the extra prefix option

Stefan Beller writes: > The replacement works fine in all tests except for the recursive > tests as then the chdir is an important detail. In the submodule > there is no $wt_prefix (as it is the parents' wt_prefix we passed in), So the real reason is that we may tweak

Re: [PATCH 1/2] mergetools: create mergetool_find_win32_cmd() helper function for winmerge

Jacob Nisnevich writes: > Signed-off-by: Jacob Nisnevich > --- > git-mergetool--lib.sh | 25 + > mergetools/winmerge | 21 + > 2 files changed, 26 insertions(+), 20 deletions(-) > > diff --git

Re: [PATCHv3 5/5] submodule--helper clone: lose the extra prefix option

Stefan Beller writes: >> Of course by using -C, you might notice that repo/sub/untracked does >> not exist, but that is not a proper error checking---what if the >> submodule at repo/sub does have a directory with that name? IOW, >> the computation that gave

Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag

On Sat, Mar 26, 2016 at 12:07 AM, Matthieu Moy wrote: > I think you should also change one of the tests to use pull.resbase=true > so that this behavior is properly tested. Sure. I will add this test in the re-roll. Thanks, Mehul -- To unsubscribe from this list:

Re: [PATCH v2 0/5] branch: fix branch operations with multiple working trees

Kazuki Yamaguchi writes: > [1/5] > Adds RESOLVE_REF_COMMON_DIR to resolve_ref_unsafe(). The second - fourth > patch depend on this. At the same time, this allows us to remove > reimplementation of resolve_ref_unsafe() in worktree.c: parse_ref(). > > [2/5] > Adds REF_COMMON_DIR flag

Re: [PATCHv3 5/5] submodule--helper clone: lose the extra prefix option

On Fri, Mar 25, 2016 at 1:54 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> This helper is called from the root level of the superproject's >> working tree (after cd_to_toplevel is done), and has options like >> --url. If the user named --url with

Re: [PATCHv3 5/5] submodule--helper clone: lose the extra prefix option

On Fri, Mar 25, 2016 at 3:39 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> The replacement works fine in all tests except for the recursive >> tests as then the chdir is an important detail. In the submodule >> there is no $wt_prefix (as it is the

Re: [PATCHv3 5/5] submodule--helper clone: lose the extra prefix option

Stefan Beller writes: > In the rewrite from shell to C (ee8838d157761, 2015-09-08, submodule: > rewrite `module_clone` shell function in C), we never made use of the > prefix. Probably it sneaked in as module_list which was converted in the > same series had the prefix as

[PATCH v3] api-parse-options.txt: document OPT_CMDMODE()

OPT_CMDMODE mechanism was introduced in the release of 1.8.5 to actively notice when multiple "operation mode" options that specify mutually incompatible operation modes are given. Helped-by: Junio C Hamano Signed-off-by: Pranit Bauva ---

Re: [PATCH v2] api-parse-options.txt: document OPT_CMDMODE()

Pranit Bauva writes: > I have used bits from your email. I forgot to add "Helped-by: Junio C > Hamano " . Could you squash it in? It's OK to omit such a credit for a patch this small. After understanding the issues, you would have written essentially

Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag

On Fri, Mar 25, 2016 at 2:07 PM, Mehul Jain wrote: > On Fri, Mar 25, 2016 at 2:01 PM, Eric Sunshine > wrote: >> Nit: Some of the test titles spell this as "rebase.autostash" while >> others use "rebase.autoStash". >> [...] >> The title says

[PATCH 0/2] add support for ExamDiff

I implemented all the changes you suggested and separated the patch into two different patches. Thanks for all the help David. Jacob Nisnevich (2): mergetools: create mergetool_find_win32_cmd() helper function for winmerge mergetools: add support for ExamDiff git-mergetool--lib.sh | 25

Re: [PATCH v2 5/5] branch -d: refuse deleting a branch which is currently checked out

Kazuki Yamaguchi writes: > When a branch is checked out by current working tree, deleting the > branch is forbidden. However when the branch is checked out only by > other working trees, deleting is allowed. > Use find_shared_symref() to check if the branch is in use, not just >

What's cooking in git.git (Mar 2016, #05; Fri, 25)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. We'll have 2.8 final early next

Re: [PATCH] t7012: Implement test for git-checkout

On 2016-03-25 18.36, Chhatoi Pritam Baral wrote: Thanks for working on Git. Some comments inline. > Previously a TODO, this patch adds a test for git-checkout skipping a > file with the > skip-worktree bit set. Micro-nit: the "this patch ..." may be written shorter: > Previously a TODO, add a test

Re: [PATCH v9 2/3] t7507-commit-verbose: make test suite use write_script

On Fri, Mar 25, 2016 at 2:15 PM, Pranit Bauva wrote: > On Fri, Mar 25, 2016 at 10:34 PM, Eric Sunshine > wrote: >> That works too, simplifying the overall implementation, and >> eliminating the need for the introductory patch which moves >>

[PATCH 1/2] mergetools: create mergetool_find_win32_cmd() helper function for winmerge

Signed-off-by: Jacob Nisnevich --- git-mergetool--lib.sh | 25 + mergetools/winmerge | 21 + 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index

[PATCH 0/2] mergetools: add support for ExamDiff

OK I add the quotes and modified the comment. I also changed $folder to $sub_directory. I think that makes a little bit more sense and sounds a lot better. Jacob Nisnevich (2): mergetools: create mergetool_find_win32_cmd() helper function for winmerge mergetools: add support for ExamDiff

[PATCH 2/2] mergetools: add support for ExamDiff

Signed-off-by: Jacob Nisnevich --- mergetools/examdiff | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 mergetools/examdiff diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index 000..7b524d4 --- /dev/null

Re: [PATCH v2] t7012: Implement test for git-checkout

On 03/26/2016 05:04 AM, Chhatoi Pritam Baral wrote: > Previously a TODO; add a test for git-checkout skipping a > file with the skip-worktree bit set. > > Signed-off-by: Chhatoi Pritam Baral > --- > > This is a microproject for my GSoC '16 application. > > Thanks,

Re: [PATCHv3 5/5] submodule--helper clone: lose the extra prefix option

On Fri, Mar 25, 2016 at 4:15 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> Of course by using -C, you might notice that repo/sub/untracked does >>> not exist, but that is not a proper error checking---what if the >>> submodule at repo/sub does

Re: [GSoC] Proposal

I had updated the proposal before deadline, if someone is interesting. 2016-03-25 15:12 GMT+08:00 惠轶群 : > Well, I should have done some search before ask. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org

Re: [PATCH] t7012: Implement test for git-checkout

On Fri, Mar 25, 2016 at 1:36 PM, Chhatoi Pritam Baral wrote: > Previously a TODO, this patch adds a test for git-checkout skipping a > file with the skip-worktree bit set. In addition to Torsten's comments... > diff --git a/t/t7012-skip-worktree-writing.sh >

[PATCH v2] t7012: Implement test for git-checkout

Previously a TODO; add a test for git-checkout skipping a file with the skip-worktree bit set. Signed-off-by: Chhatoi Pritam Baral --- This is a microproject for my GSoC '16 application. Thanks, Torsten, for pointing out my mistakes. :) It was my first time sending

Re: [GSoC] A late proposal: a modern send-email

2016-03-26 2:16 GMT+08:00 Junio C Hamano : > 惠轶群 writes: > >> # Purpose >> The current implementation of send-email is based on perl and has only >> a tui, it has two problems: >> - user must install a ton of dependencies before submit a single patch. >> -

[PATCH v2 0/5] branch: fix branch operations with multiple working trees

[1/5] Adds RESOLVE_REF_COMMON_DIR to resolve_ref_unsafe(). The second - fourth patch depend on this. At the same time, this allows us to remove reimplementation of resolve_ref_unsafe() in worktree.c: parse_ref(). [2/5] Adds REF_COMMON_DIR flag to lock_ref_sha1_basic(). [3/5] Adds

[PATCH v2 1/5] refs: add new flag RESOLVE_REF_COMMON_DIR to resolve_ref_unsafe

If the new flag RESOLVE_REF_COMMON_DIR is passed to resolve_ref_unsafe, it assumes the refname belongs to $GIT_COMMON_DIR. resolve_ref_unsafe currently has no way to resolve worktree-specific refs such as HEAD of the main working tree when we are in a linked working tree. worktree.c has a

[PATCH v2 4/5] branch -m: update all per-worktree HEADs

When renaming a branch, the current code only updates the current working tree's HEAD, but it should update .git/HEAD of all checked out working trees. This is the current behavior, /path/to/wt's HEAD is not updated: % git worktree list /path/to 2c3c5f2 [master] /path/to/wt 2c3c5f2

[PATCH v2 3/5] refs: add create_symref_common_dir as a variation of create_symref

Add a new function create_symref_common_dir. This function passes REF_COMMON_DIR to lock_ref_sha1_basic, unlike create_symref, so to make it possible to update main working tree's per-worktree symbolic refs (HEAD) when we are in a linked working tree. Assume we have a linked working tree and we

[PATCH v2 5/5] branch -d: refuse deleting a branch which is currently checked out

When a branch is checked out by current working tree, deleting the branch is forbidden. However when the branch is checked out only by other working trees, deleting is allowed. Use find_shared_symref() to check if the branch is in use, not just comparing with the current working tree's HEAD.

  1   2   >