Yes, you got the right understanding of my problem.
You are right, the git behavior is quite correct. But I met this
problem in my practical work:
My colleague added a method but I didn't know. I also added the same method.
Then I found that I didn't need the method actually, so I deleted it.
My
Hi Junio,
On Thu, 12 May 2016, Junio C Hamano wrote:
> I took these separately already, and plan to fast-track them as they are
> both "trivially correct"; I double checked that what I have match these
> two, too.
Oh, okay. I just wanted to make things easier for you, and now that I have
a scrip
On Fri, May 13, 2016 at 11:28 AM, 李本超 wrote:
> git version 2.6.4 (Apple Git-63)
> system version: OS X EI Capitan 10.11.4
>
> below is the steps:
> $ mkdir test_repo
> $ cd test_repo
> $ git init
> $ echo "hello" > README.md
> $ git commit -a -m 'Add README.md'
It was my mistake. git-commit -a ad
Hi Chris,
On Wed, 11 May 2016, Christian Couder wrote:
> I consider that the apply functionality is properly libified before
> these patches, and that they should be in a separate series, but
> unfortunately using the libified apply in "git am" unmasks the fact that
> "git am", since it was a she
Stefan Beller writes:
> Would it make sense to mark a file as
>
> "follows the labeling system, but has no label" (TRUE)
> "doesn't follow the labeling system at all" (FALSE)
Isn't the former be "label="
I do not know what you mean by the latter. I would understand
"pretend this has al
> On 10 May 2016, at 19:12, Junio C Hamano wrote:
>
> larsxschnei...@gmail.com writes:
>
>> From: Lars Schneider
>>
>> Build documentation as separate Travis CI job to check for
>> documentation errors.
>>
>> Signed-off-by: Lars Schneider
>> ---
>> .travis.yml | 15
git version 2.6.4 (Apple Git-63)
system version: OS X EI Capitan 10.11.4
below is the steps:
$ mkdir test_repo
$ cd test_repo
$ git init
$ echo "hello" > README.md
$ git commit -a -m 'Add README.md'
$ git checkout -b A
$ echo "world" > README.md
$ git commit -a -m 'Add one line'
$ git checkout m
On Thu, May 12, 2016 at 10:26 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> +
>> +label:;;
>> + Labels can be assigned to pathspecs in the .gitattributes file.
>> + By specifying a list of labels the pattern will match only
>> + files which have all of the listed labels.
>>
On Thu, May 12, 2016 at 9:32 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> diff --git a/Documentation/glossary-content.txt
>> b/Documentation/glossary-content.txt
>> index 8ad29e6..a1fc9e0 100644
>> --- a/Documentation/glossary-content.txt
>> +++ b/Documentation/glossary-content.txt
>>
Stefan Beller writes:
> +
> +label:;;
> + Labels can be assigned to pathspecs in the .gitattributes file.
> + By specifying a list of labels the pattern will match only
> + files which have all of the listed labels.
> +
Attributes are given to paths, not pathspecs. You specify whic
Please mention the version no of git you are using and your system.
I am answering according to git 2.8.1 Lubuntu 15.04
On Fri, May 13, 2016 at 10:34 AM, 李本超 wrote:
> Hi all,
>
> Yestoday when I worked using Git, I found a bug. It's about
> rebase. Or I don't know if it is a bug, maybe that
Hi all,
Yestoday when I worked using Git, I found a bug. It's about
rebase. Or I don't know if it is a bug, maybe that is Git. Below is my
problem:
There is a master branch, and we develop in our own branch.
Let's simplify this: there are two branches created at the same commit
point
Stefan Beller writes:
> 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
> ---
What we
Stefan Beller writes:
> diff --git a/Documentation/glossary-content.txt
> b/Documentation/glossary-content.txt
> index 8ad29e6..a1fc9e0 100644
> --- a/Documentation/glossary-content.txt
> +++ b/Documentation/glossary-content.txt
> @@ -362,6 +362,11 @@ glob;;
> For example, "Documentation/{
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
After some fruitful discussion[1] in which Junio suggested trying a very
different route[2] that is more general and not submodule related, I considered
doing a mock for this.
This lets you label arbitrary pathspecs, e.g. in git.git we may want to have:
t/t[0-9]*.sh label=tests
such that
Labels were originally designed to manage large amount of
submodules, the discussion steered this in a more general
direction, such that other files can be labeled as well.
Labels are meant to describe arbitrary set of files, which
is not described via the tree layout.
Signed-off-by: Stefan Belle
The introductory text of the example has a typo in the
specification which makes it harder to follow that example.
Signed-off-by: Stefan Beller
---
Documentation/technical/api-gitattributes.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/technical/api-gitatt
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
`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 +++
Junio C Hamano writes:
> Thanks. I think we should squash the following in, as all these
> messages are now i18ned and without being marked with test_i18ncmp,
> GETTEXT_POISON build would fail to pass these tests.
... this was not a request for you to re-send your patch with the
update to the t
Vasco Almeida writes:
> Instead of reusing the same set of message templates for checkout
> and other actions and substituting the verb with "%s", prepare
> separate message templates for each known action. That would make
> it easier for translation into languages where the same verb may
> conju
Instead of reusing the same set of message templates for checkout
and other actions and substituting the verb with "%s", prepare
separate message templates for each known action. That would make
it easier for translation into languages where the same verb may
conjugate differently depending on the
On 12/05/16 21:20, David Turner wrote:
> From: Nguyễn Thái Ngọc Duy
[snip]
>
> +/* in ms */
> +#define WATCHMAN_TIMEOUT 1000
> +
> +static int poke_and_wait_for_reply(int fd)
> +{
> + struct strbuf buf = STRBUF_INIT;
> + int ret = -1;
> + struct pollfd pollfd;
> + int bytes_re
I think this patch is better than what is already in 'next', so let
me see if I can make it into an incremental update.
We'd need your sign-off, of course.
-- >8 --
Subject: i18n: unpack-trees: avoid substituting only a verb in sentences
Instead of reusing the same set of message templates for c
Pranit Bauva writes:
> + /*
> + * In theory, nothing prevents swapping completely good and bad,
> + * but this situation could be confusing and hasn't been tested
> + * enough. Forbid it for now.
> + */
> +
> + if ((strcmp(orig_term, "bad") && one_of(term, "bad", "new"
Am 11.05.2016 um 00:51 schrieb Junio C Hamano:
The helper function get_func_line() however gets confused when a
hunk adds a new function at the very end, and returns -1 to signal
that it did not find a suitable "function header line", i.e. the
beginning of previous function. The caller then take
Stefan Beller writes:
> The example want's to explain how 'To see how attributes "crlf" and
> "indent" are set for different paths.'
>
> Spell the selected attribute correctly.
>
> Signed-off-by: Stefan Beller
> ---
> Documentation/technical/api-gitattributes.txt | 2 +-
> 1 file changed, 1 ins
I tried bin-wrappers/ from current git HEAD.
$ git describe
v2.8.2-396-g5fe494c
bin-wrappers/git svn clone https://ironpython.svn.codeplex.com/svn
ironpython-old-codeplex
always fails at this rev:
M Src/Tests/test_re.py
r7605 = e581bc66eda2b86bf46681191034844c4ba7d7a5 (refs/remot
The example want's to explain how 'To see how attributes "crlf" and
"indent" are set for different paths.'
Spell the selected attribute correctly.
Signed-off-by: Stefan Beller
---
Documentation/technical/api-gitattributes.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/D
Christian Couder writes:
> Ok, I will try to group knobs like that, but the comments tend to
> break the groups.
By keeping the comment on a single field short, and reserve comment
occupying its own line(s) to comment on group, you can do
/* These control what gets looked at and modifie
Junio C Hamano wrote:
> > Secondly, and harder to get around, the filename passed to the clean
> > filter is not necessarily a path to the actual existing file that is
> > being cleaned.
>
> Either one of us is confused. I was talking about updating the
> current "clean" implementation without ch
David Turner writes:
> 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 a
Vasco Almeida writes:
> This re-roll upadates patch
> i18n: unpack-trees: mark strings for translation
Sorry, unfortunately you cannot take them back anymore. These from
the previous round are already in 'next'.
daf9f64 i18n: builtin/pull.c: split strings marked for translation
8a0de
Vasco Almeida writes:
> Remove a comma from string marked for translation. Make the string match the
> one in builtin/mv.c. Now translators have do handle this string only once.
>
> Signed-off-by: Vasco Almeida
> ---
Looks good. BTW, I think you just added two more "Please," in
"i18n: unpack-t
Junio C Hamano wrote:
> The smudge happens to be the last to run, so it is quite true that
> it can say "Hey Git, I've written it out already".
>
> I didn't check all codepaths to ensure that we won't need the
> smudged result in core at all, but I am guessing you did so before
> making this propo
Joey Hess writes:
> Junio C Hamano wrote:
>> This side, I do not think we even need a new variant. We can just
>> update the code to interact with "clean" so that it the writer to
>> the pipe ignores SIGPIPE, detects EPIPE on write(2), says "ah, the
>> other end does not need the full input to p
Junio C Hamano wrote:
> This side, I do not think we even need a new variant. We can just
> update the code to interact with "clean" so that it the writer to
> the pipe ignores SIGPIPE, detects EPIPE on write(2), says "ah, the
> other end does not need the full input to produce its output". The
>
Junio C Hamano writes:
> Up to this point, the conversion looks quite sensible, even though I
> think the organization of fields in apply_state do not look logical.
I'd stop here for now, as everything before this step looks
uncontroversial. Anybody whose tasked to move the global state for
the
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
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 @@
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 a1b33e4..7b893a0 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -435,6 +435,13 @@ int main(int arg
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
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
packet_write was causing the sigpipes (by calling write_or_die, which
intentionally overrides the caller's preferences about signal handling).
This version fixes that. I didn't test on a virtual machine, but I did
test by adding a sleep().
David Turner (9):
pkt-line: add gentle version of pack
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
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
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
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
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
Add a config option to populate the untracked cache.
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
---
Documentation/config.txt | 4
read-cache.c | 7 ++
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
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
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
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
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
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,
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.
On Thu, May 12, 2016 at 9:41 PM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> To libify the apply functionality the 'threeway' variable should
>> not be static and global to the file. Let's move it into
>> 'struct apply_state'.
>>
>> Reviewed-by: Stefan Beller
>> Signed-off-by: Christia
On Thu, May 12, 2016 at 9:28 PM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> To libify the apply functionality the 'unidiff_zero' variable should
>> not be static and global to the file. Let's move it into
>> 'struct apply_state'.
>>
>> Reviewed-by: Stefan Beller
>> Signed-off-by: Chri
Joey Hess writes:
> The clean filter has to consume the whole file content on stdin;
> not reading it all will make git think the clean filter failed.
> But, git-annex often doesn't need to read the whole content of a
> work-tree file in order to clean it.
This side, I do not think we even need
On Thu, May 12, 2016 at 9:04 PM, Junio C Hamano wrote:
>
> As Christian said in 00/94, this probably needs to go in steps, as I
> do not think anybody wants to review fouteen rounds of 90+ patch
> series. I thought the early 40+ patches in the series were at least
> cursory reviewed already?
Yea
Remove a comma from string marked for translation. Make the string match the
one in builtin/mv.c. Now translators have do handle this string only once.
Signed-off-by: Vasco Almeida
---
builtin/rm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rm.c b/builtin/rm.c
in
Some translations might also translate "" and "".
Signed-off-by: Vasco Almeida
---
builtin/pull.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 596b92f..96b98ea 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -478,13 +478,13 @
Split string "If you wish to set tracking information
for this branch you can do so with:\n" to match occurring string in
git-parse-remote.sh. In this case, the translator handles it only once.
On the other hand, the translations of the string that were already made
are mark as fuzzy and the trans
Mark description and parameter for option "set-upstream-to" for translation.
Signed-off-by: Vasco Almeida
---
builtin/branch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 0adba62..b7d906d 100644
--- a/builtin/branch.c
+++ b/builti
Git could output "completed with 1 local objects", but in this case
using "object" instead of "objects" is the correct form.
Use Q_() instead of _().
Signed-off-by: Vasco Almeida
---
builtin/index-pack.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/index-pack.c
Mark strings seen by the user inside setup_unpack_trees_porcelain() and
display_error_msgs() functions for translation.
Signed-off-by: Vasco Almeida
---
unpack-trees.c | 74 ++
1 file changed, 54 insertions(+), 20 deletions(-)
diff --git a
This re-roll upadates patch
i18n: unpack-trees: mark strings for translation
I have decoupled/untangled some strings to mark entire sentences instead of
assemble them using placeholders "%s". This makes the translation work
easier and more reliable.
Vasco Almeida (7):
i18n: index-pack: use pl
Change Makefile to include git-parse-remote.sh in LOCALIZED_SH.
TODO: remove 3rd argument of error_on_missing_default_upstream function
that is no longer required.
Signed-off-by: Vasco Almeida
---
Makefile| 2 +-
git-parse-remote.sh | 46 +---
Christian Couder writes:
> This is just a small cleanup.
... which may have been better happened at 09/94.
Up to this point, the conversion looks quite sensible, even though I
think the organization of fields in apply_state do not look logical.
--
To unsubscribe from this list: send the line "
Christian Couder writes:
> struct apply_state {
> const char *prefix;
> int prefix_length;
> @@ -71,6 +78,8 @@ struct apply_state {
> int whitespace_error;
> int squelch_whitespace_errors;
> int applied_after_fixing_ws;
> +
> + enum ws_error_action ws_error_acti
Christian Couder writes:
> To libify the apply functionality the 'p_value_known' variable should
> not be static and global to the file. Let's move it into
> 'struct apply_state'.
This and p_value belong together, I would think, so this can be
squashed with 32/94 if the series is to be rerolled
Christian Couder writes:
> To libify the apply functionality the 'threeway' variable should
> not be static and global to the file. Let's move it into
> 'struct apply_state'.
>
> Reviewed-by: Stefan Beller
> Signed-off-by: Christian Couder
> ---
> builtin/apply.c | 14 +++---
> 1 file
Christian Couder writes:
> To libify the apply functionality the 'cached' variable should
> not be static and global to the file. Let's move it into
> 'struct apply_state'.
>
> Reviewed-by: Stefan Beller
> Signed-off-by: Christian Couder
> ---
> builtin/apply.c | 37 +--
Christian Couder writes:
> To libify the apply functionality the 'unidiff_zero' variable should
> not be static and global to the file. Let's move it into
> 'struct apply_state'.
>
> Reviewed-by: Stefan Beller
> Signed-off-by: Christian Couder
> ---
Looks correct; I would have expected from th
Christian Couder writes:
> To libify the apply functionality the 'update_index' variable should
> not be static and global to the file. Let's move it into
> 'struct apply_state'.
>
> Reviewed-by: Stefan Beller
> Signed-off-by: Christian Couder
> ---
> builtin/apply.c | 45 +
Christian Couder writes:
> When the apply functionality will be libified, the 'struct apply_state'
> will be used by different pieces of code.
>
> To properly initialize a 'struct apply_state', let's provide a nice
> and easy to use init_apply_state() function.
This probably should be done at 08
Christian Couder writes:
> The match_fragment() function is very big and contains a big special case
> algorithm that does line by line fuzzy matching. So let's extract this
> algorithm in a separate line_by_line_fuzzy_match() function.
>
> Reviewed-by: Stefan Beller
> Signed-off-by: Christian C
Christian Couder writes:
> Let's just rename the global 'state_linenr' as it will become
> 'state->linenr' in a following patch.
>
> This also avoid errors when compiling with -Wshadow and makes
> it safer to later move global variables into a "state" struct.
Looks correctly done (I looked at re
Christian Couder writes:
> Let's just rename the global 'state_p_value' as it will become
> 'state->p_value' in a following patch.
>
> This also avoid errors when compiling with -Wshadow and makes
> it safer to later move global variables into a "state" struct.
Looks correctly done (I looked at
Christian Couder writes:
> As the value returned by gitdiff_verify_name() is put into the
> same variable that is passed as a parameter to this function,
> it is simpler to pass the address of the variable and have
> gitdiff_verify_name() change the variable itself.
>
> This also makes it possibl
Johannes Sixt writes:
> I'll also use it in production for a while, although I am not a git-am
> consumer nor do I use git-rebase without -i, hence, my tests will
> probably only show that there is no bad fall-out.
It will probably only show that you do not use the part that was
touched by the s
Joey Hess writes:
> I'm using smudge/clean filters in git-annex now, and it's not been an
> entirely smooth fit between the interface and what git-annex wants
> to do.
>
> The clean filter has to consume the whole file content on stdin;
> not reading it all will make git think the clean filter fa
I'm using smudge/clean filters in git-annex now, and it's not been an
entirely smooth fit between the interface and what git-annex wants
to do.
The clean filter has to consume the whole file content on stdin;
not reading it all will make git think the clean filter failed.
But, git-annex often does
On Thu, May 12, 2016 at 07:53:28PM +0200, Armin Kunaschik wrote:
> The reason seems that the snippet
> cat <<-EOF >expected-all
> .gitignore:1:one../one
> :: ../not-ignored
> .gitignore:1:oneone
> :: not-ignored
> a/b/.gitignore:8:!
On Thu, May 12, 2016 at 7:06 PM, Johannes Sixt wrote:
> Am 11.05.2016 um 15:16 schrieb Christian Couder:
>>
>> This is a patch series about libifying `git apply` functionality, and
>> using this libified functionality in `git am`, so that no 'git apply'
>> process is spawn anymore. This makes `git
Hello,
in t0008 I see tests fails with
not ok 374 - --stdin -v
#
# expect_from_stdin expected-all
.gitignore:1:one../one
:: ../not-ignored
.gitignore:1:oneone
:: not-ignored
a/b/.gitignore:8:!on* b/on
a/b/.gi
On Thu, May 12, 2016 at 10:08 PM, Junio C Hamano wrote:
> Pranit Bauva writes:
>
>> Seems like Junio was waiting for someone to point this out[2].
>
> Thanks. I think you covered most of them correctly; I only have one
> thing to add.
>
>> * Comments are put after ---. So your paragraph
>>
Am 11.05.2016 um 15:16 schrieb Christian Couder:
This is a patch series about libifying `git apply` functionality, and
using this libified functionality in `git am`, so that no 'git apply'
process is spawn anymore. This makes `git am` significantly faster, so
`git rebase`, when it uses the am bac
Stefan Beller writes:
> We can still keep the submodule.defaultGroup. (In the WIP I renamed
> it to updateGroup as its only feature is to have it set during clone
> and remebered for `git submodule update`)
Yes, my idle speculation between "[submodule"x"] label=A" stored
in .gitmodules and "path
Pranit Bauva writes:
> Seems like Junio was waiting for someone to point this out[2].
Thanks. I think you covered most of them correctly; I only have one
thing to add.
> * Comments are put after ---. So your paragraph
> "Clarify which commits need to be signed.
>
> Uniformise the
On Thu, May 12, 2016 at 8:58 AM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> The reason why I suspect that this may not work well with submodule
>> labels is because submodule labels (or any attribute we give via
>> .gitmodules to a submodule) are keyed by a submodule name, which is
>> th
I took these separately already, and plan to fast-track them as they
are both "trivially correct"; I double checked that what I have
match these two, too.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo
Jeff King writes:
> My trick for checking the before/after of a patch is:
>
> 1. Compile git without the patch.
>
> 2. Apply the patch, then run the test (via ./t1234-*, which does not
> want to re-build git), confirm that it fails.
>
> 3. Re-compile and re-run the test, confirming tha
Jeff King writes:
> Presumably `fclose` doesn't ever overwrite errno in practice, but I
> guess it could in theory.
Yeah, these two patches share the same issue.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo
From: Jeff King
Passing "-x" to a test script enables the shell's "set -x"
tracing, which can help with tracking down the command that
is causing a failure. Unfortunately, it can also _cause_
failures in some tests that redirect the stderr of a shell
function. Inside the function the shell conti
This is the first patch series in preparation for a faster interactive
rebase.
It actually only prepares the test script that I mainly used to develop
the rebase--helper, and the resilience against running with -x proved to
be invaluable in keeping my sanity.
Jeff King (1):
test-lib: set BASH_
1 - 100 of 115 matches
Mail list logo
