Desired so that you can office 2010 key online website!

Desired so that you can Business 2010 online website! [url=http://www.buyoffice2010keyshop.com/] office 2010[/url] by using quite a few innovative benefits involve innovative theme auto-highlight, a lot quicker synchronization, real-time variations demonstrate, release aid plus article writer wa

microsoft windows 8 Operating system Is actually Functioned With Computer system Products

Various facts are beginning to crop up connected with cures can expect on the primary creation connected with Intel-based * microsoft windows 8* . When the leaked available requirements on the Dell Microsoft windows 8 gadget usually are almost any clue, neverth

Re: [PATCH] count-objects: output "KiB" instead of "kilobytes"

I'm really sorry about that. I'll make sure to run the tests before sending patches in the future. On Wed, Apr 3, 2013 at 12:01 AM, Junio C Hamano wrote: > Mihai Capotă writes: > >> The code uses division by 1024. Also, the manual uses "KiB". >> >> Signed-off-by: Mihai Capotă >> --- >> builtin

Your Dirty Close family By using Minor Parental Regulate With cheap pandora bracelets

You're keen on all those excellent * pandora uk* , not? I actually do believe that most people conduct, plus there's a simple cause for this. They really are attractive, personally special. Precisely what definitely to not ever for instance, once all of?

[PATCH] test-lint-duplicates: Only check for numbered test cases

Running make inside contrib/remote-helpers fails in "test-lint-duplicates" This was because the regexp checking for duplicate numbers strips everything after the first "-" in the filename, including the prefix. As a result, 2 pathnames like "/contrib/remote-helpers/test-bzr.sh" and "/cont

Re: [PATCH 1/3] remote-helpers: fix the run of all tests

On 02.04.13 19:36, Jeff King wrote: > On Tue, Apr 02, 2013 at 06:53:28PM +0200, Torsten Bögershausen wrote: > >>> I think the check for duplicate-numbers is the only one that does not >>> make sense. >> [] >> Not sure about that, I send a suggestion of a patch in a minute. >> Highlights: >> 1) -

Adore A pandora bracelet charms

You will see loads of styles of * pandora charms* available around the sector because time frame with it has the conceiving. You could find as well pretty much, tons, or 1000s, with layouts out there that makes customization down with the help of an affor

thomas sabo sale Is certainly Certainly It will Conveniently Know The majority Periods

* thomas sabo charms* hired pondering that your initiate with a venue from your different as well as one of a kind shimmering purple, options revised inside a good point pertaining to key high-quality merged with layout make improvements to. Just about e

[BUG] shallow clones over http

I'm trying to track down a protocol bug that happens with shallow clones over smart-http. As far as I can tell, the bug has existed in all versions. You can reproduce it using the attached repository, which is a shallow clone of https://github.com/mileszs/ack.vim.git, like: $ tar xzf repo.tar.g

Re: [PATCH] test-lint-duplicates: check numbering in contrib/remote-helpers

On Tue, Apr 2, 2013 at 12:53 PM, Torsten Bögershausen wrote: > Running make inside contrib/remote-helpers failes in "test-lint-duplicates" s/failes/fails/ > This was because the regexp to check for duplicate numbers strips everything > after the first "-" in the filename, including the prefix. >

Re: [PATCH 2/2] optimize adjust_shared_perm() in path.c:

On Sat, Mar 30, 2013 at 5:53 AM, Torsten Bögershausen wrote: > sometimes the chown() function is called even when not needed. > (This can be provoced by running t1301, and adding some debug code) s/provoced/provoked/ > Save a chmod from 400 to 400, or from 600->600 on these files: > .git/info/r

Re: [PATCH V3 4/5] Help.c: add list_common_guides_help() function

On Tue, Apr 2, 2013 at 6:39 PM, Philip Oakley wrote: > Re-use list_common_cmds_help but simply change the array name. > Candidate for future refactoring to pass a pointer to the array. > > The common-guides.h list was generated with a simple variant of the > generate-cmdlist.sh and command-list.tx

