Hey Eric,
Sorry for the late reply. I was on vacation.
On Mon, May 16, 2016 at 6:05 AM, Eric Sunshine wrote:
> On Sun, May 8, 2016 at 9:34 AM, Pranit Bauva wrote:
>> On Sun, May 8, 2016 at 11:53 AM, Pranit Bauva wrote:
>>> On Sun, May 8, 2016 at 7:55 AM, Junio C Hamano wrote:
Pranit Bauva
Junio Hamano wrote:
> Matthieu Moy writes:
>
> > antoine.qu...@ensimag.grenoble-inp.fr wrote:
> >> come from the commit (gmane/131517)
> >
> > Please, use a real commit id instead of a Gmane link.
> >
> > We don't know how long Gmane will remain up, but a self
> > reference from Git's history to
Junio C Hamano wrote:
> Encouraging use of "send-email" with "--patience" is a losing
> approach if your goal is to present more reviewable diff, isn't it?
> Using "send-email" as if it is a front-end of "format-patch" means
> you lose the opportunity for the final proof-reading (not just
> finding
We don't need to override IFS, zsh has a native way of splitting by new
lines: the expansion flag (f).
Also, we don't need to split files by ':' or '='; that's only for words.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.zsh | 10 +++---
1 file changed, 3 insertions
There's no need to hide the fact that we are on zsh any more.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.zsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.zsh
b/contrib/completion/git-completion.zsh
index e255413
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.zsh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.zsh
b/contrib/completion/git-completion.zsh
index 1f786cc..28eaaed 100644
--- a/contrib/completion/git-completion.zsh
++
We don't want to override the 'complete()' function in zsh, which can be
used by bashcomp.
Reported-by: Mark Lodato
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 1 +
contrib/completion/git-completion.zsh | 6 --
2 files changed, 1 insertion(+), 6 deletions(-
It has been deprecated for more than three years. It's time to move on.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 64 --
1 file changed, 64 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/g
The original code was correct: the example location ~/.git-completion.sh
is correct, because it's not only used by Bash. And zstyle command in
Zsh should use that same location; the Bash script.
This reverts commit 0e5ed7cca3c51c821c2bb0465617e75d994f432f.
Signed-off-by: Felipe Contreras
---
co
We can add colour in Zsh without the need of pcmode.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-prompt.sh | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 64219e6..0da14ee 100644
Avoid Yoda conditions, use test, and cleaner statement.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 6c338ae.
Sometimes we want to use the function directly (e.g. _git_checkout), for
example when zsh has the option 'complete_aliases', this way, we can do
something like:
compdef _git gco=git_checkout
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.zsh | 4 +++-
1 file changed, 3
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index e3918c8..ecdf742 100644
--- a/contrib/completion/git-completion.bash
+++ b/contri
Hi,
Here's a bunch of patches I've been using for a long time. I don't recall if
I've sent some of these before.
Here they are in case anybody is interested.
Cheers.
Felipe Contreras (11):
completion: add missing fetch options
completion: bash: remove old wrappers
completion: bash: remov
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 12
1 file changed, 12 deletions(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index ecdf742..5e2e590 100644
--- a/contrib/completion/git-completion.bash
+
[cc:+junio]
On Thu, May 19, 2016 at 5:31 PM, Vasco Almeida wrote:
> Às 18:34 de 19-05-2016, Eric Sunshine escreveu:
>> On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida
>> wrote:
>>> - sed -e "1,/^Did you mean this/d" actual | grep lgf &&
>>> + sed -e "1,/^Did you mean this/d" actual
I'm running Git version 2.8.2 built from source on Ubuntu 16.04.
I'm using a repository that's stored on Dropbox. I'm the only person
accessing this repo. Everything works great.
For reasons unrelated to Git, I decided to try Git for Windows,
so I installed "git version 2.8.2.windows.1" on Window
Stefan Beller writes:
> +attr;;
> +After `attr:` comes a space separated list of "attribute
> +...
> ++
The text looks OK, but does it format well?
> + attr_len = strcspn(attr, "=");
Scanning for '=' here retains the same bug from the previous
iteration where you take !VAR=VAL and
See https://gist.github.com/cg-soft/62ac3529cf9ad6f6586e07866de43bc4
and discussion here:
http://stackoverflow.com/questions/37330041/merging-git-tags-from-multiple-reference-locations
Essentially, using this git config to pull tags from multiple remote
refs works fine:
[remote "origin"]
url
The pathspec mechanism is extended via the new
":(attr:eol=input)pattern/to/match" syntax to filter paths so that it
requires paths to not just match the given pattern but also have the
specified attrs attached for them to be chosen.
Signed-off-by: Stefan Beller
---
Documentation/glossary-conten
The prefix check is not related the check of pathspec magic; also there
is no code that is relevant after we'd break the loop on a match for
"prefix:". So move the check before the loop and shortcircuit the outer
loop.
Signed-off-by: Stefan Beller
---
pathspec.c | 19 ++-
1 file
This goes on top of origin/jc/attr, (396bf756f95, attr: expose validity check
for attribute names)
Patches 1 is a small fix, which could go independently as well.
I dropped the patch "string list: improve comment"
Patches 3 and 4 are refactoring pathspec.c a little.
These did not change since v7
`prefix_pathspec` is quite a lengthy function and we plan on adding more.
Split it up for better readability. As we want to add code into the
inner loop of the long magic parsing, we also benefit from lower
indentation.
Signed-off-by: Stefan Beller
---
pathspec.c | 84 +++
Signed-off-by: Stefan Beller
---
Documentation/gitattributes.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e3b1de8..af2c682 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattribu
tbo...@web.de writes:
> From: Torsten Bögershausen
>
> Break up the old 10/10 series about CLRF handling into smaller
> series. This is a small bugfix, when merge.renormalize is used
> with core.autocrlf (and no attributes are set).
Is it worth protecting the fix with a new test? Or does this f
tbo...@web.de writes:
> +int convert_to_git_ce_sha1(const char *path, const unsigned char *sha1,
> +const char *src, size_t len,
> +struct strbuf *dst, enum safe_crlf checksafe)
That's a strange name for the function, as "ce" and "sha1" gives no
hin
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.
Signed-off-by: David Turner
---
Documentation/config.txt | 4
read-cache.c
From: Nguyễn Thái Ngọc Duy
All the known heavy code blocks are measured (except object database
access). This should help identify if an optimization is effective or
not. An unoptimized git-status would give something like below (92% of
time is accounted). To sum up the effort of making git scale
For installations that have centrally-managed configuration, it's
easier to set a config once than to run update-index on every
repository.
Signed-off-by: David Turner
---
.gitignore| 1 +
Documentation/config.txt | 4
Makefile | 1 +
read-ca
Instead of writing warnings to stderr, write them to a log. Later, we'll
probably be daemonized, so writing to stderr will be pointless.
Signed-off-by: David Turner
---
Documentation/git-index-helper.txt | 3 +++
index-helper.c | 12 +++-
2 files changed, 14 inserti
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 is faster read. Read time
is reduced by 70%.
The biggest gain is not having to verify the traili
Soon, we'll want to automatically start index-helper, so we need
a mode that silently exits if it can't start up (either because
it's not in a git dir, or because another one is already running).
Signed-off-by: David Turner
---
Documentation/git-index-helper.txt | 4
index-helper.c
From: Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: David Turner
---
Documentation/git-index-helper.txt | 3 +++
Documentation/git-update-index.txt | 6 ++
builtin/update-index.c | 16
3 files changed, 25 insertions(+)
diff --git a/
From: Nguyễn Thái Ngọc Duy
There are "holes" in the index-helper approach because the shared
memory is not verified again by git. If $USER is compromised, shared
memory could be modified. But anyone who could do this could already
modify $GIT_DIR/index. A more realistic risk is some bugs in
index
Make git checkout (and other unpack_tree operations) preserve the
untracked cache and watchman status. This is valuable for two reasons:
1. Often, an unpack_tree operation will not touch large parts of the
working tree, and thus most of the untracked cache will continue to be
valid.
2. Even if th
From: Nguyễn Thái Ngọc Duy
Watchman is hidden behind index-helper. Before git tries to read the
index from shm, it notifies index-helper through the socket and waits
for index-helper to prepare a file for sharing memory (with
MAP_SHARED). index-helper then contacts watchman, updates 'WAMA'
extens
Signed-off-by: David Turner
---
index-helper.c | 7 +++
t/t7900-index-helper.sh | 9 +
2 files changed, 16 insertions(+)
diff --git a/index-helper.c b/index-helper.c
index 4a171e6..ddc641a 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -438,6 +438,13 @@ int main(int arg
Add a new command (and command-line arg) to allow index-helpers to
exit cleanly.
This is mainly useful for tests.
Signed-off-by: David Turner
---
Documentation/git-index-helper.txt | 3 +++
index-helper.c | 31 ++-
t/t7900-index-helper.sh
From: Nguyễn Thái Ngọc Duy
The previous patch has the logic to clear bits in 'WAMA' bitmap. This
patch has logic to set bits as told by watchman. The missing bit,
_using_ these bits, are not here yet.
A lot of this code is written by David Turner originally, mostly from
[1]. I'm just copying and
From: Nguyễn Thái Ngọc Duy
The extension contains a bitmap, one bit for each entry in the
index. If the n-th bit is zero, the n-th entry is considered
unchanged, we can ce_mark_uptodate() it without refreshing. If the bit
is non-zero and we found out the corresponding file is clean after
refresh,
Add a configuration variable, indexhelper.exitafter, which provides a
default time to keep the index-helper alive. This is useful with
indexhelper.autorun; some users will want to keep the
automatically-run index-helper alive across their lunch break and will
thus set indexhelper.exitafter to a hi
From: Nguyễn Thái Ngọc Duy
Later, we will introduce git index-helper to share this memory with
other git processes.
We only unmap it when we discard the index (although the kernel may of
course choose to page it out).
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: David Turner
---
cache.
From: Nguyễn Thái Ngọc Duy
We detach after creating and opening the socket, because otherwise
we might return control to the shell before index-helper is ready to
accept commands. This might lead to flaky tests.
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: David Turner
---
Documentatio
From: Nguyễn Thái Ngọc Duy
This allows signal handlers and atexit functions to realize this
situation and not clean up.
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: David Turner
---
builtin/gc.c | 2 +-
cache.h | 2 +-
daemon.c | 2 +-
setup.c | 4 +++-
4 files changed, 6
packet_write calls write_or_die, which dies with a sigpipe even if
calling code has explicitly blocked that signal.
Add packet_write_gently and packet_flush_gently, which don't. Soon,
we will use this for communication with git index-helper, which, being
merely an optimization, should be permitte
From: Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy
Signed-off-by: David Turner
---
read-cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/read-cache.c b/read-cache.c
index d9fb78b..16cc487 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1345,7 +1345,7 @@
Of course, as soon as I pinged on the previous version, I noticed an issue.
In that version, git index-helper --exit-after 0 was documented to
never exit, but it would in fact exit immediately. This changes patch
04/20.
In addition, I noticed that there was no way to control the timeout on
autom
Às 18:34 de 19-05-2016, Eric Sunshine escreveu:
> On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida wrote:
>> The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON,
>> because it's expecting to filter out the original output. Accommodate
>> gettext poison case by also filtering out
On Thu, May 19, 2016 at 2:05 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> (B) requires some thought though. Here is my vision:
>>
>> 1) Allow pathspecs for sparse checkout.
>>
>> I wonder if we just add support for that in .git/info-sparse-checkout
>> or if we add a new
Stefan Beller writes:
> (B) requires some thought though. Here is my vision:
>
> 1) Allow pathspecs for sparse checkout.
>
> I wonder if we just add support for that in .git/info-sparse-checkout
> or if we add a new file that is for pathspecs only, or we have a config
> opti
Stefan Beller writes:
> $ grep -r "cat" |grep "<<-"|wc -l
> 915
> $ grep -r "cat" |grep "<<"|grep -v "<<-"| wc -l
> 1329
>
> I was undecided what the prevailing style is, some did indent,
> others did not.
FWIW, newer ones tend to use "<<-"; just FYI.
--
To unsubscribe from this list: send the l
On Thu, May 19, 2016 at 11:55 AM, Junio C Hamano wrote:
> I think this round is 99% there. The next step would be to answer
> "does the feature set we have here meet your needs that you wanted
> to fill with the submodule labels originally?" and I am hoping it is
> "yes".
But it's no. (...not qu
On Thu, May 19, 2016 at 11:53 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> diff --git a/Documentation/glossary-content.txt
>> b/Documentation/glossary-content.txt
>> index cafc284..aa9f220 100644
>> --- a/Documentation/glossary-content.txt
>> +++ b/Documentation/glossary-content.txt
>>
On Thu, 2016-05-19 at 13:11 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > Do folks have any more comments on this version?
>
> Not from me at the moment.
>
> > Do I need to re-roll
> > to replace 11/20 as I proposed and drop 20/20?
>
> FYI, I think I have the one taken from
>
>
David Turner writes:
> Do folks have any more comments on this version?
Not from me at the moment.
> Do I need to re-roll
> to replace 11/20 as I proposed and drop 20/20?
FYI, I think I have the one taken from
Message-Id:
<1463174182-20200-1-git-send-email-dtur...@twopensource.com>
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks for your help and sorry for my confused regarding ad and cd.
From: Junio C Hamano
Sent: Thursday, May 19, 2016 2:03:54 PM
To: Hawk, Jeff
Cc: Git Mailing List
Subject: Re: since/after not working properly
"Hawk, Jeff" writes:
> They suggest this:
Am 12.05.2016 um 01:32 schrieb Junio C Hamano:
+ if (unlink(filename)) {
+ if (errno == ENOENT)
+ error("no remembered resolution for %s", path);
+ else
+ error("cannot unlink %s: %s", filename,
strerror(errno));
+
Stefan Beller writes:
> +test_expect_success 'setup a tree' '
> + mkdir sub &&
> + for p in fileA fileB fileC fileAB fileAC fileBC fileNoLabel
> fileUnsetLabel fileSetLabel fileValue fileWrongLabel; do
> + : >$p &&
> + git add $p &&
> + : >sub/$p
> +
Do folks have any more comments on this version? Do I need to re-roll
to replace 11/20 as I proposed and drop 20/20?
Thanks.
On Thu, 2016-05-12 at 16:19 -0400, David Turner wrote:
> packet_write was causing the sigpipes (by calling write_or_die, which
> intentionally overrides the caller's pref
"Hawk, Jeff" writes:
> They suggest this:
> git log --all --numstat --date=short --pretty=format:'--%h--%ad--%aN'
> --no-renames
>
> Seems like the %ad should be %cd.
I have no opinion on that. If somebody wants to show author dates,
that's her choice.
--
To unsubscribe from this list: send th
I think this round is 99% there. The next step would be to answer
"does the feature set we have here meet your needs that you wanted
to fill with the submodule labels originally?" and I am hoping it is
"yes".
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of
Stefan Beller writes:
> diff --git a/Documentation/glossary-content.txt
> b/Documentation/glossary-content.txt
> index cafc284..aa9f220 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -384,6 +384,23 @@ full pathname may have special meaning:
> +
On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida wrote:
> The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON,
> because it's expecting to filter out the original output. Accommodate
> gettext poison case by also filtering out the default simulated output.
>
> Signed-off-by: Vasc
> On Thu, May 19, 2016 at 10:45 AM, Matthieu Moy
> wrote:
> >> Add the info in documentation that CSS is now built-in.
> >
> > This doesn't add much to the patch (we can already see that from the patch
> > itself). I'd remove it.
>
> I think you meant to say this "doesn't add much to the *commit
On Thu, May 19, 2016 at 11:08 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Signed-off-by: Stefan Beller
>> ---
>> string-list.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/string-list.h b/string-list.h
>> index d3809a1..465a1f0 100644
>> --- a/string-li
Stefan Beller writes:
> Signed-off-by: Stefan Beller
> ---
> string-list.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/string-list.h b/string-list.h
> index d3809a1..465a1f0 100644
> --- a/string-list.h
> +++ b/string-list.h
> @@ -106,7 +106,7 @@ void unsorted_strin
Thanks Junio,
Do you think that code-maat has the wrong format documented on their github
page?
At: https://github.com/adamtornhill/code-maat
They suggest this:
git log --all --numstat --date=short --pretty=format:'--%h--%ad--%aN'
--no-renames
Seems like the %ad should be %cd.
Regards,
Jeff
On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida wrote:
> Mark strings in git-rebase--interactive.sh for translation. There is no
> need to source git-sh-i18n since git-rebase.sh already does so.
>
> Add git-rebase--interactive.sh to LOCALIZED_SH in Makefile in order to
> enabled extracting strings
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
The latest maintenance release Git v2.8.3 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.8.3'
tag and the 'maint' branch that the tag points at:
url = https://kernel
On Thu, May 19, 2016 at 10:45 AM, Matthieu Moy
wrote:
>> Subject: [PATCH/RFC] Add userdiff built-in pattern for CSS code
>> [...snip...]
>> Add the info in documentation that CSS is now built-in.
>
> This doesn't add much to the patch (we can already see that from the patch
> itself). I'd remove i
> On 19 May 2016, at 19:03, Junio C Hamano wrote:
>
> Lars Schneider writes:
>
>> From my point of view little packs are no problem. I run fast-import on
>> a dedicated migration machine. After fast-import completion I run repack [1]
>> before I upload the repo to its final location.
>
> How
On Thu, May 19, 2016 at 8:41 AM, Jeff Hawk wrote:
> [jeff:~/src/git] master* 2s ± git log --pretty=format:"%ad" --date=short
Perhaps try it with %cd instead of %ad?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordo
[jeff:~/src/git] master* 2s ± git log --pretty=format:"%ad" --date=short
--after=2016-05-01 | sort -u
2016-04-14
2016-04-27
2016-04-29
2016-05-01
2016-05-02
2016-05-03
2016-05-04
2016-05-05
2016-05-06
2016-05-07
2016-05-08
2016-05-09
2016-05-10
2016-05-11
2016-05-12
2016-05-13
2016-05-17
2016-05-
Eric Wong writes:
> Anyways, how about making the tests run on separate ports and
> not worry about serializing them at all?
Yeah, that does sound like a more sensible approach.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.or
Lars Schneider writes:
> From my point of view little packs are no problem. I run fast-import on
> a dedicated migration machine. After fast-import completion I run repack [1]
> before I upload the repo to its final location.
How do you determine that many little packs are not a problem to
you,
Matthieu Moy writes:
>> +if (argc != 1)
>> +usage_with_options(upload_pack_usage, options);
>>
>> -setup_path();
>> +if (timeout)
>> +daemon_mode = 1;
>>
>> -dir = argv[i];
>> +setup_path();
>>
>> +dir = argv[0];
>
> Not a problem with your co
Matthieu Moy writes:
> antoine.qu...@ensimag.grenoble-inp.fr wrote:
>> Option parsing now uses the parser API instead of a local parser.
>> Code is now more compact.
>> Description for -stateless-rpc and --advertise-refs
>> come from the commit (gmane/131517)
>
> Please, use a real commit id inst
antoine.qu...@ensimag.grenoble-inp.fr wrote:
> Option parsing now uses the parser API instead of a local parser.
> Code is now more compact.
> Description for -stateless-rpc and --advertise-refs
> come from the commit (gmane/131517)
Please, use a real commit id instead of a Gmane link.
We don't k
Alexander 'z33ky' Hirsch <1ze...@gmail.com> writes:
> Would "ignoring --verify-signatures for rebase" be sufficient? It does
> not describe why it is ignored though.
Yeah, I agree that that would be sufficient.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a mes
Jeff King writes:
> Oh, I agree that unix times are handy. I just think that "use %at in the
> pretty-format, instead of %ad and then %s in the date-format" is not
> such a bad workaround.
I had missed %at (and %ct). Yes, works perfectly - thanks for the hint.
Regards,
Michael.
--
To unsubsc
Option parsing now uses the parser API instead of a local parser.
Code is now more compact.
Description for -stateless-rpc and --advertise-refs
come from the commit (gmane/131517) where there were implemented.
Signed-off-by: Antoine Queru
Signed-off-by: Matthieu Moy
---
diff v1 v2:
Usage displa
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Bjørnar Snoksrud writes:
> .. which indicates that `foo` is contained within `bar`. Maybe
>
> * ff4265f (HEAD -> master) Merge branch 'bar'
> |\
> | * 0bbc311 (bar) 5
> | * b1c9c49 4
> |
> | * ce053f9 (foo) 3
> |/
> * 8b62de9 2
> * cb7e7e2 1
>
> .. would be better?
>
Yes, it would be.
--
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, May 19, 2016 at 2:08 PM, Jeff King wrote:
> On Thu, May 19, 2016 at 12:12:43PM +0200, Ævar Arnfjörð Bjarmason wrote:
>> But as you point out this makes the hook interface a bit unusual.
>> Wouldn't this give us the same security and normalize the hook
>> interface:
>>
>> * Don't do the up
Jeff King wrote:
> On Thu, May 19, 2016 at 12:10:31PM +0200, Antoine Queru wrote:
>
> > > I'm not sure whether it is worth hiding the first two options. We
> > > typically hide "internal" options like this for user-facing programs, so
> > > as not to clutter the "-h" output. But upload-pack isn't
> Subject: [PATCH/RFC] Add userdiff built-in pattern for CSS code
We normally write subject lines as ": CSS is widely used, motivating it being included as a built-in pattern.
> It must be noted that the word_regex for CSS (i.e. the regex defining what is
> a word in the language) does not consid
On Thu, May 19, 2016 at 3:49 AM, Mike Hommey wrote:
> On Fri, Apr 08, 2016 at 08:35:51AM -0400, Mike Rappazzo wrote:
>> On Fri, Apr 8, 2016 at 7:47 AM, Duy Nguyen wrote:
>> > On Mon, Apr 4, 2016 at 8:42 AM, Michael Rappazzo
>> > wrote:
>> >> Executing `git-rev-parse --git-common-dir` from the r
From: Torsten Bögershausen
To compare a file in working tree with the index, convert_to_git() is used,
the the result is hashed and the hash value compared with ce->sha1.
Deep down would_convert_crlf_at_commit() is invoked, to check if CRLF
are converted or not: When a CRLF had been in the index
From: Torsten Bögershausen
Factor out the retrieval of the sha1 for a given path in
read_blob_data_from_index() into the function get_sha1_from_index().
This will be used in the next commit, when convert.c can do the
analyze for "text=auto" without slurping the whole blob into memory
at once.
A
From: Torsten Bögershausen
Break up the old 10/10 series about CLRF handling into smaller
series. This is a small bugfix, when merge.renormalize is used
with core.autocrlf (and no attributes are set).
Prepare the refactoring to use the streaming interface.
Changes since v4:
- Rename #define in c
If you end up with a history containing commit A with parent B, where
a detached branch is merged into A while an unrelated branch branches
off of B, you will get the following output:
$ git log --graph --all
* commit ff4265fcbfe94a2abe93c97d86e0d9f0e0a136cb
|\ Merge: 8b62de9 0bbc311
| | Author
On Thu, May 19, 2016 at 12:12:43PM +0200, Ævar Arnfjörð Bjarmason wrote:
> On Thu, May 19, 2016 at 12:45 AM, Jeff King wrote:
> > 3. You may want to insert a caching layer around
> > pack-objects; it is the most CPU- and memory-intensive
> > part of serving a fetch, and its output is
On Thu, May 19, 2016 at 12:10:31PM +0200, Antoine Queru wrote:
> > I'm not sure whether it is worth hiding the first two options. We
> > typically hide "internal" options like this for user-facing programs, so
> > as not to clutter the "-h" output. But upload-pack isn't a user-facing
> > program.
On Thu, May 19, 2016 at 12:45 AM, Jeff King wrote:
> 3. You may want to insert a caching layer around
> pack-objects; it is the most CPU- and memory-intensive
> part of serving a fetch, and its output is a pure
> function[1] of its input, making it an ideal place to
> consoli
CSS is widely used, motivating it being included as a built-in pattern.
It must be noted that the word_regex for CSS (i.e. the regex defining what is a
word in the language) does not consider '.' and '#' characters (in CSS
selectors) to be part of the word. This behavior is documented by the test
larsxschnei...@gmail.com wrote:
> Enable t9113 and 9126 by defining the SVNSERVER_PORT. Since both tests
> open the same port during execution, they cannot run in parallel. Add
> a ".seq.sh" suffix to the test files and teach "prove" to run them
> sequentially.
Interesting, I guess I forgot the pr
Thanks for your input.
> > -static const char upload_pack_usage[] = "git upload-pack [--strict]
> > [--timeout=] ";
> > +static const char * const upload_pack_usage[] = {
> > + N_("git upload-pack [--strict] [--timeout=] "),
> > + NULL
> > +};
>
> Do we need to enumerate the options here now?
1 - 100 of 109 matches
Mail list logo
