Hi,
I have an issue with the git p4 tooling regarding import of labels.
My git version is 2.4.5
I try to transform a perforce repository. My command line is:
git p4 clone --verbose --detect-branches --import-local --import-labels
--destination DESTINATION //depot@all
The relevant parts in
On Mon, Jun 29, 2015 at 4:17 PM, David Turner dtur...@twopensource.com wrote:
These are necessary because alternate ref backends might store reflogs
somewhere other than .git/logs. Code that now directly manipulates
.git/logs should instead go through git-reflog.
In a moment, we will use
Vincent, I'm ccing you because of --use-bitmap-index
John, Johannes,
I really appreciate both your thoughts.
`git rev-list --count HEAD -- $FILENAME` runs noticeably faster then
my patch code for `git shortlog --count`, git shortlog -s $FILENAME
| cut -f 1 | paste -sd+ -|bc, and faster than any
Kedves email felhasználói;
Túllépte a határt 23432 tárolása e-mail fiókkal által beállított
Web Service / adminisztrátor, és azt szeretné, hogy sikerül a küld#337;
és levelet fogadni, amíg meg újból érvényesíti az e-mail címre. A
szükséges eljárások
nyújtottak be az alábbiakban a nézetet,
This is an almost unmodified resend of Remi's patch here:
http://thread.gmane.org/gmane.comp.version-control.git/271844/focus=272499
The last patches had trouble reaching the list, hopefully this will be
easier to apply. Two minor changes:
* Removed the Helped-by: Remi trailer in a message sent
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Group expressions in a single if statement. This avoid checking
multiple time if the variable $sender is defined.
Signed-off-by: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Create a function which replaces Date, Message-Id and
X-Mailer lines generated by git-send-email by a specific string:
Date:.*$ - Date: DATE-STRING
Message-Id:.*$ - Message-Id: MESSAGE-ID-STRING
X-Mailer:.*$ - X-Mailer:
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Aliases were expanded before considering the From field of the
--compose option. This is inconsistent with other fields
(To, Cc, ...) which already support aliases.
Signed-off-by: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Junio C Hamano gits...@pobox.com writes:
Matthieu, are you allowing your editor to corrupt the number of
lines in the hunk on the @@ ... @@ hunk header? diff mode in
Emacs does that,
Indeed. There's magic in Emac's diff-mode to keep the header up to date,
but it seems totally buggy. I
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Move the creation of the scripts used in to-cmd and cc-cmd tests
in a setup test to make them available for later tests.
Signed-off-by: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Signed-off-by: Matthieu Moy matthieu@imag.fr
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Do not consider quote inside a recipient name as character when
they are not escaped. This interprets:
Jane Doe j...@example.com
as:
Jane Doe j...@example.com
instead of:
Jane\ \Doe j...@example.com
Signed-off-by: Remi Lespinet
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Simplify code by creating a function which transform a list of strings
containing email addresses (separated by commas, comporting aliases)
into a clean list of valid email addresses.
Signed-off-by: Remi Lespinet
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Interpret aliases in:
- Header fields of patches generated by git format-patch
(using --to, --cc, --add-header for example) or
manually modified. Example of fields in header:
To: alias1
Cc: alias2
Cc:
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Accept a list of emails separated by commas in flags --cc, --to and
--bcc. Multiple addresses can already be given by using these options
multiple times, but it is more convenient to allow cutting-and-pasting
a list of addresses from the
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
Remove leading and trailing whitespaces in from field before
interepreting it to improve consistency with other options. The
split_addrs function already take care of trailing and leading
whitespaces for to, cc and bcc fields.
The from
From: Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr
parse_address_line had not the same behavior whether the user had
Mail::Address or not. Teach parse_address_line to behave like
Mail::Address.
When the user input is correct, this implementation behaves
exactly like Mail::Address except
On Tue, Jun 30, 2015 at 02:10:49PM +0200, Johannes Schindelin wrote:
On 2015-06-29 18:46, Lawrence Siebert wrote:
I appreciate your help. Okay, That all makes sense.
I would note that something like:
git shortlog -s $FILENAME: | cut -f 1 | paste -sd+ - | bc
seems like it run
When -- is lacking from the command line and a command can take both
revs and paths, the idea is if an argument can be seen as both an
extended SHA-1 and a path, then -- is required or git refuses to
continue. It's currently implemented as:
(1) if an argument is rev, then it must not exist in
Hi Lawrence,
On 2015-06-29 18:46, Lawrence Siebert wrote:
I appreciate your help. Okay, That all makes sense.
I would note that something like:
git shortlog -s $FILENAME: | cut -f 1 | paste -sd+ - | bc
seems like it run much faster then:
git log --oneline $FILENAME | wc -l
How
This series makes git status provide an output like
interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
pick $COMMIT2 two_commit
exec exit 15
Next commands to do (2 remaining commands):
pick $COMMIT3 three_commit
pick $COMMIT4 four_commit
From: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr
Signed-off-by: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr
Signed-off-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
t/t7512-status-help.sh | 28 ++--
From: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr
git status gives more information during rebase -i, about the list of
command that are done during the rebase. It displays the two last
commands executed and the two next lines to be executed. It also gives
hints to find the whole
From: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr
Expand test coverage with one or more than two commands done
and with zero, one or more than two commands remaining.
Signed-off-by: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr
Signed-off-by: Junio C Hamano
On Mon, Jun 29, 2015 at 11:33 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
+static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
+{
+ struct rev_info revs;
+ int i, old_nr;
+ struct ref_filter *filter = ref_cbdata-filter;
On Mon, Jun 29, 2015 at 06:22:47PM -0400, Eric Sunshine wrote:
Clients of strbuf rightly expect the buffer to grow as needed in
order to complete the requested operation. It is, therefore, both
weird and expectation-breaking for strbuf_addftime() to lack this
behavior. Worse, it doesn't even
On Mon, Jun 29, 2015 at 11:50 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
Since 'ref-filter' only has an option to match path names.
That is not a whole sentence ;-)
Argh! Noted.
Add an option for regular pattern matching.
Mentored-by:
On Mon, Jun 29, 2015 at 06:22:47PM -0400, Eric Sunshine wrote:
Clients of strbuf rightly expect the buffer to grow as needed in
order to complete the requested operation. It is, therefore, both
weird and expectation-breaking for strbuf_addftime() to lack this
behavior. Worse, it doesn't even
On Wed, Jul 1, 2015 at 12:27 AM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
On Tue, Jun 30, 2015 at 12:56 AM, Eric Sunshine sunsh...@sunshineco.com
wrote
Speaking of git worktree new --force, should we revisit git
checkout --ignore-other-worktrees
Karthik Nayak karthik@gmail.com writes:
I also have a feeling that compared to an implementation based on
paint_down_to_common(), including is_descendant_of(), this may be
less precise (e.g. it would be confused with clock skew that lasts
more than SLOP commits). If we are inventing a
On 2015-06-30 16.34, Karsten Blees wrote:
Renaming to an existing file doesn't work on Windows network shares if the
target file is open.
munmap() the old config file before commit_lock_file.
Signed-off-by: Karsten Blees bl...@dcon.de
---
See
Hi,
On 2015-06-30 16:34, Karsten Blees wrote:
Renaming to an existing file doesn't work on Windows network shares if the
target file is open.
munmap() the old config file before commit_lock_file.
Signed-off-by: Karsten Blees bl...@dcon.de
ACK.
Thanks,
Dscho
--
To unsubscribe from this
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
Matthieu, are you allowing your editor to corrupt the number of
lines in the hunk on the @@ ... @@ hunk header? diff mode in
Emacs does that,
Indeed. There's magic in Emac's diff-mode to keep the
On Tue, Jun 30, 2015 at 04:46:20PM +0200, Torsten Bögershausen wrote:
The value of fstat() is not checked here:
(indicated by a compiler warning, that contents_sz may be uninitalized.
config.c:
int git_config_set_multivar_in_file(
//around line 2063 (the only call to fstat())
On Tue, 2015-06-30 at 03:34 -0400, Eric Sunshine wrote:
+ strbuf_release(err);
This feels a bit dirty. While it's true that the current
Thanks. New patchset pushed to the branch on github:
https://github.com/dturner-tw/git.git
dturner/pluggable-backends-preamble
--
Renaming to an existing file doesn't work on Windows network shares if the
target file is open.
munmap() the old config file before commit_lock_file.
Signed-off-by: Karsten Blees bl...@dcon.de
---
See https://github.com/git-for-windows/git/issues/226
Strangely, renaming to an open file works
Matthieu Moy matthieu@imag.fr writes:
Hi,
Here are a few fixes to squash into the commits of the series. Other
than that, the series looks good to me.
Junio: do you prefer a reroll or do you want to apply locally?
Matthieu Moy (3):
fixup! git rebase -i: add static check for
Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr
writes:
Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr writes:
Shouldn't all the checking also be called in a 'rebase --continue',
considering that it can be called after a 'rebase --edit-todo' ?
(Right now it is only called
On Tue, Jun 30, 2015 at 04:34:13PM +0200, Karsten Blees wrote:
Renaming to an existing file doesn't work on Windows network shares if the
target file is open.
munmap() the old config file before commit_lock_file.
Signed-off-by: Karsten Blees bl...@dcon.de
Thanks for fixing this.
Eric Sunshine sunsh...@sunshineco.com writes:
+ for (i = start; i argc; i++) {
+ if (safe_create_reflog(argv[i], err, 1)) {
+ error(could not create reflog %s: %s, argv[i],
+ err.buf);
+ status = 1;
On 2015-06-30 16.12, Thomas Vieten wrote:
We face a very inconvenient problem with end-of-line diffs which are not
real.
We know the end-of-line problem very well as we thought.
But now we found a new phenomenon and nobody mentioning it.
Consider the following repository structure:
Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes:
Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr writes:
Shouldn't all the checking also be called in a 'rebase --continue',
considering that it can be called after a 'rebase --edit-todo' ?
(Right now it is only called
On Tue, Jun 30, 2015 at 9:28 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
I also have a feeling that compared to an implementation based on
paint_down_to_common(), including is_descendant_of(), this may be
less precise (e.g. it would be confused with
We face a very inconvenient problem with end-of-line diffs which are not
real.
We know the end-of-line problem very well as we thought.
But now we found a new phenomenon and nobody mentioning it.
Consider the following repository structure:
---||-branch1
Jeff King p...@peff.net writes:
strbuf_addf(f, %s , fmt);
Basically I was trying to avoid making any assumptions about exactly how
strftime works. But presumably stick a space in the format is a
universally reasonable thing to do. It's a hack, but it's contained to
the function.
Why
On Mon, 29 Jun 2015 18:19:09 +0200
Johannes Schindelin johannes.schinde...@gmx.de wrote:
I've finally took time to switch from my old msys1 release to this
RC4, and immediately got hit by the fact Git is now speaking to me
in Russian, which is not what I want (previously this behaviour was
On Tue, Jun 30, 2015 at 1:58 PM, Jeff King p...@peff.net wrote:
On Tue, Jun 30, 2015 at 12:58:33PM -0400, Eric Sunshine wrote:
Beyond the extra allocation, I was also concerned about the
sledgehammer approach of %s to append a single character when there
are much less expensive ways to do so.
On Tue, Jun 30, 2015 at 12:07 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
+ for (i = start; i argc; i++) {
+ if (safe_create_reflog(argv[i], err, 1)) {
+ error(could not create reflog %s: %s, argv[i],
+
On Tue, Jun 30, 2015 at 09:22:18AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
strbuf_addf(f, %s , fmt);
Basically I was trying to avoid making any assumptions about exactly how
strftime works. But presumably stick a space in the format is a
universally reasonable
On Tue, Jun 30, 2015 at 6:20 AM, Jeff King p...@peff.net wrote:
On Mon, Jun 29, 2015 at 06:22:47PM -0400, Eric Sunshine wrote:
void strbuf_addftime(struct strbuf *sb, const char *fmt, const struct tm *tm)
{
size_t len;
struct strbuf f = STRBUF_INIT;
/*
* This is a
Jeff King p...@peff.net writes:
This does get called a lot (e.g., once per commit). One extra allocation
would probably not kill us there, but I think we could fairly trivially
put this on the unlikely path:
size_t hint = 128;
size_t len;
/* optimize out obvious 0-length case */
On Tue, Jun 30, 2015 at 9:26 AM, Jeff King p...@peff.net wrote:
On Mon, Jun 29, 2015 at 06:22:47PM -0400, Eric Sunshine wrote:
Clients of strbuf rightly expect the buffer to grow as needed in
order to complete the requested operation. It is, therefore, both
weird and expectation-breaking for
On Tue, Jun 30, 2015 at 12:58:33PM -0400, Eric Sunshine wrote:
Basically I was trying to avoid making any assumptions about exactly how
strftime works. But presumably stick a space in the format is a
universally reasonable thing to do. It's a hack, but it's contained to
the function.
I
Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
The place where an error can be introduced is (assuming that what
rebase -i writes out itself is perfect ;-) where we allow the user
to edit, so instead of checking before
Eric Sunshine sunsh...@sunshineco.com writes:
* t2025-checkout-to.sh became t2025-worktree-new.sh. I'm not sure if the
test number still makes sense or if it should be changed, however, it
resides alongside its t2026-prune-linked-checkouts.sh counterpart.
You'd need to adjust t7410 as
Matthieu Moy matthieu@grenoble-inp.fr writes:
Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes:
Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr writes:
Shouldn't all the checking also be called in a 'rebase --continue',
considering that it can be called after
Matthieu Moy matthieu@grenoble-inp.fr writes:
There's an alternative:
$ git rebase --edit-todo
# Make mistakes, save and quit
Your todo-list has the following issues:
- ...
Do you want to edit again (no aborts the rebase) [Y/n]?
There's a precedent with the 'e' command of git add -p.
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
When -- is lacking from the command line and a command can take both
revs and paths, the idea is if an argument can be seen as both an
extended SHA-1 and a path, then -- is required or git refuses to
continue. It's currently implemented as:
...
Matthieu Moy matthieu@imag.fr writes:
diff --git a/t/t9000-addresses.sh b/t/t9000-addresses.sh
new file mode 100755
index 000..7223d03
--- /dev/null
+++ b/t/t9000-addresses.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Copyright (c) 2015
That does not look like a valid copyright notice.
Duy Nguyen pclo...@gmail.com writes:
I think this is like git checkout -b vs git branch. We pack so
many things in 'checkout' that it's a source of both convenience and
confusion. I never use git branch to create a new branch and if I
had a way to tell checkout to move away and delete
On Tue, Jun 30, 2015 at 1:05 PM, Junio C Hamano gits...@pobox.com wrote:
Answering myself to my earlier question, the reason is because I was
worried what happens when given fmt is a malformed strftime format
specifier. Perhaps it ends with a lone % and % may format to
something unexpected,
Eric Sunshine sunsh...@sunshineco.com writes:
Alternatives would be strbuf_reset() or declaring and releasing the
strbuf within the for-loop scope.
Because _reset() just rewinds the .len pointer without deallocating,
you would need an extra _release() before it goes out of scope. If
it is
Am 30.06.2015 um 19:15 schrieb Konstantin Khomoutov:
On Mon, 29 Jun 2015 18:19:09 +0200
Johannes Schindelin johannes.schinde...@gmx.de wrote:
I've finally took time to switch from my old msys1 release to this
RC4, and immediately got hit by the fact Git is now speaking to me
in Russian,
On Tue, Jun 30, 2015 at 10:05:33AM -0700, Junio C Hamano wrote:
I'd guess most cases will fit in 128 bytes and never even hit this code
path. You could also get fancier and start the buffer smaller, but only
do the fmt hack when we cross a threshold.
I'd assume that the hint thing will
On Tue, Jun 30, 2015 at 02:13:53PM -0400, Eric Sunshine wrote:
Sorry, I meant that the interpolation expense of %s . A cheaper (but
more verbose) alternative might be:
size_t n = strlen(fmt);
const char *f = xmalloc(n + 2);
strcpy(f, fmt);
f[n] = ' ';
f[n + 1] = '\0';
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@imag.fr writes:
diff --git a/t/t9000-addresses.sh b/t/t9000-addresses.sh
new file mode 100755
index 000..7223d03
--- /dev/null
+++ b/t/t9000-addresses.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Copyright (c) 2015
That
Hi,
Here are a few fixes to squash into the commits of the series. Other
than that, the series looks good to me.
Junio: do you prefer a reroll or do you want to apply locally?
Matthieu Moy (3):
fixup! git rebase -i: add static check for commands and SHA-1
fixup! git rebase -i: warn about
On Tue, Jun 30, 2015 at 11:56 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
The command git checkout --to path is something of an anachronism,
encompassing functionality somewhere between checkout and clone.
The introduction of the git-worktree command, however, provides a proper
and
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
git-rebase--interactive.sh| 2 +-
t/t3404-rebase-interactive.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 0117791..8090d80 100644
---
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
git-rebase--interactive.sh | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ec4a068..9041d15 100644
--- a/git-rebase--interactive.sh
+++
Signed-off-by: Matthieu Moy matthieu@imag.fr
---
git-rebase--interactive.sh | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9041d15..0117791 100644
--- a/git-rebase--interactive.sh
+++
On Tue, Jun 30, 2015 at 12:56 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
The command git checkout --to path is something of an anachronism,
encompassing functionality somewhere between checkout and clone.
The introduction of the git-worktree command, however, provides a proper
and
Jeff King wrote:
On Fri, Jun 26, 2015 at 12:40:19PM -0700, Stefan Beller wrote:
This code seems to be underdocumented.
I am not a expert in this area of the code, so I hoped Peff
would document it if he feels like so.
I kind of thought that the explanation in b6e8a3b covered this code.
On Wed, Jul 1, 2015 at 1:10 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
When -- is lacking from the command line and a command can take both
revs and paths, the idea is if an argument can be seen as both an
extended SHA-1 and a path, then -- is
Eric Sunshine sunsh...@sunshineco.com writes:
On Tue, Jun 30, 2015 at 12:56 AM, Eric Sunshine sunsh...@sunshineco.com
wrote
Speaking of git worktree new --force, should we revisit git
checkout --ignore-other-worktrees before it gets set in stone? In
particular, I'm wondering if it makes
On Tue, 2015-06-30 at 12:48 -0700, Junio C Hamano wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
Alternatives would be strbuf_reset() or declaring and releasing the
strbuf within the for-loop scope.
Because _reset() just rewinds the .len pointer without deallocating,
you would
Matthieu Moy matthieu@imag.fr writes:
This series makes git status provide an output like
interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
pick $COMMIT2 two_commit
exec exit 15
Next commands to do (2 remaining commands):
pick
David Turner dtur...@twopensource.com writes:
On Tue, 2015-06-30 at 12:48 -0700, Junio C Hamano wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
Alternatives would be strbuf_reset() or declaring and releasing the
strbuf within the for-loop scope.
Because _reset() just rewinds the
On Tue, Jun 30, 2015 at 5:23 AM, Duy Nguyen pclo...@gmail.com wrote:
On Tue, Jun 30, 2015 at 11:56 AM, Eric Sunshine sunsh...@sunshineco.com
wrote:
The command git checkout --to path is something of an anachronism,
encompassing functionality somewhere between checkout and clone.
The
On 06/30/2015 06:11 PM, Eric Sunshine wrote:
On Tue, Jun 30, 2015 at 12:56 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
The command git checkout --to path is something of an anachronism,
encompassing functionality somewhere between checkout and clone.
The introduction of the git-worktree
79 matches
Mail list logo