Re: [PATCH V3 5/5] Help doc: Include --guide option description

On Tue, Apr 2, 2013 at 6:39 PM, Philip Oakley wrote: > OPTIONS > --- > -a:: > --all:: > Prints all the available commands on the standard output. This > - option supersedes any other option. > + option overides any given command or guide name. s/overides/overrides/ >

Re: [PATCH 00/13] remote-hg: general updates

On Tue, Apr 2, 2013 at 4:23 PM, Max Horn wrote: > > On 02.04.2013, at 22:09, John Keeping wrote: > >> On Tue, Apr 02, 2013 at 01:02:49PM -0600, Felipe Contreras wrote: >>> Here is the next round of patches for remote-hg, some which have been >>> contributed through github. >>> >>> Fortunately it s

Re: [PATCH V3 2/5] Help.c use OPT_BOOL and refactor logic

Junio C Hamano writes: > You are creating a gap in the output so that you can add some more > stuff in later patches, which is fine, but I do not think we call > that kind of change a "refactor" ;-). > > The change looks fine. I'll queue what I suggested on 'pu' for now. Thanks. -- To unsubscri

Re: Rename conflicts in the index

Junio C Hamano writes: > If I were solving the issue, I would probably proceed like this: > > * Start from a rough sketch of what extra information I would want >to store in the new index extension section. > > * Teach read-cache.c to read from the new extension and keep it in >an in-co

Re: Rename conflicts in the index

Edward Thomson writes: > Junio C Hamano [mailto:gits...@pobox.com] wrote: >> Edward Thomson writes: >> > Junio, did you have additional thoughts on this? >> >> Not at this moment. >> >> I think we have covered the principles (do not unnecessarily duplicate >> information, do not break existing

Re: [PATCH v2 2/4] transport-helper: check if remote helper is alive

Felipe Contreras writes: > Otherwise transport-helper will continue checking for refs and other > things what will confuse the user more. > --- Sign-off? > git-remote-testgit| 11 +++ > t/t5801-remote-helpers.sh | 19 +++ > transport-helper.c| 8 +++

Re: [PATCH V3 2/5] Help.c use OPT_BOOL and refactor logic

Philip Oakley writes: > Rename deprecated OPT_BOOLEAN option to OPT_BOOL in preparation for > 'git help --guides'. The former OPT_BOOLEAN would now be OPT_COUNTUP, > but that capability is not required. > > Separate out the show_all 'return(0)' and git_more_info_string logic > ready for inclusion

Re: [PATCH V3 1/5] Show help: -a and -g option, and 'git help ' usage.

Philip Oakley writes: > Prepare for the addition of the -g --guides option to git help > and show that help is available for both concept guides, and commands. > > Signed-off-by: Philip Oakley > --- This should come at the end after you taught the "-g" option, I think. If we stopped with 1/5,

Re: [PATCH V3 5/5] Help doc: Include --guide option description

Philip Oakley writes: > +To display the linkgit:git[1] man page, use 'git help git'. Good to see that somebody remembers that we discussed this ;-) -- 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 ht

Re: [PATCH V3 4/5] Help.c: add list_common_guides_help() function

Philip Oakley writes: > Re-use list_common_cmds_help but simply change the array name. > Candidate for future refactoring to pass a pointer to the array. > > The common-guides.h list was generated with a simple variant of the > generate-cmdlist.sh and command-list.txt. > > Do not list User-manual

Re: [PATCH 1/2] diffcore-break: don't divide by zero

John Keeping writes: > The message for commit 6dd4b66 (Fix diffcore-break total breakage) > indicates that "don't bother to break small files" is wrong in some > cases, but it I wonder if "don't bother to break empty files" is okay. This has a rather subtle ramifications, and we would need to th

[PATCH V3 4/5] Help.c: add list_common_guides_help() function

