Please do not forget to reply to all.
On Mon, May 27, 2013 at 1:34 AM, 乙酸鋰 ch3co...@gmail.com wrote:
git-gui/po/fr.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git b/git-gui/po/fr.po a/git-gui/po/fr.po
index 0aff186..40441db 100644
--- b/git-gui/po/fr.po
+++
On Sun, May 26, 2013 at 10:35 PM, Johannes Sixt j...@kdbg.org wrote:
Am 26.05.2013 19:58, schrieb Antoine Pelisse:
The goal of the patch is to introduce the GNU diff
-B/--ignore-blank-lines as closely as possible. The short option is not
available because it's already used for break-rewrites
So now we have two fixes for the same issue, don't we ?
You probably missed $gmane/225534.
On Mon, May 27, 2013 at 4:20 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Commit a24a41e (git-commit: only append a newline to -m mesg if
necessary, 2013-02-18) introduced a regression: when
Hey Felipe,
I know that has been integrated a while ago.
On Thu, Apr 11, 2013 at 2:23 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
When cloning or pushing fails, we don't want to show a stack-trace.
diff --git a/contrib/remote-helpers/git-remote-hg
Hi,
Patch should be inlined, please have a look at
`Documentation/SubmittingPatches`.
Also, how is copy (an english word) better than copie (the literal
french translation) ?
On Sun, May 26, 2013 at 5:27 PM, 乙酸鋰 ch3co...@gmail.com wrote:
see patch
--
To unsubscribe from this list: send the line
On Sat, May 25, 2013 at 1:50 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Antoine Pelisse wrote:
Is it not possible for color to be used uninitialized here ?
My compiler didn't complain; what am I missing? Doesn't the
declaration char color[COLOR_MAXLEN]; initialize an empty string
On Fri, May 24, 2013 at 6:18 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Damn; so it's impossible to have a custom-sorted completion list in
bash. Any idea about zsh? I know that there are completion groups,
but I'd really like custom sorting.
I think sorting is required for faster
On Fri, May 24, 2013 at 4:19 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
@@ -928,12 +936,22 @@ static void emit(const char *cp, const char *ep)
static void show_ref(struct refinfo *info, const char *format, int
quote_style)
{
const char *cp, *sp, *ep;
+ char
On Thu, May 23, 2013 at 10:45 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Alessandro Di Marco wrote:
this is a hack I made a couple of years ago in order to store my current
location in git commits (I travel a lot and being able to associate a
place with the commit date helps me to
On Thu, May 16, 2013 at 11:36 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Actually trying that command:
% git fetch origin 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
fatal: Refusing to fetch into current branch
refs/heads/fc/fast-export/cleanup of non-bare repository
On Wed, May 15, 2013 at 8:23 AM, eric liou accw...@gmail.com wrote:
The output of git-diff is different from my expectation.
It may skip some lines of context.
git-diff is using a default of 3 lines of context above and below the changes.
In your example, there is only two lines of context
On Wed, May 15, 2013 at 7:32 AM, Nazri Ramliy ayieh...@gmail.com wrote:
Hi,
From git help grep:
--no-index
Search files in the current directory that is not managed by Git.
--untracked
In addition to searching in the tracked files in the working tree,
On Wed, May 15, 2013 at 8:52 AM, eric liou accw...@gmail.com wrote:
Thank you for the quick reply.
But this line is not correct: @@ -4,5 +4,6 @@ int a = 1;
Oh OK, I see.
Git tries to name the function where the changes take place. This is
purely informative.
In your example, you don't have any
On Wed, Apr 24, 2013 at 7:48 AM, Junio C Hamano gits...@pobox.com wrote:
there
could be textual conflicts and you could choose to leave them in, or
you could choose to have rerere resolve it. As long as you do the
same when replaying this prepackaged evil merge, this choice does
not matter,
On Tue, Apr 23, 2013 at 8:34 AM, Johan Herland jo...@herland.net wrote:
On Wed, Apr 10, 2013 at 10:35 PM, Antoine Pelisse apeli...@gmail.com wrote:
Data-structure
==
We could use a note ref to store the pre-merge information. Each commit
would be annotated with a blob containing
On Tue, Apr 23, 2013 at 5:29 PM, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
And I
have the feeling that merge-fix/B or merge-fix/A doesn't hold
enough information to do that accurately.
Oh, you do not have to resort to feeling; these names do _not_
this to be discussed before actually starting).
On Wed, Apr 10, 2013 at 10:35 PM, Antoine Pelisse apeli...@gmail.com wrote:
The goal is to propose a structure for storing and pre-merging pairs of
commits.
Data-structure
==
We could use a note ref to store the pre-merge information
On Tue, Apr 16, 2013 at 9:45 PM, Junio C Hamano gits...@pobox.com wrote:
It still is curious how a malformed line was created in the first
place. I wouldn't worry if a private tool used hash-object to
create such a commit, but if it is something that is commonly used
(e.g. git commit), others
.
We now can use strbuf_humanize() for both downloaded size and download
speed calculation. One of the drawbacks is that speed will now look like
this when download is stalled: 0 bytes/s instead of 0 KiB/s.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
Documentation/technical/api-strbuf.txt
Use the new humanize() function to print loose objects size, pack size,
and garbage size in verbose mode, or loose objects size in regular mode.
This patch doesn't change the way anything is displayed when the option
is not used.
Also update the documentation.
Signed-off-by: Antoine Pelisse
On Wed, Apr 10, 2013 at 9:43 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Antoine Pelisse wrote:
One of the drawbacks is that speed will now look like
this when download is stalled: 0 bytes/s instead of 0 KiB/s.
At first glance that is neither obviously a benefit nor
On Wed, Apr 10, 2013 at 9:57 PM, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
Currently, humanization of downloaded size is done in the same
function as text formatting in 'process.c'. This is an issue if anyone
else wants to use this.
Separate text
The goal is to propose a structure for storing and pre-merging pairs of commits.
Data-structure
==
We could use a note ref to store the pre-merge information. Each commit
would be annotated with a blob containing the list of pre-merges (one
sha1 per line with sha1 pointing to a merge
() for both downloaded size and download speed
calculation. One of the drawbacks is that speed will no look like this
when download is stalled: 0 bytes/s instead of 0 KiB/s.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
progress.c | 60
Use the new humanize() function to print loose objects size, pack size,
and garbage size in verbose mode, or loose objects size in regular mode.
This patch doesn't change the way anything is displayed when the option
is not used.
Also update the documentation.
Signed-off-by: Antoine Pelisse
hide the return code of hg command. As a matter of fact, if log
fails because it doesn't know about --graph, it doesn't report any
failure and let's you think everything worked.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
Hey Felipe,
I'm not so confident that --graph is useless to the test
On Sat, Apr 6, 2013 at 6:06 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Sat, Apr 6, 2013 at 10:00 AM, Antoine Pelisse apeli...@gmail.com wrote:
I'm not so confident that --graph is useless to the test. If it's really
necessary, it would be nice either to activate it in setup
the return code of hg command. As a matter of fact, if log
fails because it doesn't know about --graph, it doesn't report any
failure and let's you think everything worked.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
- Updated the title to use remote-hg instead of remote-helpers
- Activate
.
Unfortunately, the mark file should not be rewritten without lost marks
if no new objects has been exported, as we could lose track of the last
last_numid.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
Documentation/git-fast-export.txt |2 ++
builtin/fast-export.c | 11
On Thu, Jan 3, 2013 at 10:59 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 01/03/2013 08:03 AM, Junio C Hamano wrote:
I'd like a datastore that maps a pair of commit object names to
another object name, such that:
* When looking at two commits A and B, efficiently query all data
Should we use that opportunity to implement an option like -h (for
humanize) similar to what ls(1), df(1), du(1) does ? Of course -h is
already used for help, so we could use -H or any other sensible
choice.
It can become tough to read the size when it gets big enough.
On Thu, Apr 4, 2013 at 6:27
* internally, the marks are using the hg sha1s instead of the hg rev ids.
The latter are not necessarily invariant, and using the sha1s makes it much
easier to recover from semi-broken states.
I doubt this makes any difference (except for more wasted space).
I think this is definitely
On Tue, Apr 2, 2013 at 6:53 PM, Torsten Bögershausen tbo...@web.de wrote:
---
contrib/remote-helpers/Makefile| 3 +-
contrib/remote-helpers/t5810-test-bzr.sh | 143 +++
contrib/remote-helpers/t5820-test-hg-bidi.sh | 243 +++
Hey Felipe,
On Mon, Apr 1, 2013 at 11:14 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
+export TEST_LINT :=
I think test-lint-executable still makes sense here.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
new file mode 100755
index 000..286390d
--- /dev/null
+++ b/t/t4211-line-log.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+test_description='test log -L'
+. ./test-lib.sh
+
+test_expect_success 'setup (import history)' '
+ git
You should probably add some failing tests
I guess it should be failure tests, not failing tests.
--
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
lines is now doubly-linked because we reverse-read it when
reading the direction matrix.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
Hey,
This version includes some tests and is based on
ap/combine-diff-ignore-whitespace.
As you can see the last test is broken because the solution
lines is now doubly-linked because we reverse-read it when
reading the direction matrix.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
Hi,
This is a very first draft for improving the way we coalesce lost
lines. It has only been tested with the two scenarios below.
What is left to do:
- Test
I'm also having a hard time trying it with more than two parents. How I
am supposed to have more than two parents while octopus merge refuses if
there are conflicts ?
OK, creating the merge commit myself solves the issue:
git init
test
git add test
git commit -m initial
seq 100 test
git
17, 2013 at 9:10 PM, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
This replaces the greedy implementation to coalesce lost lines by using
dynamic programming to find the Longest Common Subsequence.
The O(n²) time complexity is obviously bigger than previous
On Thu, Mar 14, 2013 at 4:31 PM, Junio C Hamano gits...@pobox.com wrote:
Johannes Sixt j.s...@viscovery.net writes:
This form of 'echo' is not sufficiently portable. How about:
tr -d Q -\EOF test
always coalesce
eol space coalesce Q
...
EOF
Much better.
diff behaves as normal
diff does with spaces.
Also coalesce lines that are removed from both (or more) parents.
It also means that a conflict-less merge done using a ignore-* strategy
option will not show any conflict if shown in combined-diff using the
same option.
Signed-off-by: Antoine Pelisse
diff behaves as normal
diff does with spaces.
Also coalesce lines that are removed from both (or more) parents.
It also means that a conflict-less merge done using a ignore-* strategy
option will not show any conflict if shown in combined-diff using the
same option.
Signed-off-by: Antoine Pelisse
--- a/dir.c
+++ b/dir.c
@@ -636,12 +636,14 @@ int match_basename(const char *basename, int
basenamelen,
int flags)
{
if (prefix == patternlen) {
- if (!strcmp_icase(pattern, basename))
+ if (patternlen == basenamelen
+
On Sun, Mar 10, 2013 at 11:38 AM, Duy Nguyen pclo...@gmail.com wrote:
glibc's C strncmp version does 4-byte comparison at a time when n =4,
then fall back to 1-byte for the rest.
Looking at this
(http://fossies.org/dox/glibc-2.17/strncmp_8c_source.html), it's not
exactly true.
It would rather
On Sun, Mar 10, 2013 at 12:43 PM, Antoine Pelisse apeli...@gmail.com wrote:
On Sun, Mar 10, 2013 at 11:38 AM, Duy Nguyen pclo...@gmail.com wrote:
glibc's C strncmp version does 4-byte comparison at a time when n =4,
then fall back to 1-byte for the rest.
Looking at this
(http://fossies.org
By the way, if we know the length of the string, we could use memcmp.
This one is allowed to compare 4-bytes at a time (he doesn't care
about end of string). This is true because the value of the length
parameter is no longer at most.
We still need to worry about access violation after NUL
diff --git a/dir.c b/dir.c
index 57394e4..669cf80 100644
--- a/dir.c
+++ b/dir.c
@@ -663,7 +663,7 @@ int match_pathname(const char *pathname, int pathlen,
*/
if (pathlen baselen + 1 ||
(baselen pathname[baselen] != '/') ||
- strncmp_icase(pathname,
Currently the documentation of GIT_PERF_REPEAT_COUNT says the default is
five while perf-lib.sh uses a value of three as a default.
Update the documentation so that it is consistent with the code.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
t/perf/README |2 +-
1 file changed, 1
git checkout --conflict=diff3 file
That's somehow unrelated, but shouldn't we have a conflict option to
git-merge as we have for git-checkout ?
With something like this (pasted into gmail):
diff --git a/builtin/merge.c b/builtin/merge.c
index 7c8922c..edad742 100644
---
however the difference isn't that easy to spot any more. I expected
diff --cc file
index a07e697,5080129..000
--- a/file
+++ b/file
@@@ -12,7 -12,7 +12,12 @@@
12
13
14
++ ours
+15
Add basic use cases and corner cases tests for
git diff -M --summary/stat.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
list of fixes:
- Test using diff instead of show
(that is more consistent with commit message).
- add extra spaces around paths
- Use better commit messages
That should be reviewed carefully as I'm not exactly sure that does make
sense with the way combined-diff works.
Still it seems natural to me to be able to remove the space in combined
diff as we do with normal diff. Especially as I unfortunately have to
deal with many space + feature merges
On Mon, Mar 4, 2013 at 7:36 PM, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
It feels incorrect to me to coalsesce - 5 and - 5 as it might
look incorrect to the user. But still the idea is appealing.
The users already need to see that when reading
Add basic use cases and corner cases tests for
git diff -M --summary/stat.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
t/t4056-rename-pretty.sh | 54 ++
1 file changed, 54 insertions(+)
create mode 100755 t/t4056-rename-pretty.sh
diff
diff behaves as normal
diff does with spaces.
It also means that a conflict-less merge done using a ignore-* strategy
option will not show any conflict if shown in combined-diff using the
same option.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
That should be reviewed carefully as I'm
.
Also add some test file to place corner-cases we could met (and this one)
with rename pretty print.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
diff.c | 11 +-
t/t4056-rename-pretty.sh | 54 ++
2 files changed, 64
On Thu, Feb 28, 2013 at 11:14 PM, Thomas Rast tr...@student.ethz.ch wrote:
Antoine Pelisse apeli...@gmail.com writes:
diff --git a/diff.c b/diff.c
index 9038f19..e1d82c9 100644
--- a/diff.c
+++ b/diff.c
@@ -1177,7 +1177,16 @@ static char *pprint_rename(const char *a, const char
*b
The logic described in d020e27 (diff: Fix rename pretty-print when
suffix and prefix overlap, 2013-02-23) is wrong: The proof in the
comment is valid only if both strings are the same length. *One* of
old/new can reach a-1 (b-1, resp.) if 'a' is a suffix of 'b' (or vice
versa).
Indeed,
Stage removal of deleted files.
On Mon, Feb 25, 2013 at 7:54 AM, Junio C Hamano gits...@pobox.com wrote:
Eric James Michael Ritz lobbyjo...@gmail.com writes:
On 01/19/2013 04:49 PM, Antoine Pelisse wrote:
I think `git add -u` would be closer. It would stage removal of
files, but would
On Mon, Feb 25, 2013 at 8:07 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
Antoine Pelisse apeli...@gmail.com writes:
I must say that I'm not very interested in the feature. In my opinion,
there are already many different ways to stage changes.
Assuming that the feature would be needed
On Sun, Feb 24, 2013 at 10:15 AM, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
When considering a rename for two files that have a suffix and a prefix
that can overlap, a confusing line is shown. As an example, renaming
a/b/b/c to a/b/c shows a/b/{ = }/b
In this example, the common prefix would be a/b/ and the common
suffix that does not overlap with the prefix part would be /c, so
I am imagining that a/b/{ = b}/c would be the desired output?
Yes, at least that's what I expected.
Surely it would be a/b/{b = }/c, that is, we have reduced
/ is actually counted both in
prefix and suffix. Then when calculating the size of the non-common part,
we end-up with a negative value which is reset to 0, thus the { = }.
Do not allow the common suffix to overlap the common prefix and stop
when reaching a / that would be in both.
Signed-off-by: Antoine
update-index -h is invoked.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
builtin/update-index.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index ada1dff..3071ee6 100644
--- a/builtin/update-index.c
+++ b/builtin/update
diff --git a/builtin/update-index.c b/builtin/update-index.c
index ada1dff..3071ee6 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -796,7 +796,7 @@ int cmd_update_index(int argc, const char **argv, const
char *prefix)
};
if (argc == 2
Thanks John,
I couldn't find any time to send that sum-up series.
On Sun, Feb 3, 2013 at 3:37 PM, John Keeping j...@keeping.me.uk wrote:
The first two patches here were sent to the list before but seem to have
got lost in the noise [1][2]. The final one is new but was prompted by
discussion
On Sun, Feb 3, 2013 at 3:55 PM, Alexandre Courbot gnu...@gmail.com wrote:
It certainly happened to a lot of people already: you carefully prepare
your set of patches, export them using format-patch --cover-letter,
write your cover letter, and send the set like this:
$ git send-email
In clean.c we have a string_list created on the stack with
STRING_LIST_INIT_NODUP (there are probably others, I stopped at the
first occurrence).
But, STRING_LIST_INIT_NODUP doesn't init the list-cmp pointer
which can thus be random.
I don't have much time to provide a patch right now (have to go
I think `git add -u` would be closer. It would stage removal of files,
but would not stage untracked files.
It would stage other type of changes though.
On Sat, Jan 19, 2013 at 10:47 PM, Tomas Carnecky
tomas.carne...@gmail.com wrote:
On Sat, 19 Jan 2013 16:35:18 -0500, Eric James Michael Ritz
BTW, I think it has been addressed [1] by clang already and that would
explain why you don't have the warning when using clang trunk version.
[1]: http://llvm-reviews.chandlerc.com/D113
Antoine,
On Thu, Jan 17, 2013 at 5:44 PM, Linus Torvalds
torva...@linux-foundation.org wrote:
On Thu, Jan
FWIW, I also happen to have the warning:
advice.c:69:2: warning: expression result unused [-Wunused-value]
error('%s' is not possible because you have unmerged files., me);
^~
./git-compat-util.h:314:55: note:
Is it worth applying this at all, then? Or should we apply it but limit
it with a clang version macro (they mention r163034, but I do not know
if it is in a released version yet, nor what macros are available to
inspect the version)?
Please also note that building with clang is not
clang incorrectly reports a constant conversion warning (implicit
truncation to bit field) when using the flag = ~FLAG form, because
~FLAG needs to be truncated.
Convert this form to flag = flag ~FLAG fixes the issue as
the right operand now fits into the bit field.
Signed-off-by: Antoine
Create a GREP_HEADER_FIELD_MIN so we can check that the field value is
sane and silent the clang warning.
Clang warning happens because the enum is unsigned (this is
implementation-defined, and there is no negative fields) and the check
is then tautological.
Signed-off-by: Antoine Pelisse apeli
On Thu, Jan 17, 2013 at 12:08 AM, John Keeping j...@keeping.me.uk wrote:
On Wed, Jan 16, 2013 at 11:47:22PM +0100, Antoine Pelisse wrote:
clang incorrectly reports a constant conversion warning (implicit
truncation to bit field) when using the flag = ~FLAG form, because
~FLAG needs
With these two patches and the patch from Max Horne,
I'm deeply sorry for this typo Max
--
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
So I guess we should drop this patch, it's probably not worth it,
especially if it's been fixed already by clang.
On Thu, Jan 17, 2013 at 12:09 AM, Antoine Pelisse apeli...@gmail.com wrote:
On Thu, Jan 17, 2013 at 12:08 AM, John Keeping j...@keeping.me.uk wrote:
On Wed, Jan 16, 2013 at 11:47
This puts all of perl into the C locale, which would mean error messages
from perl would be in English rather than the user's language. It
probably isn't a big deal, because that snippet of perl is short and not
likely to produce problems, but I wonder how hard it would be to set the
locale
On Fri, Jan 11, 2013 at 10:23 PM, Jeff King p...@peff.net wrote:
On Fri, Jan 11, 2013 at 08:13:57PM +, Matt Seitz (matseitz) wrote:
How about What Message-ID to use as In-Reply-To for the first email?
or Provide the Message-ID to use as In-Reply-To for the first
email:.
seem
On Fri, Jan 11, 2013 at 11:18 PM, Junio C Hamano gits...@pobox.com wrote:
The exchange, when you do not have a configuration, goes like this:
$ git send-email 0001-filename-of-the-patch.patch
0001-filename-of-the-patch.patch
Who should the emails be sent to (if any)? junio
+static struct string_list_item *lookup_prefix(struct string_list *map,
+ const char *string, size_t len)
+{
+ int i = string_list_find_insert_index(map, string, 1);
+ if (i 0) {
+ /* exact match */
+ i =
earlier in the callchain
in treat_file(), so this fix will not make them mistakenly
identified as ignored.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
Reviewed-by: Jeff King p...@peff.net
Signed-off-by: Junio C Hamano gits...@pobox.com
I like it a lot, thanks to both
would have been a no-op anyway.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
dir.c | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/dir.c b/dir.c
index 9b80348..f836590 100644
--- a/dir.c
+++ b/dir.c
@@ -672,7 +672,8 @@ static struct dir_entry *dir_entry_new(const
-by: Antoine Pelisse apeli...@gmail.com
---
Torsten, Jeff,
Can you please test this patch and tell me if this is better ? (t7061 is now
successful with core.ignorecase=true)
This patch applies on top of ap/status-ignored-in-ignored-directory (but
should also apply cleanly on top of next for testing purpose
-up the mapping (useful for replacing or not
before grep).
Thanks,
Antoine Pelisse (10):
list_lookup: create case and length search
Use split_ident_line to parse author and committer
mailmap: remove email copy and length limitation
mailmap: simplify map_user() interface
mailmap: add
a substring of a bigger
string to search it in the string_list
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
string-list.c | 30 --
string-list.h | 2 ++
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/string-list.c b/string-list.c
index 397e6cf..f06e110
Currently blame.c::get_acline, pretty.c::pp_user_info() and
shortlog.c::insert_one_record are parsing author name, email, time and
tz themselves.
Use ident.c::split_ident_line for better code reuse.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
builtin/blame.c| 59
the mailmap string_list structure filled with mailmap
information is passed along from rev_info to pretty_print_context
to provide mailmap information to pretty print each commits
with the correct username and email.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
commit.h | 1 +
log
The new option '--use-mailmap' can be used to make
sure that mailmap file is used to convert name
when running log commands.
The test is simple and checks that the Author line
is correctly replaced when running log.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
t/t4203-mailmap.sh | 14
is updated to a new location. Lengths are also updated if
necessary.
The caller of map_user() can then copy the new email and name if
necessary.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
builtin/blame.c| 156 +++--
builtin/shortlog.c
Teach log.mailmap configuration variable to turn --use-mailmap
option on to git log, git show and git whatchanged.
The --no-use-mailmap option from the command line can countermand
the setting.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
Documentation/config.txt | 4
builtin
In map_user(), the new string_list_lookup_extended() allows us to remove
the copy of email buffer to lower it.
This also removes the limitation on the length of the copy buffer and
simplifies the function.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
mailmap.c | 22
it only works if the --use-mailmap option is used.
The new name and email are copied only when necessary.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
revision.c | 54 ++
t/t4203-mailmap.sh | 18 ++
2 files changed
Add the --use-mailmap option to log commands. It allows
to display names from mailmap file when displaying logs,
whatever the format used.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
Documentation/git-log.txt | 5 +
builtin/log.c | 9 -
2 files changed, 13
if prepare-commit-msg returns with a non-zero status
when committing a successful merge.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
builtin/merge.c| 5 +++--
t/t7505-prepare-commit-msg-hook.sh | 13 +
2 files changed, 16 insertions(+), 2 deletions(-)
diff
prepare-commit-msg hook is run when committing to prepare the log
message. If the exit-status is non-zero, the commit should be aborted.
I was scratching my head why you CC'ed Jay, until I dug up 65969d4
(merge: honor prepare-commit-msg hook, 2011-02-14).
I did as suggested in
Doesn't Python come with a standard subprocess module that lets you
spawn external programs safely, similar to the way Perl's list form
open(), e.g. open($fh, -|, 'git', @args), works?
You mean something like this:
p1 = subprocess.Popen([backend.command()], stdout=subprocess.PIPE)
* ap/status-ignored-in-ignored-directory (2012-12-26) 1 commit
- wt-status: Show ignored files in untracked dirs
A topic still in flux; will be redone.
I've already redone this part sending two patches (one with the fix,
and one with some tests for each individual use-case) that you
files, and
ignored tracked directories with untracked files.
- --ignored --untracked-files=all shows all ignored files, either
because it's in an ignored directory (tracked or untracked), or
because the file is explicitly ignored.
Signed-off-by: Antoine Pelisse apeli...@gmail.com
---
dir.c
101 - 200 of 243 matches
Mail list logo
