On Tue, Mar 15, 2016 at 09:57:16PM -0700, Linus Torvalds wrote:
> On Tue, Mar 15, 2016 at 9:46 PM, Junio C Hamano wrote:
> >
> > It also ignores that byte counts of non-HT bytes may not necessarily
> > match display columns. There is utf8_width() function exported from
> > utf8.c for that purpos
On Wed, Mar 16, 2016 at 3:13 AM, Eric Sunshine wrote:
>> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
>> @@ -128,6 +128,15 @@ unless you have read linkgit:git-rebase[1] carefully.
>> +--autostash::
>> +--no-autostash::
>> + Before starting rebase, stash local modifica
On Tue, Mar 15, 2016 at 9:46 PM, Junio C Hamano wrote:
>
> It also ignores that byte counts of non-HT bytes may not necessarily
> match display columns. There is utf8_width() function exported from
> utf8.c for that purpose.
Hmm. I did that to now make it horribly slower. Doing the
per-character
Josh Triplett writes:
> As far as I can tell, if I run "git add -N" on a file, and then commit
> without adding the file contents, it gets committed as an empty file.
Is that true? Git once worked like that in earlier days, but I
think write-tree (hence commit) would simply ignore intent-to-add
Linus Torvalds writes:
> Here's a first try at it. It does tab expansion only for the cases
> that indent the commit message, so for things like "pretty=email" it
> makes no difference at all.
It also ignores that byte counts of non-HT bytes may not necessarily
match display columns. There is u
On Tue, Mar 15, 2016 at 5:48 PM, Linus Torvalds
wrote:
> On Tue, Mar 15, 2016 at 5:45 PM, Junio C Hamano wrote:
>>
>> Wouldn't it be nicer to do this kind of thing at the output side? A
>> stupid way would be to have an option to indent the log text with a
>> tab instead of 4-spaces, but a more
On Tue, Mar 15, 2016 at 04:46:48PM -0700, Junio C Hamano wrote:
> Josh Triplett writes:
> > After using "git add -N", "git stash" can no longer stash:
>
> I think this is unfortunately one of the fundamental limitations
> that comes from the way how "stash" is implemented. It uses three
> tree o
There are some inherent issues with shallow clones and submodules, such
as having not having a commit available the superproject may point to
in the submodule due to being shallow. Use the new file t5614 to document
and test expectations in this area.
Signed-off-by: Stefan Beller
---
Notes:
This is a first real series following the RFC-y $gmane/288720.
For using submodules as they are now, I would imagine this is a strict
improvement. See the tests in last patch to see what a workflow would
look like.
Thanks,
Stefan
Stefan Beller (3):
clone: add `--shallow-submodules` flag
sub
When creating a shallow clone of a repository with submodules, the depth
argument does not influence the submodules, i.e. the submodules are done
as non-shallow clones. It is unclear what the best default is for the
depth of submodules of a shallow clone, so we need to have the possibility
to do al
When cloning a local repository, the user may choose to use an optimization
such that the transfer uses a Git agnostic protocol. Propagate the users
choice to submodules or if they don't choose, propagate nothing.
A test will be added in a later patch.
Signed-off-by: Stefan Beller
---
Notes:
On Tue, Mar 15, 2016 at 6:00 PM, Stefan Beller wrote:
>
> Instead of converting to whitespaces in Git, we could make use of the
> set_tabs capability for ttys and setup the terminal for having tabs align
> to 12,+8,+8,+8...
Or rather read in the existing tabs configuration and shift it by a const
On Tue, Mar 15, 2016 at 5:48 PM, Linus Torvalds
wrote:
> On Tue, Mar 15, 2016 at 5:45 PM, Junio C Hamano wrote:
>>
>> Wouldn't it be nicer to do this kind of thing at the output side? A
>> stupid way would be to have an option to indent the log text with a
>> tab instead of 4-spaces, but a more
We set GIT_CONFIG_NOSYSTEM in our test scripts so that we do
not accidentally read /etc/gitconfig and have it influence
the outcome of the tests. But when running smart-http tests,
Apache will clean the environment, including this variable,
and the "server" side of our http operations will read it.
On Tue, Mar 15, 2016 at 5:45 PM, Junio C Hamano wrote:
>
> Wouldn't it be nicer to do this kind of thing at the output side? A
> stupid way would be to have an option to indent the log text with a
> tab instead of 4-spaces, but a more sensible way would be to keep
> the visual 4-space-indent and
Linus Torvalds writes:
> Do people hate that idea? I may not get around to it for a while (it's
> the kernel merge window right now), but I can write the patch
> eventually - I just wanted to do an RFC first.
Wouldn't it be nicer to do this kind of thing at the output side? A
stupid way would b
On Tue, Mar 15, 2016 at 5:23 PM, Stefan Beller wrote:
>
> Could you point at some example to better understand the problem?
So in the kernel repo, I just randomly looked for tabs that show this
problem, and take for example commit
ff9a9b4c4334b53b52ee9279f30bd5dd92ea9bdd.
You can see how the ori
On March 15, 2016 8:17 PM Linus Torvalds wrote:
> So I end up doing this manually when I notice, but I was wondering ig maybe
> git could just have an option to "git am" and friends to de-tabify the commit
> message.
>
> It's particularly noticeable when people line things up using tabs (for the
>
On Tue, Mar 15, 2016 at 5:16 PM, Linus Torvalds
wrote:
> Do people hate that idea? I may not get around to it for a while (it's
> the kernel merge window right now), but I can write the patch
> eventually - I just wanted to do an RFC first.
Could you point at some example to better understand the
So I end up doing this manually when I notice, but I was wondering ig
maybe git could just have an option to "git am" and friends to
de-tabify the commit message.
It's particularly noticeable when people line things up using tabs
(for the kernel, it's often things like "cpu1 does X, cpu2 does Y"),
Josh Triplett writes:
> After using "git add -N", "git stash" can no longer stash:
I think this is unfortunately one of the fundamental limitations
that comes from the way how "stash" is implemented. It uses three
tree objects (i.e. HEAD's tree that represents where you started at,
the tree tha
After using "git add -N", "git stash" can no longer stash:
/tmp/temp$ git init
Initialized empty Git repository in /tmp/temp/.git/
/tmp/temp$ echo a > a
/tmp/temp$ git add a
/tmp/temp$ git commit -m 'Initial commit of a'
[master (root-commit) d7242c4] Initial commit of a
1 file changed, 1 inserti
On Tue, Mar 15, 2016 at 9:47 AM, Karthik Nayak wrote:
> Add support for %(objectname:short=) which would print the
> abbreviated unique objectname of given length. When no length is
> specified 7 is used. The minimum length is 'MINIMUM_ABBREV'.
>
Isn't the default abbreviation value used here, no
On Tue, Mar 15, 2016 at 03:00:09PM -0700, Stefan Beller wrote:
> Talking about ordering, I have two use cases
>
> 1) Before sending out patches: "git rebase -i -x make -x 'make test' "
> to catch myself for doing stupid things.
>
> 2) When developing new code, I alternate between running an in
On Tue, Mar 15, 2016 at 9:47 AM, Karthik Nayak wrote:
> diff --git a/Documentation/git-for-each-ref.txt
> b/Documentation/git-for-each-ref.txt
> index 193e99e..578bbd1 100644
> --- a/Documentation/git-for-each-ref.txt
> +++ b/Documentation/git-for-each-ref.txt
> @@ -116,10 +116,12 @@ upstream::
>
On Tue, Mar 15, 2016 at 2:51 PM, Jeff King wrote:
> On Tue, Mar 15, 2016 at 02:25:50PM -0700, Stefan Beller wrote:
>
>> When trying to find a good spot for testing clone with submodules, I
>> got confused where to add a new test file. There are both tests in t560*
>> as well as t57* both testing t
On Tue, Mar 15, 2016 at 12:21:36PM -0700, Stefan Beller wrote:
> On Tue, Mar 15, 2016 at 12:13 PM, Alexander Kuleshov
> wrote:
> > from the for simplification.
>
> I think what Eric wanted to point out, was to not have a continuous sentence
> from commit message header to body.
>
> Either leav
On Tue, Mar 15, 2016 at 02:25:50PM -0700, Stefan Beller wrote:
> When trying to find a good spot for testing clone with submodules, I
> got confused where to add a new test file. There are both tests in t560*
> as well as t57* both testing the clone command. t/README claims the
> second digit is t
Stefan Beller writes:
> On Tue, Mar 15, 2016 at 10:27 AM, Phil Susi wrote:
>> I'm doing a rebase and got some conflicts. I just want to take their
>> version of all files, but git checkout --theirs complains:
>>
>> --ours/--theirs' cannot be used with switching branches
>>
>> What gives? I'm n
On Tue, Mar 15, 2016 at 1:11 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 the current value of rebase
On Tue, Mar 15, 2016 at 10:27 AM, Phil Susi wrote:
> I'm doing a rebase and got some conflicts. I just want to take their
> version of all files, but git checkout --theirs complains:
>
> --ours/--theirs' cannot be used with switching branches
>
> What gives? I'm not *trying* to switch branches.
On Tue, Mar 15, 2016 at 2:23 PM, Pranit Bauva wrote:
> Hey,
>
> Open Source projects run because of people who contribute in their
> free time (mainly). It might not be possible for someone to be active
> all times Sometimes it may take around 2-3 days. Give it a little more
> time.
Adding to tha
When trying to find a good spot for testing clone with submodules, I
got confused where to add a new test file. There are both tests in t560*
as well as t57* both testing the clone command. t/README claims the
second digit is to indicate the command, which is inconsistent to the
current naming stru
Hey,
Open Source projects run because of people who contribute in their
free time (mainly). It might not be possible for someone to be active
all times Sometimes it may take around 2-3 days. Give it a little more
time.
On Wed, Mar 16, 2016 at 2:30 AM, Saurabh Jain
wrote:
> hi,
>
> I am Saurabh J
On Wed, Mar 16, 2016 at 2:46 AM, Junio C Hamano wrote:
> Pranit Bauva writes:
>
>> ... But then I am still not convinced for the
>> requirement of another variable `opt-verbose` as I believe that the
>> `verbose` and `config_verbose` are quite enough for this.
>> ... Or is there something else wh
Pranit Bauva writes:
> ... But then I am still not convinced for the
> requirement of another variable `opt-verbose` as I believe that the
> `verbose` and `config_verbose` are quite enough for this.
> ... Or is there something else which I forgot to
> consider?
I do not think we need three varia
hi,
I am Saurabh Jain, 3rd year Computer Science and Engineering student
studying at Indian Institute of Technology, Roorkee. I am quite fluent with
C programming.
I would like to apply for GSoC 2016 under Git in libgit2. I read the list of
possible projects and microprojects to be done.
I tried
On Wed, Mar 16, 2016 at 1:54 AM, Junio C Hamano wrote:
> Pranit Bauva writes:
>
>> First one to introduce a new variable `config_verbose` to store the
>> value read by the config. Till then the value of verbose can be set
>> through command line options. Depending on the situation as you
>> descr
Am 11.03.2016 um 03:57 schrieb Mikael Magnusson:
You can have /usr/src/git/master, /usr/src/git/some-work-tree, etc,
and /usr/src/git itself is not a git repository at all. That way
/usr/src only has one git-related directory and no worktrees are
nested.
I started using separate worktrees recen
Pranit Bauva writes:
> First one to introduce a new variable `config_verbose` to store the
> value read by the config. Till then the value of verbose can be set
> through command line options. Depending on the situation as you
> described, it can then make the modification. Another approach would
Thanks.
On Tue, Mar 15, 2016 at 1:17 PM, Johannes Schindelin
wrote:
> Dear Git users,
>
> It is my pleasure to announce that Git for Windows 2.7.3 is available from:
>
> https://git-for-windows.github.io/
>
> Changes since Git for Windows v2.7.2 (February 23rd 2016)
>
> New Features
>
>
Dear Git users,
It is my pleasure to announce that Git for Windows 2.7.3 is available from:
https://git-for-windows.github.io/
Changes since Git for Windows v2.7.2 (February 23rd 2016)
New Features
??? Git for Windows now ships with the Git Credential Manager for
Windows.
Bug Fi
On Wed, Mar 16, 2016 at 12:54 AM, Eric Sunshine wrote:
>> As Eric Sunshine mentioned ($gmane.org/288811), it would react
>> according to the multiple verbosity level and since its not currently
>> defined in `commit` it will react as it is reacting when verbosity
>> level is 1.
>
> I get the feeli
Stefan Beller writes:
>> +test_expect_failure shallow-clone-recursive '
>> + URL="file://$(pwd | sed "s/[[:space:]]/%20/g")/repo" &&
>
> This would break if the test suite is in a path containing any other white
> space
> than U+0020 such as a tab? (Not that I am encouraging using such pat
On Tue, Mar 15, 2016 at 3:33 PM, Johannes Schindelin
wrote:
> On Sun, 6 Mar 2016, Eric Sunshine wrote:
>> I also sneaked in a minor style cleanup.
>
> Isn't this "snuck"?
I'm no grammarian, but [1] says either would be fine (and we know that
the Internet never lies).
[1]: http://grammarist.com/u
On Sun, Dec 20, 2015 at 3:19 PM, wrote:
> From: Lars Schneider
>
> "git clone --recursive --depth 1 --single-branch " clones the
> submodules successfully. However, it does not obey "--depth 1" for
> submodule cloning.
I am about to resend "[RFC/PATCH] clone: add `--shallow-submodules` flag"
wh
Hi Paul,
On Wed, 16 Mar 2016, Paul Tan wrote:
> Even with interactive rebase out-of-bounds,
It is not really "out-of-bounds". It's more like: hold off integrating it
until I'm done with v1 of the rebase--helper that does interactive
rebase's heavy lifting (which should happen pretty soon).
> I
Acked-by: Matthias Rüster
Am 15.03.2016 um 18:12 schrieb Ralf Thielow:
Translate 22 new messages came from git.pot update in f1522b2
(l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)) and a5a4168
(l10n: git.pot: Add one new message for Git 2.8.0).
Signed-off-by: Ralf Thielow
---
po/de.po |
Hi Eric,
On Sun, 6 Mar 2016, Eric Sunshine wrote:
> This is a re-roll of [1] which aims to allow t6302 to be run even
> without GPG installed.
What a beautiful story this patch series tells. Truly a pleasure to
review.
Thanks!
Dscho
--
To unsubscribe from this list: send the line "unsubscribe g
Hi Eric,
On Sun, 6 Mar 2016, Eric Sunshine wrote:
> I also sneaked in a minor style cleanup.
Isn't this "snuck"?
The patch is fine.
Ciao,
Dscho
--
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:/
On Tue, Mar 15, 2016 at 3:21 PM, Stefan Beller wrote:
> On Tue, Mar 15, 2016 at 12:13 PM, Alexander Kuleshov
> wrote:
>> from the for simplification.
>
> I think what Eric wanted to point out, was to not have a continuous sentence
> from commit message header to body.
Yes, thanks for clarifying
On Tue, Mar 15, 2016 at 3:00 PM, Pranit Bauva wrote:
> On Tue, Mar 15, 2016 at 5:01 PM, SZEDER Gábor wrote:
>> You made 'commit.verbose' a boolean, so either verbose or not, ...
>> ... but note these context lines telling us that --verbose can be
>> specified not just once but twice (and who know
On Tue, Mar 15, 2016 at 05:48:18AM +, 惠轶群 wrote:
> On Tue, Mar 15, 2016, 11:13 AM Jeff King wrote:
> > The socket is inherently ephemeral, and designed to go
> > away after a few minutes (and the program designed to run sanely when it
> > does not exist).
>
> I agree.
>
> > So yes, when you
On Tue, Mar 15, 2016 at 12:13 PM, Alexander Kuleshov
wrote:
> from the for simplification.
I think what Eric wanted to point out, was to not have a continuous sentence
from commit message header to body.
Either leave the body blank (as it is obvious) or write a whole sentence there:
[PATCH v
from the for simplification.
Signed-off-by: Alexander Kuleshov
Reviewed-by: Stefan Beller
---
Changelog: added missed Signof-off-by and function name fixed
in the commit message.
submodule-config.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/submodule-config.c b/subm
On Wed, Mar 16, 2016 at 1:08 AM, Stefan Beller wrote:
> The change looks correct to me. But as Eric said, the commit message
> needs work and a sign off. With that,
> Reviewed-by: Stefan Beller
Ah, yes, forgot to pass `-s` to commit command. Sorry for noise guys,
will resend
the patch.
--
To uns
On Tue, Mar 15, 2016 at 11:58 AM, Eric Sunshine wrote:
> On Tue, Mar 15, 2016 at 2:25 PM, Alexander Kuleshov
> wrote:
>> submodule-config: use hashmap_iter_init()
>
> Did you mean s/init/first/ ?
>
>> from the for simplification.
>
> Sentence fragment...
>
> Missing sign-off.
>
>> ---
>> diff --
On Tue, Mar 15, 2016 at 5:01 PM, SZEDER Gábor wrote:
> You made 'commit.verbose' a boolean, so either verbose or not, ...
> ... but note these context lines telling us that --verbose can be
> specified not just once but twice (and who knows what the future may
> bring). This raises some not enti
On Tue, Mar 15, 2016 at 2:25 PM, Alexander Kuleshov
wrote:
> submodule-config: use hashmap_iter_init()
Did you mean s/init/first/ ?
> from the for simplification.
Sentence fragment...
Missing sign-off.
> ---
> diff --git a/submodule-config.c b/submodule-config.c
> index b82d1fb..8ac5031 1006
Yes please.
On 15 March 2016 at 16:52, Junio C Hamano wrote:
> Luke Diamand writes:
>
>>> Is the patch uninteresting for git-p4 as it handles only an occasional
>>> exception or did the patch get lost in the noise? :-)
>>
>> I thought it was useful; I hadn't realised that it was needed for dele
from the for simplification.
---
submodule-config.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/submodule-config.c b/submodule-config.c
index b82d1fb..8ac5031 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -405,8 +405,7 @@ static const struct submodule *conf
Eric Wong writes:
> Anyways, we'll let that cook a while and the other two patches
> can be had at:
>
> The following changes since commit db6696f653b917509dac1ac13b922e12773a84ff:
>
> Merge branch 'mg/wt-status-mismarked-i18n' (2016-03-14 10:46:17 -0700)
>
> are available in the git repository
I'm doing a rebase and got some conflicts. I just want to take their
version of all files, but git checkout --theirs complains:
--ours/--theirs' cannot be used with switching branches
What gives? I'm not *trying* to switch branches. I just want to
resolve the conflict by taking their version.
Translate 22 new messages came from git.pot update in f1522b2
(l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)) and a5a4168
(l10n: git.pot: Add one new message for Git 2.8.0).
Signed-off-by: Ralf Thielow
---
po/de.po | 68
1 file
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 the current value of rebase.autoStash, if set. As "git rebase"
understands the --[no-]au
git-pull makes a seperate call to git_config_get_bool() to read the value
of "rebase.autostash", this can be reduced as a call to git_config() is
already there in the code.
Introduce a callback function git_pull_config() to read "rebase.autostash"
along with other variables.
Helped-by: Junio C Ha
Hi guys,
One tiny update triggered this round of l10n. Wait for your merge request.
Thank you.
-- Forwarded message --
From: Jiang Xin
Date: 2016-03-16 0:51 GMT+08:00
Subject: [GIT PULL] l10n updates for 2.8.0 round 2
To: Junio C Hamano
Hi Junio,
The following changes since c
Luke Diamand writes:
>> Is the patch uninteresting for git-p4 as it handles only an occasional
>> exception or did the patch get lost in the noise? :-)
>
> I thought it was useful; I hadn't realised that it was needed for deleted
> users.
>
> Luke
So..., should I just pick it up and queue with
Introduce setup_ref_filter_porcelain_msg() so that the messages used in
the atom %(upstream:track) can be translated if needed. This is needed
as we port branch.c to use ref-filter's printing API's.
Written-by: Matthieu Moy
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by:
The "%(symref)" atom doesn't work when used with the ':short' modifier
because we strictly match only 'symref' for setting the 'need_symref'
indicator. Fix this by using comparing with valid_atom rather than used_atom.
Add tests for %(symref) and %(symref:short) while we're here.
Helped-by: Junio
Implement %(if:equals=) wherein the if condition is only
satisfied if the value obtained between the %(if:...) and %(then) atom
is the same as the given ''.
Similarly, implement (if:notequals=) wherein the if condition
is only satisfied if the value obtained between the %(if:...) and
%(then) atom
Add support for %(objectname:short=) which would print the
abbreviated unique objectname of given length. When no length is
specified 7 is used. The minimum length is 'MINIMUM_ABBREV'.
Add tests and documentation for the same.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-b
Implement the '--format' option provided by 'ref-filter'. This lets the
user list branches as per desired format similar to the implementation
in 'git for-each-ref'.
Add tests and documentation for the same.
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
-
Call ref-filter's setup_ref_filter_porcelain_msg() to enable
translated messages for the %(upstream:tack) atom. Although branch.c
doesn't currently use ref-filter's printing API's, this will ensure
that when it does in the future patches, we do not need to worry about
translation.
Written-by: Matt
Hi Dscho,
On Tue, Mar 15, 2016 at 3:57 PM, Johannes Schindelin
wrote:
> On Sat, 12 Mar 2016, Paul Tan wrote:
>
>> Since 1b1dce4 (Teach rebase an interactive mode, 2007-06-25), git-rebase
>> supports an interactive mode when passed the -i switch.
>>
>> In interactive mode, git-rebase allows users
Introduce symref_atom_parser() which will parse the '%(symref)' atom and
store information into the 'used_atom' structure based on the modifiers
used along with the atom.
Signed-off-by: Karthik Nayak
---
ref-filter.c | 25 +++--
1 file changed, 23 insertions(+), 2 deletions(-
Add support for %(upstream:track,nobracket) which will print the
tracking information without the brackets (i.e. "ahead N, behind M").
This is needed when we port branch.c to use ref-filter's printing APIs.
Add test and documentation for the same.
Mentored-by: Christian Couder
Mentored-by: Matth
Add the options `:dir` and `:base` to the %(refname) atom. The `:dir`
option gives the directory (the part after $GIT_DIR/) of the ref without
the refname. The `:base` option gives the base directory of the given
ref (i.e. the directory following $GIT_DIR/refs/).
Add tests and documentation for th
Stephen Morton writes:
> It's perhaps beyond the scope of my original question, but for
> situations where I need a "last change date" embedded in a file (e.g.
> because a protocol standard requires it), is there any recommended way
> to do so? We've the hard way that hardcoding makes
> merging/c
Introduce refname_atom_parser() which will parse the '%(refname)' atom
and store information into the 'used_atom' structure based on the
modifiers used along with the atom.
Signed-off-by: Karthik Nayak
---
ref-filter.c | 70 +---
1 file cha
Borrowing from branch.c's implementation print "[gone]" whenever an
unknown upstream ref is encountered instead of just ignoring it.
This makes sure that when branch.c is ported over to using ref-filter
APIs for printing, this feature is not lost.
Make changes to t/t6300-for-each-ref.sh and
Docum
Move the implementation of get_head_description() from branch.c to
ref-filter. This gives a description of the HEAD ref if called. This
is used as the refname for the HEAD ref whenever the
FILTER_REFS_DETACHED_HEAD option is used. Make it public because we
need it to calculate the length of the HE
Ensure that each 'atom_value' has a reference to its corresponding
'used_atom'. This let's us use values within 'used_atom' in the
'handler' function.
Hence we can get the %(align) atom's parameters directly from the
'used_atom' therefore removing the necessity of passing %(align) atom's
parameter
Port branch.c to use ref-filter APIs for printing. This clears out
most of the code used in branch.c for printing and replaces them with
calls made to the ref-filter library.
Introduce build_format() which gets the format required for printing
of refs. Make amendments to print_ref_list() to reflec
To allow column display, we will need to first render the output in a
string list to allow print_columns() to compute the proper size of
each column before starting the actual output. Introduce the function
format_ref_array_item() that does the formatting of a ref_array_item
to an strbuf.
show_ref
Implement %(if), %(then) and %(else) atoms. Used as
%(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If the
format string between %(if) and %(then) expands to an empty string, or
to only whitespaces, then the whole %(if)...%(end) expands to the string
following %(then). Otherwise, it
This is part of unification of the commands 'git tag -l, git branch -l
and git for-each-ref'. This ports over branch.c to use ref-filter's
printing options.
Initially posted here: $(gmane/279226). It was decided that this series
would follow up after refactoring ref-filter parsing mechanism, which
2016-03-14 23:29 GMT+08:00 Michael J Gruber :
> Hi Junio,
>
> Have you pulled git.pot for 2.8.0 already? [1]
>
> Maybe I'm not up-to-date on the release cycle timing regarding l10n, but
> I was trying to fix a mixed translation/non-translation issue, and it
> turned out the reason is probably that
On Tue, Mar 8, 2016 at 7:28 AM, Jacob Keller wrote:
> On Sun, Mar 6, 2016 at 4:05 AM, Karthik Nayak wrote:
>> Implement the '--format' option provided by 'ref-filter'.
>> This lets the user list tags as per desired format similar
>> to the implementation in 'git for-each-ref'.
>>
>
> s/tags/branc
Hi all,
Currently, attempting to clone a Subversion repository using an svn://
or https:// URI specified with -T fails on Cygwin:
$ git svn init -T svn://svn.code.sf.net/p/squirrelmail/code/trunk
Initialized empty Git repository in /home/add/tmp/.git/
E: 'svn:/svn.code.sf.net/p/squirr
On Thu, Mar 10, 2016 at 5:04 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> On Thu, Mar 10, 2016 at 09:45:19AM -0500, Stephen Morton wrote:
>>
>>> I am a bit confused because this is basically the example used in
>>> ProGit [1] and it is fundamentally broken. In fact, if I understand
>>> corr
Duy Nguyen writes:
> Another aspect that's not mentioned is, we keep this daemon's logic as
> thin as possible. The "brain" stays in git. So the daemon can read and
> validate stuff, but that's about all it's allowed to do. It's not
> supposed to add/create new contents. It's not even allowed to
Hi Duy,
On Tue, 15 Mar 2016, Duy Nguyen wrote:
> On Thu, Mar 10, 2016 at 1:36 AM, David Turner
> wrote:
> > Introduce a new config option, indexhelper.autorun, to automatically
> > run git index-helper before starting up a builtin git command. This
> > enables users to keep index-helper runnin
Hi Duy,
On Tue, 15 Mar 2016, Duy Nguyen wrote:
> On Tue, Mar 15, 2016 at 3:54 AM, Johannes Schindelin
> wrote:
> > In my 'interactive-rebase' branch...
>
> 64 commits! Maybe next time we should announce wip branches like this
> when we start doing stuff so people don't overlap. Of course these
On Tue, Mar 15, 2016 at 8:56 PM, Johannes Schindelin
wrote:
> Sure. And with the repository being put elsewhere, you also buy the tedium
> to no longer be able to simply "less .git/rebase-apply/patch". Which I
> have to type *a lot*. You win some, you lose some. If you ask me, you lose
> some more
Hi Duy,
On Tue, 15 Mar 2016, Duy Nguyen wrote:
> On Tue, Mar 15, 2016 at 1:53 PM, Johannes Schindelin
> wrote:
> >> That approach to implement the UI that directly faces the end users
> >> via scripting would let your users choose layouts more flexibly.
> >> Some people may want a repository and
On Thu, Mar 10, 2016 at 1:36 AM, David Turner wrote:
> static struct watchman_query *make_query(const char *last_update)
> @@ -60,8 +61,24 @@ static void update_index(struct index_state *istate,
> continue;
>
> pos = index_name_pos(istate, wm->name, strlen(
On Thu, Mar 10, 2016 at 1:36 AM, David Turner wrote:
> Introduce a new config option, indexhelper.autorun, to automatically
> run git index-helper before starting up a builtin git command. This
> enables users to keep index-helper running without manual
> intervention.
This could be a problem on
On Thu, Mar 10, 2016 at 6:09 AM, Junio C Hamano wrote:
> David Turner writes:
>
>> From: Nguyễn Thái Ngọc Duy
>>
>> Instead of reading the index from disk and worrying about disk
>> corruption, the index is cached in memory (memory bit-flips happen
>> too, but hopefully less often). The result i
On Thu, Mar 10, 2016 at 1:36 AM, David Turner wrote:
> Git can poke the daemon to tell it to refresh the index cache, or to
> keep it alive some more minutes via UNIX signals.
The reason I went with UNIX signals was because it made it possible to
make a simple GetMessage loop, the only thing I ca
1 - 100 of 113 matches
Mail list logo