Re-use list_common_cmds_help but simply change the array name. Candidate for future refactoring to pass a pointer to the array. The common-guides.h list was generated with a simple variant of the generate-cmdlist.sh and command-list.txt. Do not list User-manual and Everday Git which not follow th

[PATCH V3 2/5] Help.c use OPT_BOOL and refactor logic

Rename deprecated OPT_BOOLEAN option to OPT_BOOL in preparation for 'git help --guides'. The former OPT_BOOLEAN would now be OPT_COUNTUP, but that capability is not required. Separate out the show_all 'return(0)' and git_more_info_string logic ready for inclusion of show_guides. Signed-off-by: Ph

[PATCH V3 3/5] Help.c add --guide option

Logic, but no actions, included. The --all commands option, if given, will display first. The --guide option's list will then be displayed. The common commands list is only displayed if neither option, nor a command or guide name, is given. Signed-off-by: Philip Oakley --- builtin/help.c | 10

[PATCH V3 5/5] Help doc: Include --guide option description

Note that the ability to display an individual guide was always possible. Include this in the update. Also tell readers how git(1) can be accessed, especially for Git for Windows users who do not have the 'man' command. Likewise include a commentary on how to access this page (Catch 22). Signed-o

[PATCH V3 1/5] Show help: -a and -g option, and 'git help ' usage.

Prepare for the addition of the -g --guides option to git help and show that help is available for both concept guides, and commands. Signed-off-by: Philip Oakley --- git.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git.c b/git.c index 39ba6b1..2f8aa41 100644 --- a/gi

[PATCH V3 0/5] Git help option to list user guides

This is the re-roll of $gmane/217384. The series seeks to provide a help option that will list the common git guides, and how to access them. The series is rebased on top of V1.8.2 Since V2, the OPT_BOOL is now used instead of OPT_COUNTUP. The git_more_info_string has been further updated inline

Re: [PATCH 00/13] remote-hg: general updates

On 02.04.2013, at 22:09, John Keeping wrote: > On Tue, Apr 02, 2013 at 01:02:49PM -0600, Felipe Contreras wrote: >> Here is the next round of patches for remote-hg, some which have been >> contributed through github. >> >> Fortunately it seems to be working for the most part, but there are some

Re: [PATCH] count-objects: output "KiB" instead of "kilobytes"

Mihai Capotă writes: > The code uses division by 1024. Also, the manual uses "KiB". > > Signed-off-by: Mihai Capotă > --- > builtin/count-objects.c |2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/count-objects.c b/builtin/count-objects.c > index 9afaa88..ecc1

Re: [RFC/PATCH 0/5] branch --set-upstream-to error-message improvements

Jeff King writes: > On Tue, Apr 02, 2013 at 01:51:13PM -0400, Jeff King wrote: > >> Things slowly improve as people make suggestions. I think the thing that >> might have helped here is better advice when "set-upstream-to" is >> pointed to a ref that does not exist. >> >> Patches coming in a min

Re: [PATCH 1/2] diffcore-break: don't divide by zero

On Tue, Apr 02, 2013 at 02:15:17PM -0700, Junio C Hamano wrote: > John Keeping writes: > > > When the source file is empty, the calculation of the merge score > > results in a division by zero. Since the merge score is initialized to > > zero, it makes sense to just leave it as it is if the sour

RE: Rename conflicts in the index

