Re: [PATCH/RFC] Pinning of submodules

On Sun, Sep 6, 2015 at 6:08 PM, Anders Ro wrote: > On 04/09/15 07:02, Eric Sunshine wrote: >> On Wed, Sep 2, 2015 at 7:34 PM, Anders Ro wrote: >>> git-submodule.sh: pin submodule when branch name is '@' >>> >>> Setting branch name to '@'

Submit Your Manuscript For Proofreading

Dear colleague, Proofreading is a crucial part of writing and publication process, often influencing the acceptance or rejection of a manuscript. We have taken this into recognition and therefore request that writers in all fields should submit their manuscripts for proofreading. We have

Re: Questions about git-push for huge repositories

> Instead, the object transfer is optimized by comparing what commits > each side has and sending trees and blobs that are reachable from > the commits that the receiving side does not have. The sender A sends all the commits that the receiver B does not have. The commits contains trees and

Re: [PATCH v16 06/14] ref-filter: implement an `align` atom

On Sat, Sep 5, 2015 at 2:52 PM, Karthik Nayak wrote: > Implement an `align` atom which left-, middle-, or right-aligns the > content between %(align:...) and %(end). > > It is followed by `:,`, where the `` is > either left, right or middle and `` is the size of the area >

Important Notice!

CONRATULATION YOU HAVE WON 500.000.00GBP FROM SAMSUNG MOBILE DRAW CONTACT FOR CLIAMS VIA:(samsungawdcente...@outlook.com) WITH YOUR NAME: MOB: ADD: OCCP: -- 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

Re: [PATCH/RFC] Pinning of submodules

On 04/09/15 07:02, Eric Sunshine wrote: > On Wed, Sep 2, 2015 at 7:34 PM, Anders Ro wrote: >> Patch to make it possible to pin submodules so that they are not >> affected by the --remote option in "git submodule". > > Thanks for the patches. I don't use submodules, so

Re: Questions about git-push for huge repositories

I try to use 'git replace --graft' to work aroud this. Here's the process: cd A fetch ../B master:master_b git replace --graft master_b master_a # now master_b's parent is master_a # do a filter-branch to make the stone solid git filter-branch --tag-name-filter cat --

Re: [PATCH v16 05/14] ref-filter: introduce match_atom_name()

On Sat, Sep 5, 2015 at 2:52 PM, Karthik Nayak wrote: > Introduce match_atom_name() which helps in checking if a particular > atom is the atom we're looking for and if it has a value attached to > it or not. > > Use it instead of starts_with() for checking the value of

Re: [PATCH] tag: support mixing --sort= and -n

On Sat, Sep 5, 2015 at 9:38 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> On Sun, Sep 6, 2015 at 3:55 AM, Jacob Keller wrote: >>> On Sat, Sep 5, 2015 at 10:52 AM, Rudy Matela wrote: Allow

Questions about git-push for huge repositories

