Also I think Matthieu already commented that "filter" was out of
place for that struct. I still think your ref_list is better called
ref_array, but that is a minor point. Use of "foo_list" in our
codebase is predominantly (because we use "commit_list" very often
in the core part of the system)
On Thu, Apr 23, 2015 at 04:53:04PM +0200, Michal Pomorski wrote:
> tl: skip to the second paragraph
>
> So here is what I just experienced:
> We had an emergency error in an application at work and as the
> responsible developer was unavailable, I was asked to check it out and
> look into it.
> We
Hi Paul,
On 2015-05-26 14:20, Paul Smith wrote:
> On Tue, 2015-05-26 at 11:53 +0200, Johannes Schindelin wrote:
>> The biggest problem with `mklink` is that it is only supported on
>> Windows Vista and later, while I really like to keep Windows XP
>> support in Git for Windows.
>
> No, the bigges
> see these commands, or something else. Could you try again with
> GIT_TRACE=/absolute/path/to/some/where instead of GIT_TRACE=2 and post
> the content of /abso../some/where?
It looks the same as far as I can see:
$ GIT_TRACE=/tmp/git-trace git svn fetch
fatal: unordered stage entries in
On Tue, May 26, 2015 at 8:28 PM, McHenry, Matt
wrote:
>> see these commands, or something else. Could you try again with
>> GIT_TRACE=/absolute/path/to/some/where instead of GIT_TRACE=2 and post
>> the content of /abso../some/where?
>
> It looks the same as far as I can see:
>
> $ GIT_TRAC
On Tue, 2015-05-26 at 11:53 +0200, Johannes Schindelin wrote:
> The biggest problem with `mklink` is that it is only supported on
> Windows Vista and later, while I really like to keep Windows XP
> support in Git for Windows.
No, the biggest problem with mklink is that you have to have
administrat
On Tue, May 26, 2015 at 12:39 PM, Christian Couder
wrote:
> First it looks like you sent the email to me only, so I am replying to you
> only.
> If this was a mistake, feel free to post this email to the Git mailing list.
Thanks, sorry for the mis-post.
>> 1) How would Alice push the content to
Dear friend,
Hello and Good day! Hope everything goes well .
Rebecca here from Jiaweihao , LED/LCD TV brackets, Wall Mounts manufacturer in
China for years.
Here to introduce our Newest Design table bracket, details as below:
a) VESA: 75x75,100x100mm
b) Capacity of loading: 10kg
c) Table clamp
Hi,
On 2015-05-26 06:03, Junio C Hamano wrote:
> Daniel Smith writes:
>
>> When running on Windows in MinGW, creating symbolic links via ln always
>> failed.
>>
>> Using mklink instead of ln is the recommended method of creating links on
>> Windows:
>> http://stackoverflow.com/questions/18641864
Hi,
I would like to implement a new command git rebase --status to inform the user
about the current rebase session. Here is a sample of what I think it could
look like in case of merge conflict:
git rebase --status
You are in the middle of a rebase session.
The line that paused this sessio
Duy Nguyen writes:
> --unshallow::
> - If the source repository is complete, convert a shallow
> - repository to a complete one, removing all the limitations
> + If the source repository is complete, convert all shallow
> + refs to complete ones, removing all the limitations
Def
On Tue, May 26, 2015 at 4:10 PM, Stephen Kelly wrote:
> On Tue, May 26, 2015 at 12:39 PM, Christian Couder
> wrote:
>
>>> 1) How would Alice push the content to a remote host so that Bob would
>>> get that automatically?
>>
>> I am not sure what you want exactly, but let me try to answer anyway.
On Thu, May 21, 2015 at 08:50:11PM +0200, René Scharfe wrote:
> Am 21.05.2015 um 19:06 schrieb Heiko Voigt:
> >diff --git a/submodule-config.h b/submodule-config.h
> >index 9061e4e..58afc83 100644
> >--- a/submodule-config.h
> >+++ b/submodule-config.h
> >@@ -24,6 +24,6 @@ const struct submodule *s
On Thu, May 21, 2015 at 11:40:44AM -0700, Junio C Hamano wrote:
> Heiko Voigt writes:
>
> > This is finally the next iteration of the submodule config api. The last
> > iteration can be found here:
> >
> > http://article.gmane.org/gmane.comp.version-control.git/252601
> >
> > This iteration fixes
Junio C Hamano writes:
> Yuck; I can see what you are doing but can you imitate what the more
> experienced people (e.g. peff, mhagger) do when restructuring
> existing code and do things in smaller increments?
Seconded. Some reasons/guide to split:
* Split trivial and non-trivial stuff. I can
Guillaume Pages writes:
> Do you think it could be usefull or do you have any suggestion?
All of your examples say things like:
> You are in the middle of a rebase session.
> The line that paused this session is:
but what if there is no such "line"?
IOW, what does the user see when
Am 26.05.2015 um 06:03 schrieb Junio C Hamano:
> Daniel Smith writes:
>
>> When running on Windows in MinGW, creating symbolic links via ln always
>> failed.
>>
>> Using mklink instead of ln is the recommended method of creating links on
>> Windows:
>> http://stackoverflow.com/questions/18641864/
Hi Junio!
On Mo, 25 Mai 2015, Junio C Hamano wrote:
> "brian m. carlson" writes:
>
> > I like this idea.
>
> I don't.
>
> > My use case is determining whether a patch to a pristine-tar
> > repository introduced trailing whitespace (which is not okay) or
> > just left it there (which is okay).
Hi Junio!
On Mo, 25 Mai 2015, Junio C Hamano wrote:
> Christian Brabandt , Christian Brabandt
> writes:
>
> > As far as I can see, this does not break any tests and also the
> > behaviour of git-diff --check does not change.
>
> Even if this change introduced a bug that changed the behaviour
Hi,
On Fri, May 22, 2015 at 01:46:24PM +, Frawley, Sarah wrote:
> I am a design automation engineer supporting 200+ designers who use
> git for hardware design. We also use the submodule feature where we
> can have quite complex hierarchy's with 10+ layers.
What does this 10+ layers mean? Ne
Christian Brabandt writes:
> It was the one I am interesting in and also the one that I usually try
> to avoid ;)
>
> (In fact, I thought if the other options would be needed, one could add
> additional suboptions for core.whitespace as well,...
That road leads to madness. Why should we add 2
Christian Brabandt writes:
>> But as I said in the other message, I think that the approach this
>> patch takes goes in a wrong direction. Instead of adding a single
>> "check and highlight this and only kind of breakage on preimage"
>> option as a new kind to existing "what kind of use of white
Junio C Hamano writes:
> I'll send out two patch series to do the painting part (I didn't
> want to touch "--check", as its utility is even more dubious
> compared to painting, at least to me).
And here is the second one.
-- >8 --
Subject: [PATCH 2/2] diff.c: --ws-check-deleted option
Traditio
On Mon, May 25, 2015 at 12:40 PM, brian m. carlson
wrote:
> On Mon, May 25, 2015 at 12:34:59PM -0700, Junio C Hamano wrote:
>> [PATCH 01/56] was authored by you but has Michael's sign-off, which
>> looked somewhat odd to me, though.
>
> Yes, it does. He picked it up from me, and signed off, and I
Hi Junio!
On Di, 26 Mai 2015, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > I'll send out two patch series to do the painting part (I didn't
> > want to touch "--check", as its utility is even more dubious
> > compared to painting, at least to me).
>
> And here is the second one.
Wow,
Christian Brabandt writes:
>> And here is the second one.
>
> Wow, great and so fast! I really apologize it.
No need to apologize, but appreciating would not hurt ;-)
Thanks for an interesting idea. I spotted a buglet in 1/2 so I'll
queue a fixed version on 'pu' when I push today's intergratio
On Mon, May 25, 2015 at 3:00 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> DESCRIPTION
>> ---
>> +This command will inspect, update and manage submodules.
>>
>> +Submodules allow you to keep another Git repository in a subdirectory
>> +of your repository. The other repository h
Junio C Hamano writes:
>Guillaume Pages writes:
>> Do you think it could be useful or do you have any suggestion?
>All of your examples say things like:
>> You are in the middle of a rebase session.
>> The line that paused this session is:
>but what if there is no such "line"?
>IOW,
Hi Junio!
On Di, 26 Mai 2015, Junio C Hamano wrote:
> No need to apologize, but appreciating would not hurt ;-)
Right. Thanks.
Best,
Christian
--
Trägt der Bauer rote Socken, will er seinen Bullen schocken.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a mess
[Re-sending this for on-list completeness. It was sent off-list
earlier when I was using an email client capable only of HTML
messages.]
On Mon, May 25, 2015 at 1:31 PM, Sébastien Guimmara
wrote:
> On 05/21/2015 08:01 PM, Eric Sunshine wrote:
>> On Thu, May 21, 2015 at 1:39 PM, Sébastien Guimmara
On Sat, May 23, 2015 at 1:45 PM, Junio C Hamano wrote:
> Allen Hubbe writes:
>> Note that this only adds support for a limited subset of the sendmail
>> format. The format is is as follows.
>>
>> : [, ...]
>>
>> Aliases are specified one per line, and must start on the first column of the
On Saturday, May 23, 2015, Allen Hubbe wrote:
> Note that this only adds support for a limited subset of the sendmail
> format. The format is is as follows.
>
> : [, ...]
>
> Aliases are specified one per line, and must start on the first column of the
> line. Blank lines are ignored. I
Eric Sunshine writes:
+history grow, mark and tweak your common history
+remote collaborate (see also: git help workflows)
+
+# List of known git commands.
>>>
>>> This is odd. The above line was removed in 1/5 but then re-appears
>>> here in 2/5. I think the intent
On Tue, May 26, 2015 at 3:10 PM, Eric Sunshine wrote:
> On Saturday, May 23, 2015, Allen Hubbe wrote:
>> Note that this only adds support for a limited subset of the sendmail
>> format. The format is is as follows.
>>
>> : [, ...]
>>
>> Aliases are specified one per line, and must start
Traditionally, we only cared about whitespace breakages introduced
in new lines. Some people want to paint whitespace breakages on old
lines, too. When they see a whitespace breakage on a new line, they
can spot the same kind of whitespace breakage on the corresponding
old line and want to say "A
Traditionally, we only had emit_add_line() helper, which knows how
to find and paint whitespace breakages on the given line, because we
only care about whitespace breakages introduced in new lines. The
context lines and old (i.e. deleted) lines are emitted with a
simpler emit_line_0() that paints
The last two tests in the script were to
- set up color.diff.* slots
- set up an expectation for a single test
- run that test and check the result
but split in a wrong way. It did the first two in the first test
and the third one in the second test. The latter two belong to each
other. Thi
Move the preparatory steps that create the expected output inside
the test bodies, remove unnecessary blank lines before and after the
test bodies, and drop SP between redirection operator and its target.
Signed-off-by: Junio C Hamano
---
t/t4015-diff-whitespace.sh | 411 +++-
We paint whitespace breakages in new (i.e. added or updated) lines
when showing the "git diff" output to help people avoid introducing
them with their changes. The basic premise is that people would
want to avoid touching existing lines only to fix whitespace errors
in a patch that does other chan
Luke Diamand writes:
> On 07/05/15 23:16, Junio C Hamano wrote:
>> Luke Diamand writes:
>>
>
> [Resurrecting old thread]
> ...
>
> To me, that seems to imply that for GIT_WINDOWS_NATIVE, we take the
> *second* branch and use "sh", so again, the the code as it stands will
> be fine. msysgit uses
On Tue, May 26, 2015 at 3:41 PM, Allen Hubbe wrote:
> On Tue, May 26, 2015 at 3:10 PM, Eric Sunshine
> wrote:
>> On Saturday, May 23, 2015, Allen Hubbe wrote:
>>> diff --git a/git-send-email.perl b/git-send-email.perl
>>> index e1e9b1460ced..ffea50094a48 100755
>>> --- a/git-send-email.perl
>>>
Hi
Does anybody have code to stage commits using a the visual diff/merge
tools supported by git-difftool? Is there support in git itself
somewhere, even?
I'm looking for something functionally similar to git add -p
Looking at the git-difftool source I can see how to write a command to do
i
On Tue, May 26, 2015 at 4:53 PM, Eric Sunshine wrote:
> On Tue, May 26, 2015 at 3:41 PM, Allen Hubbe wrote:
>> On Tue, May 26, 2015 at 3:10 PM, Eric Sunshine
>> wrote:
>>> On Saturday, May 23, 2015, Allen Hubbe wrote:
+ # recognize lines that look like an alias
+
Add support for the sendmail email aliases format.
Synopsis:
: [, ...]
Example:
alice: Alice W Land
bob: Robert Bobbyton
# this is a comment
# this is also a comment
chloe: ch...@example.com
abgroup: alice, bob
bcgrp: bob, chl
Add new functions to keep the setup cleaner:
- setup_temporary_branch: creates a new branch, check it out
and automatically delete it after the test is over
- setup_fixed_branch: creates a fixed branch, which can be re-used
in later tests
Signed-off-by: Remi Lespinet
---
t/t4150-am.sh |
Check if commits were removed (i.e. a line was deleted) or dupplicated
(e.g. the same commit is picked twice), can print warnings or abort
git rebase according to the value of the configuration variable
rebase.checkLevel.
Add the configuration variable rebase.checkLevel.
- When unset or set to
Move the creation of the file, commit and branch used in git am -3 tests
in a setup test, to avoid creating this setup several time.
Signed-off-by: Remi Lespinet
---
t/t4150-am.sh | 18 ++
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/t/t4150-am.sh b/t/t4150-am.s
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.
Signed-off-by: Remi Lespinet
---
Even if git am will be rewritten soon, the code
Instead of removing a line to remove the commit, you can use the key
word "drop" (just like "pick" or "edit"). It has the same effect as
deleting the line (removing the commit) except that you keep a visual
trace of your actions, allowing a better control and reducing the
possibility of removing a
The latest maintenance release Git v2.4.2 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.4.2'
tag and the 'maint' branch that the tag points at:
url = https://kernel
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 "untracked cache" series is in 'master' now. I do not use it
personally, but it is meant to make life easier for those with large
amount of
On Tue, May 26, 2015 at 10:53:15AM -0700, Stefan Beller wrote:
> On Mon, May 25, 2015 at 3:00 PM, Junio C Hamano wrote:
> > Stefan Beller writes:
> > On the other hand, I probably would not have felt such a strong
> > "strangeness" if it were described like this:
> >
> > This command can help
"Just give us something to play around with" - Peff at GitMerge 2015
This is another approach for updating the pack protocol of Git.
While in the previous attempts I tried to come up with the perfect
specification of the new protocol I realized that such an approach
doesn't lead anywhere. So t
Signed-off-by: Stefan Beller
---
transport.c | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/transport.c b/transport.c
index 3ef15f6..33644a6 100644
--- a/transport.c
+++ b/transport.c
@@ -496,15 +496,29 @@ static int set_git_option(struct git_transport_opt
Instead of calling get_remote_heads as a first command during the
protocol exchange, we need to have fine grained control over the
capability negotiation in version 2 of the protocol.
Introduce get_remote_capabilities, which will just listen to
capabilities of the remote and request_capabilities w
From: Nguyễn Thái Ngọc Duy
pack-protocol.txt says so and fetch-pack also follows it even though
upload-pack is a bit lax. Fix it.
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Stefan Beller
---
upload-pack.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/upload
Signed-off-by: Stefan Beller
---
builtin/fetch-pack.c | 17 -
fetch-pack.h | 1 +
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 4a6b340..32dc8b0 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
From: Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Stefan Beller
---
upload-pack.c | 44 +++-
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index 745fda8..5449ff7 100644
--- a/upl
This will make it easier to reuse the capabilities in a later patch.
Signed-off-by: Stefan Beller
---
upload-pack.c | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index 6734777..a5f75b7 100644
--- a/upload-pack.c
+++ b/upload-pack
The transport version set via command line argument in
git fetch takes precedence over the configured version.
Signed-off-by: Stefan Beller
---
builtin/fetch.c| 6 ++
remote.c | 2 ++
remote.h | 2 ++
transport-helper.c | 1 +
transport.c| 13 +
Signed-off-by: Stefan Beller
---
transport.c | 29 +
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/transport.c b/transport.c
index 33644a6..1cd9b77 100644
--- a/transport.c
+++ b/transport.c
@@ -526,12 +526,33 @@ static struct ref *get_refs_via_connect
Signed-off-by: Stefan Beller
---
Documentation/technical/pack-protocol.txt | 86 ---
Documentation/technical/protocol-capabilities.txt | 15
2 files changed, 77 insertions(+), 24 deletions(-)
diff --git a/Documentation/technical/pack-protocol.txt
b/Documentation
Signed-off-by: Stefan Beller
---
t/t5544-fetch-2.sh | 40
1 file changed, 40 insertions(+)
create mode 100755 t/t5544-fetch-2.sh
diff --git a/t/t5544-fetch-2.sh b/t/t5544-fetch-2.sh
new file mode 100755
index 000..beee46c
--- /dev/null
+++ b/t/t5544-
In upload-pack-2 we send each capability in its own packet.
By reusing the advertise_capabilities and eventually setting it to
NULL we will be able to reuse the methods for refs advertisement.
Signed-off-by: Stefan Beller
---
.gitignore | 1 +
Makefile| 2 ++
upload-pack-2.c | 1
> * sb/submodule-doc-intro (2015-05-22) 1 commit
> - submodule documentation: reorder introductory paragraphs
>
> What's the doneness of this one???
I'll try again without a "This command will do ..." introduction,
I just did not look into it yet. That said, I was expecting more
bike shedding tha
Stefan Beller writes:
> From: Nguyễn Thái Ngọc Duy
>
> pack-protocol.txt says so and fetch-pack also follows it even though
> upload-pack is a bit lax. Fix it.
Hmm, I actually think the .txt file unsuccessfully tried to close
the barn door after horse has long left. The existing clients that
r
Stefan Beller writes:
> @@ -175,7 +179,18 @@ int cmd_fetch_pack(int argc, const char **argv, const
> char *prefix)
> if (!conn)
> return args.diag_url ? 0 : 1;
> }
> - get_remote_heads(fd[0], NULL, 0, &ref, 0, NULL, &shallow);
> +
> + switch (arg
On Tue, May 26, 2015 at 3:17 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> From: Nguyễn Thái Ngọc Duy
>>
>> pack-protocol.txt says so and fetch-pack also follows it even though
>> upload-pack is a bit lax. Fix it.
>
> Hmm, I actually think the .txt file unsuccessfully tried to close
> t
Stefan Beller writes:
> + if (transport->smart_options
> + && transport->smart_options->transport_version) {
> + buf = xmalloc(strlen(remote_program) + 12);
> + sprintf(buf, "%s-%d", remote_program,
> + transport->smart_options->transport_ve
On Tue, May 26, 2015 at 3:19 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> @@ -175,7 +179,18 @@ int cmd_fetch_pack(int argc, const char **argv, const
>> char *prefix)
>> if (!conn)
>> return args.diag_url ? 0 : 1;
>> }
>> - get_remote_heads(
On Tue, May 26, 2015 at 3:21 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> + if (transport->smart_options
>> + && transport->smart_options->transport_version) {
>> + buf = xmalloc(strlen(remote_program) + 12);
>> + sprintf(buf, "%s-%d", remote_program,
On Tue, May 26, 2015 at 5:38 PM, Galan Rémi
wrote:
> git-rebase -i: Add key word "drop" to remove a commit
"key word" is unusual. More typical is "keyword". However, perhaps
"command" might be even better. Also, custom on this project is not to
capitalize, so:
git-rebase -i: add command "dro
On Tue, May 26, 2015 at 5:38 PM, Galan Rémi
wrote:
> git rebase -i: Warn removed or dupplicated commits
s/dupplicated/duplicated/
Also, drop capitalization, and insert "about":
git rebase -i: warn about removed or duplicated commits
> Check if commits were removed (i.e. a line was deleted)
On Tue, May 26, 2015 at 10:37:29AM -0700, Stefan Beller wrote:
> On Mon, May 25, 2015 at 12:40 PM, brian m. carlson
> wrote:
> > On Mon, May 25, 2015 at 12:34:59PM -0700, Junio C Hamano wrote:
> >> [PATCH 01/56] was authored by you but has Michael's sign-off, which
> >> looked somewhat odd to me,
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller wrote:
> In upload-pack-2 we send each capability in its own packet.
> By reusing the advertise_capabilities and eventually setting it to
> NULL we will be able to reuse the methods for refs advertisement.
>
> Signed-off-by: Stefan Beller
> ---
> dif
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller wrote:
> Instead of calling get_remote_heads as a first command during the
> protocol exchange, we need to have fine grained control over the
> capability negotiation in version 2 of the protocol.
>
> Introduce get_remote_capabilities, which will just
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller wrote:
> Signed-off-by: Stefan Beller
> ---
> diff --git a/transport.c b/transport.c
> index 3ef15f6..33644a6 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -496,15 +496,29 @@ static int set_git_option(struct git_transport_options
> *opts,
> s
Stefan Beller writes:
> On Tue, May 26, 2015 at 3:21 PM, Junio C Hamano wrote:
>
>>
>> if (...->version < 2) {
>> ... append "-%d" ...
>> }
>>
>> involved.
>
> Oh! I see here you would count the current one as 1, which has no
> number extension, and any further wo
"brian m. carlson" writes:
> If Junio would like to add my sign-off to the end, he's welcome to do
> so:
>
> Signed-off-by: brian m. carlson
Heh, too late.
Thanks for explaining the true flow of patches, though.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller wrote:
> Signed-off-by: Stefan Beller
> ---
> diff --git a/t/t5544-fetch-2.sh b/t/t5544-fetch-2.sh
> new file mode 100755
> index 000..beee46c
> --- /dev/null
> +++ b/t/t5544-fetch-2.sh
> @@ -0,0 +1,40 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2015
On Tue, May 26, 2015 at 6:01 PM, Stefan Beller wrote:
> transport: get_refs_via_connect exchanges capabilities before refs.
s/exchanges/exchange/
s/\.$//
> Signed-off-by: Stefan Beller
> ---
> transport.c | 29 +
> 1 file changed, 25 insertions(+), 4 deletions(-)
>
On Tue, May 26, 2015 at 03:01:04PM -0700, Stefan Beller wrote:
> "Just give us something to play around with" - Peff at GitMerge 2015
Sounds like something I would say.
> The new protocol works just like the old protocol, except for
> the capabilities negotiation being before any exchange of
Hi Rémi,
On 2015-05-26 23:38, Galan Rémi wrote:
> Instead of removing a line to remove the commit, you can use the key
> word "drop" (just like "pick" or "edit"). It has the same effect as
> deleting the line (removing the commit) except that you keep a visual
> trace of your actions, allowing a b
We paint whitespace breakages in new (i.e. added or updated) lines
when showing the "git diff" output to help people avoid introducing
them with their changes. The basic premise is that people would
want to avoid touching existing lines only to fix whitespace errors
in a patch that does other chan
Traditionally, we only had emit_add_line() helper, which knows how
to find and paint whitespace breakages on the given line, because we
only care about whitespace breakages introduced in new lines. The
context lines and old (i.e. deleted) lines are emitted with a
simpler emit_line_0() that paints
Move the preparatory steps that create the expected output inside
the test bodies, remove unnecessary blank lines before and after the
test bodies, and drop SP between redirection operator and its target.
Signed-off-by: Junio C Hamano
---
t/t4015-diff-whitespace.sh | 411 +++-
Traditionally, we only cared about whitespace breakages introduced
in new lines. Some people want to paint whitespace breakages on old
lines, too. When they see a whitespace breakage on a new line, they
can spot the same kind of whitespace breakage on the corresponding
old line and want to say "A
The last two tests in the script were to
- set up color.diff.* slots
- set up an expectation for a single test
- run that test and check the result
but split in a wrong way. It did the first two in the first test
and the third one in the second test. The latter two belong to each
other. Thi
On Tue, May 26, 2015 at 03:01:08PM -0700, Stefan Beller wrote:
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -716,10 +716,47 @@ static void format_symref_info(struct strbuf *buf,
> struct string_list *symref)
> strbuf_addf(buf, " symref=%s:%s", item->string, (char
> *)item->util
On Tue, May 26, 2015 at 03:01:09PM -0700, Stefan Beller wrote:
> + OPT_STRING('y', "transport-version", &transport_version,
> +N_("transport-version"),
> +N_("specify transport version to be used")),
Interesting choice for the short option ("-v" would be nice,
On Tue, May 26, 2015 at 03:01:10PM -0700, Stefan Beller wrote:
> +void get_remote_capabilities(int in, char *src_buf, size_t src_len)
> +{
> + struct strbuf capabilities_string = STRBUF_INIT;
> + for (;;) {
> + int len;
> + char *line = packet_buffer;
> +
On Tue, May 26, 2015 at 11:25:05PM -0400, Eric Sunshine wrote:
> > + len = packet_read(in, &src_buf, &src_len,
> > + packet_buffer, sizeof(packet_buffer),
> > + PACKET_READ_GENTLE_ON_EOF |
> > +
On Tue, May 26, 2015 at 03:01:11PM -0700, Stefan Beller wrote:
> diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
> index 4a6b340..32dc8b0 100644
> --- a/builtin/fetch-pack.c
> +++ b/builtin/fetch-pack.c
> @@ -127,6 +127,10 @@ int cmd_fetch_pack(int argc, const char **argv, const
> char *
On Tue, May 26, 2015 at 10:09:45PM -0700, Junio C Hamano wrote:
> Stefan Beller writes:
>
> > On Tue, May 26, 2015 at 3:21 PM, Junio C Hamano wrote:
> >
> >>
> >> if (...->version < 2) {
> >> ... append "-%d" ...
> >> }
> >>
> >> involved.
> >
> > Oh! I see here
94 matches
Mail list logo