Junio C Hamano [mailto:gits...@pobox.com] wrote: > Edward Thomson writes: > > Junio, did you have additional thoughts on this? > > Not at this moment. > > I think we have covered the principles (do not unnecessarily duplicate > information, do not break existing implementations unnecessarily, et

Re: Rename conflicts in the index

Edward Thomson writes: > Edward Thomson [ethom...@microsoft.com] wrote: >> Junio C Hamano [mailto:gis...@pobox.com] wrote: >> > * Path A may have only stage #1, while path B and C has only stage >> >#2 and stage #3 (the user would have to notice these three >> >correspond to each other,

Re: [PATCH 1/2] diffcore-break: don't divide by zero

John Keeping writes: > When the source file is empty, the calculation of the merge score > results in a division by zero. Since the merge score is initialized to > zero, it makes sense to just leave it as it is if the source size is > zero. This means that we still use the extent of damage metr

Re: [PATCH 2/2] bisect: avoid signed integer overflow

John Keeping writes: > Signed-off-by: John Keeping > --- > bisect.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/bisect.c b/bisect.c > index bd1b7b5..0d33c6f 100644 > --- a/bisect.c > +++ b/bisect.c > @@ -526,7 +526,7 @@ struct commit_list *filter_skipped(struct comm

RE: Rename conflicts in the index

Edward Thomson [ethom...@microsoft.com] wrote: > Junio C Hamano [mailto:gis...@pobox.com] wrote: > > * Path A may have only stage #1, while path B and C has only stage > >#2 and stage #3 (the user would have to notice these three > >correspond to each other, and resolve manually). > > > >

Re: ZSH segmentation fault while completing "git mv dir/"

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 02/04/2013 16:32, Matthieu Moy ha scritto: > Felipe Contreras writes: > >> And this is a workaround: >> >> --- a/contrib/completion/git-completion.zsh >> +++ b/contrib/completion/git-completion.zsh >> @@ -66,7 +66,7 @@ __gitcomp_file () >> >>

Re: [PATCH 00/13] remote-hg: general updates

Felipe Contreras writes: > On Tue, Apr 2, 2013 at 1:55 PM, Junio C Hamano wrote: > >>> Fortunately it seems to be working for the most part, but there are some >>> considerable issues while pushing branches and tags. >> >> Do you have a plan in mind what to do about "some considerable >> issues"

Re: [PATCH 07/13] remote-hg: redirect buggy mercurial output

Felipe Contreras writes: > On Tue, Apr 2, 2013 at 1:58 PM, Junio C Hamano wrote: >> Felipe Contreras writes: >> >>> We can't use stdout for that in remote helpers. >>> >>> Signed-off-by: Felipe Contreras >>> --- >> >> You may want to clarify "buggy output" a bit. Will mercurial >> forever be

Re: [PATCH 1/2] status: show 'revert' state and status hint

Junio C Hamano writes: >> +if (advice_status_hints) { >> +} >> +if (advice_status_hints) >> +status_printf_ln(s, color, >> +_(" (use \"git revert --abort\" to cancel the revert >> operation)")); > > Why not a single conditional? i.e. > > if (adv

Re: [PATCH 00/13] remote-hg: general updates

On Tue, Apr 2, 2013 at 1:55 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Here is the next round of patches for remote-hg, some which have been >> contributed through github. > > Thanks. > >> Fortunately it seems to be working for the most part, but there are some >> considerable issu

Re: [PATCH 07/13] remote-hg: redirect buggy mercurial output

On Tue, Apr 2, 2013 at 1:58 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> We can't use stdout for that in remote helpers. >> >> Signed-off-by: Felipe Contreras >> --- > > You may want to clarify "buggy output" a bit. Will mercurial > forever be broken? Some versions of Hg emit [[[i

Re: git https transport and wrong password

On Tue, Apr 02, 2013 at 04:05:51PM -0400, Jeff King wrote: > On Tue, Apr 02, 2013 at 10:47:51PM +0300, Mikko Rapeli wrote: > > > Don't know anything about curl but maybe git could parse the url for a > > username and prompt for the password before the first 401 failure roundtrip > > that's now in

Re: [PATCH 1/2] status: show 'revert' state and status hint

Matthieu Moy writes: > +static void show_revert_in_progress(struct wt_status *s, > + struct wt_status_state *state, > + const char *color) > +{ > + status_printf_ln(s, color, _("You are currently reverting a commit.")); >

Re: [PATCH/RFC] Changing submodule foreach --recursive to be depth-first, --parent option to execute command in supermodule as well

Seems were getting closer, some comments from a quick read of your patch below. Am 26.03.2013 05:03, schrieb Eric Cousineau: > From 2c2923ada809d671828aa58dcda05a1b71222b70 Mon Sep 17 00:00:00 2001 > From: Eric Cousineau > Date: Mon, 25 Mar 2013 22:27:06 -0500 > Subject: [PATCH] submodule-foreach

Re: [PATCH 00/13] remote-hg: general updates

On Tue, Apr 02, 2013 at 01:02:49PM -0600, Felipe Contreras wrote: > Here is the next round of patches for remote-hg, some which have been > contributed through github. > > Fortunately it seems to be working for the most part, but there are some > considerable issues while pushing branches and tags

Re: git https transport and wrong password

On Tue, Apr 02, 2013 at 10:47:51PM +0300, Mikko Rapeli wrote: > Don't know anything about curl but maybe git could parse the url for a > username and prompt for the password before the first 401 failure roundtrip > that's now in place. I guess most of this logic is in http.c. We used to do that b

Re: Composing git repositories

Am 02.04.2013 20:35, schrieb Ramkumar Ramachandra: > Jens Lehmann wrote: >> But I think we recently learned to support that use case with >> submodules. I think there are two floating models: >> >> - Tracked: >> [...] >> >> - Untracked: >> Some people just want "the newest" tip of a branch checke

Re: [PATCH 07/13] remote-hg: redirect buggy mercurial output

Felipe Contreras writes: > We can't use stdout for that in remote helpers. > > Signed-off-by: Felipe Contreras > --- You may want to clarify "buggy output" a bit. Will mercurial forever be broken? Some versions of Hg emit [[[it is unclear for Junio to tell what it is to fill this blank]]] to

Re: Composing git repositories

Am 02.04.2013 19:44, schrieb Ramkumar Ramachandra: > Jonathan Nieder wrote: >> Elated is probably not the right word. More "annoyed at being told >> their work is ugly without an accompanying concrete and actionable bug >> report". :) > > If I had an actionable report, I'd have started hammering

Re: [PATCH 00/13] remote-hg: general updates

Felipe Contreras writes: > Here is the next round of patches for remote-hg, some which have been > contributed through github. Thanks. > Fortunately it seems to be working for the most part, but there are some > considerable issues while pushing branches and tags. Do you have a plan in mind wh

[PATCH 2/2] bisect: avoid signed integer overflow

Signed-off-by: John Keeping --- bisect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bisect.c b/bisect.c index bd1b7b5..0d33c6f 100644 --- a/bisect.c +++ b/bisect.c @@ -526,7 +526,7 @@ struct commit_list *filter_skipped(struct commit_list *list, * for this application.

[PATCH 1/2] diffcore-break: don't divide by zero

When the source file is empty, the calculation of the merge score results in a division by zero. Since the merge score is initialized to zero, it makes sense to just leave it as it is if the source size is zero. This means that we still use the extent of damage metric to decide whether to break t

[PATCH 0/2] Fixes for undefined behaviour

I've been playing with Clang's undefined behaviour sanitizer, which points out a few potential issues in Git when running the test suite (it's a runtime analysis that is compiled in by setting suitable CFLAGS). These patches fix one issue that I think we need to worry about and one that's trivial

Re: Composing git repositories

Ramkumar Ramachandra wrote: > What will I be merging and rebasing? One configuration file stuffed > with miscellaneous repositories. Don't you think this is highly > unpleasant? I spoke too fast. Isn't that exactly what we do with .gitmodules today (I'm not saying it's ideal, but I can't think

Re: git https transport and wrong password

On Tue, Apr 02, 2013 at 03:28:45PM -0400, Jeff King wrote: > We get redirected somewhere where we provide the (presumably wrong) > credential again. I do not think that is git's fault; the server asked > us to make the extra request. Is that part of the lockout procedure? If > it is not, it seems o

Re: [PATCH 4/5] branch: mention start_name in set-upstream error messages

On Tue, Apr 2, 2013 at 12:04 PM, Jeff King wrote: > If we refuse a branch operation because the tracking > start_name the user gave us is bogus, we just print > something like: > > fatal: Cannot setup tracking information; start point is not a branch > > If we mention the actual name we tried to

Re: [PATCH 2/5] branch: factor out "upstream is not a branch" error messages

On Tue, Apr 2, 2013 at 12:36 PM, Garrett Cooper wrote: > On Tue, Apr 2, 2013 at 12:03 PM, Jeff King wrote: >> >> This message is duplicated, and is quite long. Let's factor >> it out, which avoids the repetition and the long lines. It >> will also make future patches easier as we tweak the >> mes

Re: [PATCH 2/5] branch: factor out "upstream is not a branch" error messages

On Tue, Apr 2, 2013 at 12:03 PM, Jeff King wrote: > > This message is duplicated, and is quite long. Let's factor > it out, which avoids the repetition and the long lines. It > will also make future patches easier as we tweak the > message. > > While we're at it, let's also mark it for translation

Re: [PATCH] rerere forget: grok files containing NUL

Am 02.04.2013 21:18, schrieb Junio C Hamano: > Johannes Sixt writes: > >>> Does the three-way merge machinery replay recorded resolution for >>> such a binary file correctly (after your fix, that is)? >> >> Yes, it does. It recognizes the binary-ness and picks 'our' side. Only >> then comes rerer

Re: Composing git repositories

Jeff King wrote: > I'm happy to make my dump available to anyone who wants it, but it's > kind of big (about 1.4G uncompressed). Thanks. Can you put it up publicly somewhere (Dropbox comes to mind), and send me a link? -- To unsubscribe from this list: send the line "unsubscribe git" in the body

Re: Composing git repositories

Jonathan Nieder wrote: > Ramkumar Ramachandra wrote: >> Jonathan Nieder wrote: > >>> $ git clone git://repo.or.cz/git.git > [...] >>> Don't forget to "git clone -b todo git://repo.or.cz/git.git >>> git/Meta" >>> for maintenance scripts. >>> $ >> >> Nope, it's not ma

Re: git https transport and wrong password

On Tue, Apr 02, 2013 at 06:54:40PM +0300, Mikko Rapeli wrote: > I have a problem with git (1.7.9 and 1.8.2.357.gcc3e4eb) and https transport > to gerrit server (2.5.1-3-g719dfc7). I'm producing the problem on Cygwin but > my > colleagues have same issue on Linux as well. > > Gerrit server is mat

Re: Composing git repositories

Ramkumar Ramachandra wrote: > Jonathan Nieder wrote: >> $ git clone git://repo.or.cz/git.git [...] >> Don't forget to "git clone -b todo git://repo.or.cz/git.git git/Meta" >> for maintenance scripts. >> $ > > Nope, it's not mandatory for everyone to use dotfiles.git

Re: Composing git repositories

Seth Robertson wrote: > > In message > , > Ramkumar Ramachandra writes: > > As a user inexperienced with recursive submodules (I've only used them > in this repository), I found it highly confusing. Thanks for clearing > them up. > > You may want to investigate third party alternativ

Re: [PATCH] rerere forget: grok files containing NUL

Johannes Sixt writes: >> Does the three-way merge machinery replay recorded resolution for >> such a binary file correctly (after your fix, that is)? > > Yes, it does. It recognizes the binary-ness and picks 'our' side. Only > then comes rerere_mem_getline into play. Surely getline() needs to be

Re: [PATCH v2 1/4] run-command: add new check_command helper

Am 02.04.2013 12:31, schrieb Felipe Contreras: > And persistent_waitpid() to recover the information from the last run. I'm not a fan of this new API, because it looks like a workaround for a problem that should have been solved in a cleaner way. But if we can't avoid it, please also add a paragra

Re: check-attr doesn't respect recursive definitions

On Tue, Apr 02, 2013 at 10:16:55AM -0700, Junio C Hamano wrote: > > Yes, but as I explained later, the meaning of "apply an attribute to > > dir" in such cases is always equivalent to "apply attribute > > recursively to dir/*". So I do not think we are violating that rule to > > recursively apply

Re: Composing git repositories

Jonathan Nieder wrote: > That sounds similar to what Junio does with the Meta subdirectory in > his git development worktree. I don't think submodules are a good > fit, but it might make sense to start respecting a .motd file to allow > the following in a hypothetical world where everyone who clon

Re: Composing git repositories

Jonathan Nieder writes: > ..., but it might make sense to start respecting a .motd file to allow > the following in a hypothetical world where everyone who clones git > uses the same scripts Junio does: > > $ git clone git://repo.or.cz/git.git > Cloning into 'git'... > remote: C

Re: [BUG] inconsistent behavior with --set-upstream vs --set-upstream-to

Garrett Cooper wrote: > I push the branch to origin/ and then things tend to work, but since > I obviously had been doing things wrong what's the correct order of > operations for creating a branch and setting the upstream > appropriately? git push -u origin pjdfstest-onefs Thanks for a useful e

Re: RFC: allowing multiple parallel sequencers

On Tue, Apr 02, 2013 at 11:06:28AM -0700, Junio C Hamano wrote: > Neil Horman writes: > > > I've recently started looking into the possibility of having git support > > multiple in-progress sequencers, and wanted to solicit opinions for how > > best to > > do it The thoughts I had were:

[PATCH 5/5] branch: give advice when tracking start-point is missing

If the user requests to --set-upstream-to a branch that does not exist, then either: 1. It was a typo. 2. They thought the branch should exist. In case (1), there is not much we can do beyond showing the name we tried to use. For case (2), though, we can help to guide them through common wor

[PATCH 13/13] remote-hg: update tags globally

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 3130b23..c9d7636 100755 --- a/contrib/remote-helpers/git-remote-hg +

[PATCH 4/5] branch: mention start_name in set-upstream error messages

If we refuse a branch operation because the tracking start_name the user gave us is bogus, we just print something like: fatal: Cannot setup tracking information; start point is not a branch If we mention the actual name we tried to use, that may help the user figure out why it didn't work (e.g.

[PATCH 12/13] remote-hg: don't update bookmarks unnecessarily

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index a1b7e44..3130b23 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remot

[PATCH 3/5] branch: improve error message for missing --set-upstream-to ref

If we are trying to set the upstream config for a branch, the create_branch function will check both that the name resolves as a ref, and that it is either a local or remote-tracking branch. However, before we do so we run get_sha1 on it to find out whether it resolves at all (since the create_bra

[PATCH 11/13] remote-hg: force remote push

Ideally we shouldn't do this, as it's not recommended in mercurial documentation, but there's no other way to push multiple bookmarks (on the same branch), which would be the behavior most similar to git. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 2 +- 1 file cha

[PATCH 10/13] remote-hg: update remote bookmarks

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 5 + 1 file changed, 5 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 11162a2..160f486 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/rem

[PATCH 09/13] remote-hg: refactor export

No functional changes. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 73d79cb..11162a2 100755 ---

[PATCH 08/13] remote-hg: split bookmark handling

Will be useful for remote bookmarks. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 38 +++- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg in

[PATCH 07/13] remote-hg: redirect buggy mercurial output

We can't use stdout for that in remote helpers. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index b200e60..874ccd4 100755 --- a/contrib/re

[PATCH 06/13] remote-hg: trivial test cleanups

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg-bidi.sh | 5 ++--- contrib/remote-helpers/test-hg-hg-git.sh | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-hg-bidi.sh index fe38e49..

[PATCH 05/13] remote-hg: make sure fake bookmarks are updated

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 7 +++ contrib/remote-helpers/test-hg-bidi.sh | 1 + contrib/remote-helpers/test-hg-hg-git.sh | 1 + 3 files changed, 9 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/g

[PATCH 04/13] remote-hg: fix for files with spaces

From: Peter van Zetten Set the maximum number of splits to make when dividing the diff stat lines based on space characters. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/g

[PATCH 03/13] remote-hg: properly report errors on bookmark pushes

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 844ec50..19eb4db 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-h

[PATCH 02/13] remote-hg: add missing config variable in doc

From: Dusty Phillips Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 4 1 file changed, 4 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index d0dfb1e..844ec50 100755 --- a/contrib/remote-helpers/git-remot

[PATCH 01/13] remote-hg: trivial cleanups

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 328c2dc..d0dfb1e 100755 --- a/contrib/remote-helpers/git-remot

[PATCH 2/5] branch: factor out "upstream is not a branch" error messages

This message is duplicated, and is quite long. Let's factor it out, which avoids the repetition and the long lines. It will also make future patches easier as we tweak the message. While we're at it, let's also mark it for translation. Signed-off-by: Jeff King --- branch.c | 7 +-- 1 file c

[PATCH 00/13] remote-hg: general updates

Hi, Here is the next round of patches for remote-hg, some which have been contributed through github. Fortunately it seems to be working for the most part, but there are some considerable issues while pushing branches and tags. Dusty Phillips (1): remote-hg: add missing config variable in doc

Re: [PATCH] rerere forget: grok files containing NUL

Am 02.04.2013 00:48, schrieb Junio C Hamano: > Johannes Sixt writes: > >> Using 'git rerere forget .' after a merge that involved binary files >> runs into an infinite loop if the binary file contains a zero byte. >> Replace a strchrnul by memchr because the former does not make progress >> as so

[PATCH 1/5] t3200: test --set-upstream-to with bogus refs

These tests pass with the current code, but let's make sure we don't accidentally break the behavior in the future. Note that our tests expect failure when we try to set the upstream to or from a missing branch. Technically we are just munging config here, so we do not need the refs to exist. But

[RFC/PATCH 0/5] branch --set-upstream-to error-message improvements

On Tue, Apr 02, 2013 at 01:51:13PM -0400, Jeff King wrote: > Things slowly improve as people make suggestions. I think the thing that > might have helped here is better advice when "set-upstream-to" is > pointed to a ref that does not exist. > > Patches coming in a minute. Or 60 minutes. :) I'm

Re: Composing git repositories

Ramkumar Ramachandra wrote: > I should be able to > add in magit.git into my dotfiles repository For this, ideally what we'd want is a file that lists repositories that should be cloned at the same time as cloning the dotfiles repository, to reconst

Re: Composing git repositories

Jens Lehmann wrote: > But I think we recently learned to support that use case with > submodules. I think there are two floating models: > > - Tracked: > [...] > > - Untracked: > Some people just want "the newest" tip of a branch checked out in > the submodule and update that from time to time

Re: Aw: Re: [PATCH 1/3] Remove outdated/missleading/irrelevant entries from glossary-content.txt

Thomas Ackermann writes: >> Even though I personally am slightly in favor of removal, I suspect >> that is primarily because I already know what Git tag is, and it is >> different from the type tag in the Lisp-speak. >> > I assumed the cardinality of the set of Lisp users is so small that > this

Re: RFC: allowing multiple parallel sequencers

Neil Horman writes: > I've recently started looking into the possibility of having git support > multiple in-progress sequencers, and wanted to solicit opinions for how best > to > do it The thoughts I had were: > > 1) A per branch sequence directory... > 2) Augment the git-stash comma

Re: Composing git repositories

Jonathan Nieder writes: > If you are curious, at a quieter time it might be useful to ask for > pointers to the discussions that led to the current design, and folks > on the list might be glad to help. Not on the current design but the discussion before that round that influenced the outcome gr

  1   2   >