Hi all, I meet with a strange problem: I've two repositories, with sizes: - A: 6.1G - B: 6G Both A & B have been 'git gc' with: git reflog expire --expire=now --all git gc --prune=now --aggressive Since A & B share many common files, to save disk space, I'd like to merge them: (note:

Re: [PATCH] am: match --signoff to the original scripted version

Hi, Thanks for handling this. On Sun, Sep 6, 2015 at 12:56 PM, Junio C Hamano wrote: > Linus noticed that the recently reimplementated "git am -s" defines s/reimplementated/reimplemented/ ? > the trailer block too rigidly, resulting an unnecessary blank line s/resulting

[PATCH] filter-branch: add passed/remaining seconds on progress

From: Gabor Bernat adds seconds progress and estimated seconds time if getting the current timestamp is supported by the date %+s command Signed-off-by: Gabor Bernat --- I've submitted this first to this list as a feature request,

Re: [PATCH] am: match --signoff to the original scripted version

On Sun, Sep 6, 2015 at 12:56 PM, Junio C Hamano wrote: > diff --git a/builtin/am.c b/builtin/am.c > index 634f7a7..e7828e5 100644 > --- a/builtin/am.c > +++ b/builtin/am.c > @@ -1191,6 +1191,33 @@ static void NORETURN die_user_resolve(const struct > am_state *state) >

Re: [PATCH 5/5] test-lib-functions: detect test_when_finished in subshell

On Sat, Sep 5, 2015 at 9:12 AM, John Keeping wrote: > test_when_finished does nothing in a subshell because the change to > test_cleanup does not affect the parent. > > There is no POSIX way to detect that we are in a subshell ($$ and $PPID > are specified to remain

Re: [PATCH] filter-branch: add passed/remaining seconds on progress

On Sun, Sep 6, 2015 at 5:49 AM, Gabor Bernat wrote: > On Fri, Sep 4, 2015 at 10:15 PM, Eric Sunshine > wrote: >> On Fri, Sep 4, 2015 at 2:34 PM, Junio C Hamano wrote: >>> Gábor Bernát writes: +echo

Re: [PATCH] filter-branch: add passed/remaining seconds on progress

On Fri, Sep 4, 2015 at 10:15 PM, Eric Sunshine wrote: > On Fri, Sep 4, 2015 at 2:34 PM, Junio C Hamano wrote: >> Gábor Bernát writes: >>> +echo $(date +%s) | grep -q '^[0-9]+$'; 2>/dev/null && show_seconds=t >> >> That is very

Re: [PATCH 5/5] test-lib-functions: detect test_when_finished in subshell

On Sun, Sep 06, 2015 at 05:51:43AM -0400, Eric Sunshine wrote: > On Sat, Sep 5, 2015 at 9:12 AM, John Keeping wrote: > > test_when_finished does nothing in a subshell because the change to > > test_cleanup does not affect the parent. > > > > There is no POSIX way to detect

Re: What's cooking in git.git (Aug 2015, #06; Mon, 31)

Hi. On Mon, Aug 31, 2015 at 04:21:17PM -0700, Junio C Hamano wrote: > * mk/utf8-no-iconv-warn (2015-06-08) 1 commit > - utf8.c: print warning about disabled iconv > > Warn when a reencoding is requested in a build without iconv > support, as the end user is likely to get an unexpected result.

Re: [PATCH] am: match --signoff to the original scripted version

Paul Tan writes: >> + /* Does it have any Signed-off-by: in the text */ >> + for (cp = sb->buf; >> +cp && *cp && (cp = strstr(cp, sign_off_header)) != NULL; >> +cp = strchr(cp, '\n')) { >> + if (sb->buf == cp || cp[-1] ==

Re: Questions about git-push for huge repositories

Levin Du writes: > Since A & B share many common files, to save disk space, I'd like to merge > them: > (note: branch of A & B are independent, i.e. have no common ancestor.) Not having any shared history is exactly the cause. If the optimization were to exchange list of

Re: [PATCH] filter-branch: add passed/remaining seconds on progress

Gábor Bernát writes: > +if date '+%s' 2>/dev/null | grep -q '^[0-9][0-9]*$' > +then > + show_seconds=t > +else > + show_seconds= > +fi > + > +case "$show_seconds" in > +t) > + start_timestamp=$(date +%s) > + next_sample_at=0 > + ;; > +'') > +

Re: On a personal note

On 2015-09-03 15:06, Levente wrote: > Is the 'git for windows' development is in a separate branch? https://github.com/git-for-windows/git/ (see the "repository" link on the upper right of http://git-for-windows.github.io/). Ciao, Johannes -- To unsubscribe from this list: send the line

Re: [PATCH] am: match --signoff to the original scripted version

Paul Tan writes: > s/reimplementated/reimplemented/ ? > s/resulting an/resulting in an/ ? > s/extra blank/extra blank line/ ? Thanks. >> +static void am_signoff(struct strbuf *sb) >> +{ > > Hmm, okay, but now we have two similarly named functions am_signoff() > and

Re: [PATCH] am: match --signoff to the original scripted version

On Sat, Sep 5, 2015 at 9:56 PM, Junio C Hamano wrote: > > For > the upcoming release, stop using the append_signoff() in "git am" > and reimplement the looser definition used by the scripted version > to use only in "git am" to fix this regression in "am"

Re: [PATCH 5/5] test-lib-functions: detect test_when_finished in subshell

On Sun, Sep 6, 2015 at 7:46 AM, John Keeping wrote: > On Sun, Sep 06, 2015 at 05:51:43AM -0400, Eric Sunshine wrote: >> I'm not necessarily advocating this, but think it's worth mentioning >> that an alternate solution would be to fix test_when_finished() to work >> correctly

Re: [PATCH v16 00/14] port tag.c to use ref-filter APIs

Karthik Nayak writes: > @@ -705,9 +719,12 @@ static void grab_sub_body_contents(struct atom_value > *val, int deref, struct obj > v->s = xstrdup(subpos); > else if (skip_prefix(name, "contents:lines=", )) { >

Re: [PATCH v16 00/14] port tag.c to use ref-filter APIs

On Mon, Sep 7, 2015 at 12:19 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> @@ -705,9 +719,12 @@ static void grab_sub_body_contents(struct atom_value >> *val, int deref, struct obj >> v->s = xstrdup(subpos); >>