On Wed, May 27, 2015 at 9:33 AM, Paul Tan pyoka...@gmail.com wrote:
git-am.sh supports mbox, stgit and mercurial patches. Re-implement
support for splitting out mbox/maildirs using git-mailsplit, while also
implementing the framework required to support other patch formats in
the future.
On Thu, May 28, 2015 at 10:11:55AM -0700, Junio C Hamano wrote:
if (contents == MAP_FAILED) {
+ if (errno == ENODEV S_ISDIR(st.st_mode))
+ errno = EISDIR;
error(unable to mmap '%s': %s,
On 05/29/2015 02:11 AM, Matthieu Moy wrote:
The point of separating them is that the rename implies a relatively
long patch (you have 17 occurences of 'refinfo' in the deletion part of
your patch), but it is straightforward to review (apply, run git diff
--color-words and press space a few
Karthik Nayak karthik@gmail.com writes:
This is a preperatory patch for restructuring 'for-each-ref' and
evntually moving most of it to 'ref-filter' to provide the
s/evntually/eventually/
The patch looks much nicer now.
- int cnt;
[...]
+ REALLOC_ARRAY(cb-grab_array,
On 05/29/2015 01:43 AM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
This is a preperatory patch for restructuring 'for-each-ref' and
evntually moving most of it to 'ref-filter' to provide the
s/evntually/eventually/
Noted.
The patch looks much nicer now.
-
Matthieu Moy matthieu@grenoble-inp.fr writes:
Not very important, but two spaces after a period is what one is
supposed to do in English. Not everybody follow the rule, but it seems
backward to change the code to break it.
I am old fashioned enough to personally agree, but this practice
Signed-off-by: Trevor Saunders tbsau...@tbsaunde.org
---
The test change only kind of tests the change in behavior and doesn't seem all
that useful. However I'm not sure if its preferable to not even try and test
that something isn't output.
bisect.c| 7 ++-
On 05/29/2015 02:05 AM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
Move most of the code from 'for-each-ref' to 'ref-filter' to make
it publically available to other commands, this is to unify the code
s/publically/publicly/
--- /dev/null
+++ b/ref-filter.h
Moving
Junio C Hamano gits...@pobox.com writes:
Sent off-list to reduce noise level; this is an issue that attracts
a lot of useless comments.
Heh, somehow I screwed up and sent on-list X-.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Karthik Nayak karthik@gmail.com writes:
Rename 'refinfo' to 'ref_array_item' and intoduce 'ref_filter_cbdata'
The fact that you need to use and to describe your changes is a hint
that you can split better.
The patch looks much better, but I think you still need to split more to
make it
On 05/29/2015 01:56 AM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
Rename 'refinfo' to 'ref_array_item' and intoduce 'ref_filter_cbdata'
The fact that you need to use and to describe your changes is a hint
that you can split better.
But the patch alone wouldn't make
Jeff King p...@peff.net writes:
We also know S_ISDIR(st.st_mode) _before_ we actually mmap. So I was
tempted to simply check it beforehand, under the assumption that the
mmap cannot possibly work if we have a directory. But by doing it in the
error code path, then we _know_ we are not
li...@haller-berlin.de (Stefan Haller) writes:
When a rebase stops because of a conflict, and I edit the file to
resolve the conflict and say git rebase --continue, then the
pre-commit hook doesn't run at that point,...
From glancing through the githooks manpage, I couldn't see any other
On Thu, May 28, 2015 at 02:29:33PM +0200, SZEDER Gábor wrote:
Fixed misspelled option names in docs and in commit message, incorporated
Peff's suggestions, and renamed 'show_only_keys' to 'omit_values' in 1/2.
Only minor tweaking in 2/2's commit message.
This version looks good to me
Karthik Nayak karthik@gmail.com writes:
Move most of the code from 'for-each-ref' to 'ref-filter' to make
it publically available to other commands, this is to unify the code
s/publically/publicly/
--- /dev/null
+++ b/ref-filter.h
Moving file to the .h file should be done in a separate
Karthik Nayak karthik@gmail.com writes:
On 05/29/2015 01:56 AM, Matthieu Moy wrote:
Karthik Nayak karthik@gmail.com writes:
Rename 'refinfo' to 'ref_array_item' and intoduce 'ref_filter_cbdata'
The fact that you need to use and to describe your changes is a hint
that you can split
Trevor Saunders tbsau...@tbsaunde.org writes:
Signed-off-by: Trevor Saunders tbsau...@tbsaunde.org
---
The test change only kind of tests the change in behavior and doesn't seem all
that useful. However I'm not sure if its preferable to not even try and test
that something isn't output.
As
Hello,
After the second version of the WIP/PATCH ($gmane/269836), This is a
follow up.
Changes:
* Broke down the first commit into 3 separate commits, cause they were
logically different and needed to built up incrementally.
* renamed some functions which were made public so that they don't
Eric Sunshine sunsh...@sunshineco.com writes:
On Tue, May 26, 2015 at 2:15 AM, Patryk Obara patryk.ob...@gmail.com wrote:
Currently messages are compared with --pretty=format:%s%b which does
not retain raw format of commit message. In result it's not clear what
part of expected commit msg is
When a rebase stops because of a conflict, and I edit the file to
resolve the conflict and say git rebase --continue, then the
pre-commit hook doesn't run at that point, which means that I can commit
bad stuff which the pre-commit hook would normally not allow in. We were
bitten by this a few
On Thu, May 28, 2015 at 9:45 AM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
Noticed-by: Philip Oakley philipoak...@iee.org
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Stefan Beller sbel...@google.com
---
Matthieu Moy matthieu@grenoble-inp.fr writes:
But I think there are more relevant information to show (e.g. list of
already applied commits, remaining list of commits, possibly truncated
if the list is overly long, and information that rebase gave you when
stopping like the path to the
On Tue, May 26, 2015 at 5:32 PM, Remi Lespinet
remi.lespi...@ensimag.grenoble-inp.fr wrote:
Add new functions to keep the setup cleaner:
- setup_temporary_branch: creates a new branch, check it out
and automatically delete it after the test is over
- setup_fixed_branch: creates a fixed
Jeff King p...@peff.net writes:
If we try to mmap a directory, we'll get ENODEV. This
translates to no such device for the user, which is not
very helpful. Since we've just fstat()'d the file, we can
easily check whether the problem was a directory to give a
better message.
Signed-off-by:
Move most of the code from 'for-each-ref' to 'ref-filter' to make
it publically available to other commands, this is to unify the code
of 'tag -l', 'branch -l' and 'for-each-ref' so that they can share
their implementations with each other.
Mentored-by: Christian Couder christian.cou...@gmail.com
Rename 'refinfo' to 'ref_array_item' and intoduce 'ref_filter_cbdata'
which will hold 'ref_filter' (Conditions to filter the refs on) and
'ref_array' (The array of ref_array_items). Modify the code to use
these new structures.
Re-order the fields in 'ref_array_item' so that refname can be
Rename some of the functions and make them publically available.
This is a preparatory step for moving code from 'for-each-ref'
to 'ref-filter' to make meaningful, targeted services available to
other commands via public APIs.
Based-on-patch-by: Jeff King p...@peff.net
Mentored-by: Christian
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
From: Jorge Juan Garcia Garcia jorge-juan.garcia-gar...@ensimag.imag.fr
Add the possibility to use a list of emails separated by commas
in flags --cc --to and --bcc instead of having to use one flag
per email address.
The use-case
On Thu, May 28, 2015 at 3:09 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Tue, May 26, 2015 at 5:32 PM, Remi Lespinet
remi.lespi...@ensimag.grenoble-inp.fr wrote:
+setup_temporary_branch () {
+ tmp_name=${2-temporary}
I forgot to mention the broken -chain here. Although the
Jeff King p...@peff.net writes:
On Wed, May 27, 2015 at 03:38:12PM -0700, Junio C Hamano wrote:
The patch was meant to be a tongue-in-cheek tangent that is a vast
improvement for cases where we absolutely need to use mmap but does
not help the OP at all ;-) I do not think there is any need
Hi Stefan,
On 2015-05-27 23:47, Stefan Beller wrote:
On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com wrote:
Talking about ideas:
I sometimes have the wrong branch checked out when doing a small
fixup commit. So I want to drop that patch from the current branch
and apply it
Paul Tan pyoka...@gmail.com writes:
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 0d8ba48..3190c05 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -89,11 +89,13 @@ default. You can use `--no-utf8` to override this.
Matthieu Moy matthieu@grenoble-inp.fr writes:
Junio C Hamano gits...@pobox.com writes:
If this topic enhances 'git status' with the in-progress rebase
information, I'd view it as turning 'git status' from 'a more or
less useless command during rebase' to 'a useful command'.
For
On Thu, May 28, 2015 at 10:06 AM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi Stefan,
On 2015-05-27 23:47, Stefan Beller wrote:
On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com wrote:
Talking about ideas:
I sometimes have the wrong branch checked out when doing
Extract two helper functions out of grab_single_ref(). Firstly,
new_refinfo() which is used to allocate memory for a new refinfo
structure and copy the objectname, refname and flag to it.
Secondly, match_name_as_path() which when given an array of patterns
and the refname checks if the refname
On Thu, May 28, 2015 at 11:26 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Thu, May 28, 2015 at 6:42 AM, Remi Lespinet
remi.lespi...@ensimag.grenoble-inp.fr wrote:
+ The format supported for email list is the following:
+ Foo f...@example.com, b...@example.com.
+
Johannes Schindelin johannes.schinde...@gmx.de writes:
Hi Stefan,
On 2015-05-27 23:47, Stefan Beller wrote:
On Wed, May 27, 2015 at 1:35 PM, Junio C Hamano gits...@pobox.com wrote:
Talking about ideas:
I sometimes have the wrong branch checked out when doing a small
fixup commit. So I want
Eric Sunshine sunsh...@sunshineco.com writes:
Moreover, it lacks justification and explanation of why you consider
the cleanup unnecessary. History [1] indicates that its application to
-F but not -t was intentional.
[1]: bc92377 (commit: fix ending newline for template files, 2015-05-26)
On Thu, May 28, 2015 at 2:22 PM, Junio C Hamano gits...@pobox.com wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
Moreover, it lacks justification and explanation of why you consider
the cleanup unnecessary. History [1] indicates that its application to
-F but not -t was intentional.
Stefan Beller sbel...@google.com writes:
I am not sure if the discussion belongs into the glossary though.
Probably not. Perhaps in tutorial.
--
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
Junio C Hamano gits...@pobox.com writes:
If this topic enhances 'git status' with the in-progress rebase
information, I'd view it as turning 'git status' from 'a more or
less useless command during rebase' to 'a useful command'.
For day-to-day operations, what we already have in status
Junio C Hamano gits...@pobox.com writes:
The 'type' may also be shared between these two options, no? It
would be logically consistent if you can say
git config --bool --get-name-regexp '.*' 'no'
to find all configuration variables that are set to 'false' in
different spellings like
On Thu, May 28, 2015 at 9:10 AM, Paul Tan pyoka...@gmail.com wrote:
Take these comments/suggestions with a pinch of salt because I'm not
that experienced with the code base as well ;-).
I agree with pretty much all of your review comments. See below for a
minor addenda.
On Wed, May 27, 2015
SZEDER Gábor sze...@ira.uka.de writes:
@@ -16,11 +16,12 @@ SYNOPSIS
'git config' [file-option] [type] [-z|--null] --get-all name [value_regex]
'git config' [file-option] [type] [-z|--null] --get-regexp name_regex
[value_regex]
'git config' [file-option] [type] [-z|--null] --get-urlmatch
Junio C Hamano gits...@pobox.com writes:
I've noticed that in the block above that initializes all the variables,
sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
messageid= resolvemsg= resume= scissors= no_inbody_headers=
git_apply_opt=
Using git version 2.4.1.171.ga34f239, and gitolite v3.6.3 (b05c94ff).
I apologize I don't know enough about the client vs server functions,
during a git push, to know whether this is a git or gitolite issue.
After cloning the public glibc repo, and creating a new bare repo on
my local gitserver
Michael Darling darli...@gmail.com writes:
$ git push --tags --set-upstream origin
[...]
Note this time there is NO:
* [new branch] master - master
Branch master set up to track remote branch master from origin.
man git-push says:
SYNOPSIS
git push [...] [repository
Junio C Hamano gits...@pobox.com writes:
I think there is a difference between (silently) accepting just to
be lenient and documenting and advocating mixed case uses.
Personally, I'd rather not to see gratuitous flexibility to allow
the same thing spelled in 47 different ways for no good
On 05/26/2015 09:19 PM, Matthieu Moy wrote:
Seconded. Some reasons/guide to split:
* Split trivial and non-trivial stuff. I can quickly review a
rename-only patch even if it's a bit long (essentially, I'll check
that you did find-and-replace properly), but reviewing a mix of
renames
Once upon a time, git's in-memory representation of a cache
entry actually pointed to the mmap'd on-disk data. So in
520fc24 (Allow writing to the private index file mapping.,
2005-04-26), we specified PROT_WRITE so that we could tweak
the entries while we run (in our own MAP_PRIVATE copy-on-write
We mmap the existing config file, but fail to unmap it if we
hit an error. The function already has a shared exit path,
so we can fix this by moving the mmap pointer to the
function scope and clearing it in the shared exit.
Signed-off-by: Jeff King p...@peff.net
---
config.c | 9 +
1
The config-writing code uses xmmap to map the existing
config file, which will die if the map fails. This has two
downsides:
1. The error message is not very helpful, as it lacks any
context about the file we are mapping:
$ mkdir foo
$ git config --file=foo some.key value
On Wed, May 27, 2015 at 03:24:47PM -0700, Stefan Beller wrote:
What is our thinking for after-fact recovery attempts?
Like we try the mmap first, if that fails we just use open to get the
contents of
the file. And when open fails, we can still print a nice error message?
For config, I think
On Wed, May 27, 2015 at 03:38:12PM -0700, Junio C Hamano wrote:
The patch was meant to be a tongue-in-cheek tangent that is a vast
improvement for cases where we absolutely need to use mmap but does
not help the OP at all ;-) I do not think there is any need for the
config reader to read the
If we try to mmap a directory, we'll get ENODEV. This
translates to no such device for the user, which is not
very helpful. Since we've just fstat()'d the file, we can
easily check whether the problem was a directory to give a
better message.
Signed-off-by: Jeff King p...@peff.net
---
It feels a
On Tue, May 26, 2015 at 8:15 AM, Patryk Obara patryk.ob...@gmail.com wrote:
These are my first patches to git, so be extra pedantic during review, please.
I noticed, that newline is appended, when I try to use template file - which
is annoying if template ends with comment. I digged a bit and
On Wed, 27 May 2015 17:28:34 -0700
Stefan Beller sbel...@google.com wrote:
so I just run into this problem again (which happens to me maybe
twice a week): I want to do a git operations, so I type git into
my shell,
[...]
then I copy the whole operation git revert --abort in this case and
Hello,
I've corrected an old patch from an Ensimag student.
(http://thread.gmane.org/gmane.comp.version-control.git/228182). This
patch allows multiple email addresses for options --cc, --to and
--bcc. As said in the commit message, this patch doesn't handle commas
in name, and the only
From: Jorge Juan Garcia Garcia jorge-juan.garcia-gar...@ensimag.imag.fr
Add the possibility to use a list of emails separated by commas
in flags --cc --to and --bcc instead of having to use one flag
per email address.
The use-case is to copy-paste a list of addresses from an email.
This change
Karthik Nayak karthik@gmail.com writes:
On 05/26/2015 09:19 PM, Matthieu Moy wrote:
Seconded. Some reasons/guide to split:
* Split trivial and non-trivial stuff. I can quickly review a
rename-only patch even if it's a bit long (essentially, I'll check
that you did find-and-replace
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes:
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -519,6 +519,12 @@ Result: OK
EOF
+replace_variable_fields () {
+ sed -e s/^\(Date:\).*/\1 DATE-STRING/ \
+ -e s/^\(Message-Id:\).*/\1
Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr writes:
It is an almost empty code I send to validate the global architecture
of this command. I choose to write
Avoid personal wording (I choose to write ... because - The code is
written ... because). What matters in the commit message
Hello.
Recently, the guys from Google have to deal with an issue in Android
Studio where the user can no longer type in the IDE.
Their workaround is to restart ibus via ibus restart, which works
more or less [1].
As a side effect I noticed that wish and therefore gitk and git-gui
die as soon as I
Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr writes:
It is an almost empty code I send to validate the global architecture
of this command.
One more note: I know what git rebase --status is about because I'm
the one who suggested it and I read your previous message, but not
On Wed, May 27, 2015 at 10:11 PM, SZEDER Gábor sze...@ira.uka.de wrote:
Recenty I created a multi-line branch description with '.' and '='
characters on one of the lines, and noticed that fragments of that line
show up when completing set variable names for 'git config', e.g.:
$ git config
Stefan Beller sbel...@google.com writes:
so I just run into this problem again (which happens to me maybe twice
a week):
I want to do a git operations, so I type git into my shell, and
then [...] I copy the whole operation git revert --abort in this case and
paste it to the shell
On my
Hi,
Take these comments/suggestions with a pinch of salt because I'm not
that experienced with the code base as well ;-).
On Wed, May 27, 2015 at 5:32 AM, Remi Lespinet
remi.lespi...@ensimag.grenoble-inp.fr wrote:
Add new functions to keep the setup cleaner:
- setup_temporary_branch: creates
It is an almost empty code I send to validate the global architecture
of this command. I choose to write it in C because git status is
already in C and it seems that it is the current tendency to port
shell code to C. Moreover I would like to use code from wt_status to
implement this
Fixed misspelled option names in docs and in commit message, incorporated
Peff's suggestions, and renamed 'show_only_keys' to 'omit_values' in 1/2.
Only minor tweaking in 2/2's commit message.
SZEDER Gábor (2):
config: add options to list only variable names
completion: use new 'git config'
Recenty I created a multi-line branch description with '.' and '='
characters on one of the lines, and noticed that fragments of that line
show up when completing set variable names for 'git config', e.g.:
$ git config --get branch.b.description
Branch description to fool the completion
List all set config variable names with 'git config --list-names' instead
of '--list' and post processing. Similarly, use 'git config
--get-name-regexp' instead of '--get-regexp' to get config variables in a
given section.
Signed-off-by: SZEDER Gábor sze...@ira.uka.de
---
Hi,
On Wed, May 27, 2015 at 5:32 AM, Remi Lespinet
remi.lespi...@ensimag.grenoble-inp.fr wrote:
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be
Preparatory commit for a git rebase --status command. This command
will indicate the state of the process in the rebase, and the reason
why it stopped.
Signed-off-by: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr
---
The observations from Matthieu Moy have been taken into account
It
On Tue, May 26, 2015 at 2:15 AM, Patryk Obara patryk.ob...@gmail.com wrote:
Currently messages are compared with --pretty=format:%s%b which does
not retain raw format of commit message. In result it's not clear what
part of expected commit msg is subject and what part is body. Also, it's
On Tue, May 26, 2015 at 2:15 AM, Patryk Obara patryk.ob...@gmail.com wrote:
git-commit with -t or -F -e uses content of user-supplied file as
initial value for commit msg in editor. There is no guarantee, that this
file ends with newline - it depends on file content and editor used to
create
Guillaume Pages guillaume.pa...@ensimag.grenoble-inp.fr writes:
Hi,
Paul Tan pyoka...@gmail.com :
I haven't kept up with the discussion, but I'm wondering: since you
need the functionality in wt-status.c, why not implement it in git
status? In fact, git-status already shows if there is
Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr writes:
It is an almost empty code sent to validate the global architecture of
this command. It is written in C because git status is already in C
and it seems that it is the current tendency to port shell code to
C. Moreover will
On Thu, May 28, 2015 at 6:42 AM, Remi Lespinet
remi.lespi...@ensimag.grenoble-inp.fr wrote:
Add the possibility to use a list of emails separated by commas
in flags --cc --to and --bcc instead of having to use one flag
s/--cc --to/--cc, --to/
Ditto in subject.
per email address.
The
Stefan Beller sbel...@google.com writes:
Noticed-by: Philip Oakley philipoak...@iee.org
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Stefan Beller sbel...@google.com
---
Documentation/glossary-content.txt | 17 +
1 file changed, 17 insertions(+)
The updates
Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr
writes:
Junio C Hamano gits...@pobox.com writes:
I think there is a difference between (silently) accepting just to
be lenient and documenting and advocating mixed case uses.
Personally, I'd rather not to see gratuitous
80 matches
Mail list logo
