Re: Git feature request: mark a commit as minor

2015-10-02 Thread Felipe Micaroni Lalli
Thank you Jacob. Actually we already use the keyword MINOR for that, exactly as you said. The suggestion was made because I think it is a common behavior and it would be nice to be a meta info to standardize this (today each team adopt a different pattern for that - you used "TRIVIAL" e.g.). Nice

Re: Git feature request: mark a commit as minor

2015-10-02 Thread Mikael Magnusson
On Sat, Oct 3, 2015 at 8:11 AM, Jacob Keller wrote: > On Fri, Oct 2, 2015 at 2:38 PM, Felipe Micaroni Lalli > wrote: >> A minor change (also called "cosmetic") usually is a typo fix, doc >> improvement, a little code refactoring that don't change the behavior etc. >> >> In Wikipedia we can mark a

Re: Git feature request: mark a commit as minor

2015-10-02 Thread Jacob Keller
On Fri, Oct 2, 2015 at 2:38 PM, Felipe Micaroni Lalli wrote: > A minor change (also called "cosmetic") usually is a typo fix, doc > improvement, a little code refactoring that don't change the behavior etc. > > In Wikipedia we can mark an edition as "minor". > > It would be nice to have an argumen

Re: [PATCH 41/68] init: use strbufs to store paths

2015-10-02 Thread Torsten Bögershausen
On 30.09.15 02:23, Jeff King wrote: > On Tue, Sep 29, 2015 at 04:50:39PM -0700, Michael Blume wrote: > >> I see compile errors on my mac: >> This is my attempt, passing the test, but not fully polished. diff --git a/builtin/init-db.c b/builtin/init-db.c index 89f2c05..60b559c 100644 --- a/bui

Re: [PATCH v2 01/43] refs.c: create a public version of verify_refname_available

2015-10-02 Thread Torsten Bögershausen
On 29.09.15 00:01, David Turner wrote: > (Not sure if this is the right thread to report on) In file included from builtin/commit.c:20: ./refs.h:695:16: warning: redefinition of typedef 'ref_transaction_free_fn' is a C11 feature [-Wtypedef-redefinition] typedef void (*ref_transaction_free_f

Git feature request: mark a commit as minor

2015-10-02 Thread Felipe Micaroni Lalli
A minor change (also called "cosmetic") usually is a typo fix, doc improvement, a little code refactoring that don't change the behavior etc. In Wikipedia we can mark an edition as "minor". It would be nice to have an argument like "--minor" in git-commit to mark the commit as minor. Also, filter

Re: [PATCH v2 42/43] refs: add LMDB refs backend

2015-10-02 Thread Junio C Hamano
David Turner writes: > diff --git a/refs-be-lmdb.c b/refs-be-lmdb.c > new file mode 100644 > index 000..99cbd29 > --- /dev/null > +++ b/refs-be-lmdb.c > @@ -0,0 +1,2003 @@ > +/* > + ... > + */ > +#include > +#include > +#include "cache.h" "git-compat-util.h" (or "cache.h", because it is we

Re: [PATCH v9 2/5] worktree: refactor find_linked_symref function

2015-10-02 Thread Junio C Hamano
Michael Rappazzo writes: > +static int parse_ref(char *path_to_ref, struct strbuf *ref, int *is_detached) > +{ > + if (is_detached) > + *is_detached = 0; > + if (!strbuf_readlink(ref, path_to_ref, 0)) > + if (!starts_with(ref->buf, "refs/") || > +

Re: [PATCH 4/9] ref-filter: modify "%(objectname:short)" to take length

2015-10-02 Thread Junio C Hamano
Karthik Nayak writes: > Add support for %(objectname:short,) which would print the > abbreviated unique objectname of given length. When no length is > specified 7 is used. The minimum length is 4. It would have to be "short=", not "short,", if I recall the previous discussion on width=, etc., o

Re: [PATCH v2 27/43] refs.c: move should_autocreate_reflog to common code

2015-10-02 Thread Junio C Hamano
Up to this step everything looked sensible. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/9] ref-filter: implement %(if:equals=) and %(if:notequals=)

2015-10-02 Thread Junio C Hamano
Karthik Nayak writes: > Implement %(if:equals=) wherein the if condition is only > satisfied if the value obtained between the %(if:...) and %(then) atom > is the same as the given ''. > > Similarly, implement (if:notequals=) wherein the if condition > is only satisfied if the value obtained betw

Re: [PATCH 1/9] ref-filter: implement %(if), %(then), and %(else) atoms

2015-10-02 Thread Junio C Hamano
Karthik Nayak writes: > +static int is_empty(const char * s){ > + while (*s != '\0') { > + if (!isspace(*s)) > + return 0; > + s++; > + } > + return 1; > +} My knee-jerk reaction was "why is space so special?", but if a caller really cared,

Re: [PATCH v9 5/5] worktree: add 'list' command

2015-10-02 Thread Junio C Hamano
Michael Rappazzo writes: > + if (!porcelain) { > + for (i = 0; worktrees[i]; i++) { > + int path_len = strlen(worktrees[i]->path); > + if (path_len > path_maxlen) > + path_m

Re: [PATCH/RFC 1/2] sha1_file: close all pack files after running

2015-10-02 Thread Max Kirillov
On Fri, Oct 02, 2015 at 10:06:46PM +0300, Max Kirillov wrote: > for i in $(seq 1000) > t_git -c core.packedGitWindowSize=100 log It was 32-bit build. I cannot promise those exactly numbers will work, because I don not clearly understand what do they mean. With 100 commits the pack size was 20K, bu

Re: [PATCH/RFC 1/2] sha1_file: close all pack files after running

2015-10-02 Thread Max Kirillov
On Fri, Oct 02, 2015 at 12:13:40PM +0200, Johannes Schindelin wrote: > Hi Max, > > On 2015-10-02 12:05, Johannes Schindelin wrote: > > > On 2015-10-01 05:29, Max Kirillov wrote: >>> When a builtin has done its job, but waits for pager or not waited >>> by its caller and still hanging it keeps pac

Re: [PATCH/RFC 1/2] sha1_file: close all pack files after running

2015-10-02 Thread Max Kirillov
On Fri, Oct 02, 2015 at 12:05:55PM +0200, Johannes Schindelin wrote: > Hi Max, > > On 2015-10-01 05:29, Max Kirillov wrote: >> When a builtin has done its job, but waits for pager or not waited >> by its caller and still hanging it keeps pack files opened. >> This can cause a number of issues, for

Re: can't install on OS X

2015-10-02 Thread Spencer Graves
On 10/2/2015 8:41 AM, Stephen Bash wrote: - Original Message - From: "Spencer Graves" Sent: Friday, October 2, 2015 2:50:30 AM Subject: can't install on OS X I downloaded "git-2.5.3-intel-universal-mavericks.dmg" per instructions. When I tried to install it, I first had trouble beca

Re: Question - List current hashs of branches

2015-10-02 Thread Junio C Hamano
for-each-ref & ls-remote? On Fri, Oct 2, 2015 at 11:54 AM, Golarits, Zsigmond (Nokia - HU/Budapest) wrote: > Hello, > > How can I get the current commit-hashes of the remote and local branches > without check them out? > > Br, > Zsigmond Golarits > -- > To unsubscribe from this list: send the li

Question - List current hashs of branches

2015-10-02 Thread Golarits, Zsigmond (Nokia - HU/Budapest)
Hello, How can I get the current commit-hashes of the remote and local branches without check them out? Br, Zsigmond Golarits -- 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/maj

Re: [PATCHv6 0/8] fetch submodules in parallel

2015-10-02 Thread Junio C Hamano
Stefan Beller writes: > * renamed return_value_fn to task_finished_fn It made interdiff noisier but I think it gives us a good end result. > * the main loop of the parallel processing was first adapted to Junios > suggestion, > but Jonathan pointed out more improvements. We can get rid of

Re: [PATCH] submodule-parallel-fetch: make some file local symbols static

2015-10-02 Thread Junio C Hamano
Ramsay Jones writes: >> I thought I had this in yesterdays reroll (v6). Oh you're referring to >> the version >> from the 28th (I forgot to label them v5 I suppose). > > Ah! I thought I'd seen it on the list. (I thought I was going crazy) ;-) > Sorry, my fault. I just assumed that today's pu bran

Re: [BUG?] applypatch-msg hook no-longer thinks stdin is a tty

2015-10-02 Thread Junio C Hamano
Junio C Hamano writes: > Chris Packham writes: > >> As of git 2.6 this has stopped working and stdin always fails the tty >> check. > > We now run that hook thru run_hook_ve(), which closes the standard > input (as the hook is not reading anything). Perhaps you can check > if your output is con

[PATCH 2/9] ref-filter: implement %(if:equals=) and %(if:notequals=)

2015-10-02 Thread Karthik Nayak
Implement %(if:equals=) wherein the if condition is only satisfied if the value obtained between the %(if:...) and %(then) atom is the same as the given ''. Similarly, implement (if:notequals=) wherein the if condition is only satisfied if the value obtained between the %(if:...) and %(then) atom

[PATCH 9/9] branch: implement '--format' option

2015-10-02 Thread Karthik Nayak
Implement the '--format' option provided by 'ref-filter'. This lets the user list tags as per desired format similar to the implementation in 'git for-each-ref'. Add tests and documentation for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak ---

[PATCH 1/9] ref-filter: implement %(if), %(then), and %(else) atoms

2015-10-02 Thread Karthik Nayak
Implement %(if), %(then) and %(else) atoms. Used as %(if)..%(then)..%(end) or %(if)..%(then)..%(else)..%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. I

[PATCH 8/9] branch: use ref-filter printing APIs

2015-10-02 Thread Karthik Nayak
Port branch.c to use ref-filter APIs for printing. This clears out most of the code used in branch.c for printing and replaces them with calls made to the ref-filter library. Introduce get_format() which gets the format required for printing of refs. Make amendments to print_ref_list() to reflect

[PATCH 7/9] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

2015-10-02 Thread Karthik Nayak
Borrowing from branch.c's implementation print "[gone]" whenever an unknown upstream ref is encountered instead of just ignoring it. This makes sure that when branch.c is ported over to using ref-filter APIs for printing, this feature is not lost. Make changes to t/t6300-for-each-ref.sh to reflec

[PATCH 0/9] port branch.c to use ref-filter printing APIs

2015-10-02 Thread Karthik Nayak
This series ports over branch.c to use ref-filter APIs This is the last part of unification of 'git branch -l', 'git tag -l' and 'git for-each-ref'. There are a few topics worth discussing here : 1. [7/9] This ensures that when we use the "%(upstream:track)" atom we print "[gone]" for upstreams w

[PATCH 5/9] ref-filter: adopt get_head_description() from branch.c

2015-10-02 Thread Karthik Nayak
Copy the implementation of get_head_description() from branch.c. This gives a description of the HEAD ref if called. This is used as the refname for the HEAD ref whenever the FILTER_REFS_DETACHED_HEAD option is used. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik

[PATCH 6/9] ref-filter: introduce format_ref_array_item()

2015-10-02 Thread Karthik Nayak
Introduce format_ref_array_item() which will output the details of a given ref_array_item as per the given format and quote_style to the given strbuf. This is derived from show_ref_array_item() which is now reduced to a wrapper around format_ref_array_item(). show_ref_array_item() obtains the str

[PATCH 3/9] ref-filter: add support for %(path) atom

2015-10-02 Thread Karthik Nayak
This adds %(path) and %(path:short) atoms. The %(path) atom will print the path of the given ref, while %(path:short) will only print the subdirectory of the given ref. Add tests and documentation for the same. --- Documentation/git-for-each-ref.txt | 5 + ref-filter.c

[PATCH 4/9] ref-filter: modify "%(objectname:short)" to take length

2015-10-02 Thread Karthik Nayak
Add support for %(objectname:short,) which would print the abbreviated unique objectname of given length. When no length is specified 7 is used. The minimum length is 4. Add tests and documentation for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by: Karthik Naya

Re: [RFC/PATCH v1] Add Travis CI support

2015-10-02 Thread Sebastian Schuberth
On 25.09.2015 05:14, Dennis Kaarsemaker wrote: My idea is that the owner of "https://github.com/git/git"; enables this account for Travis (it's free!). Then we would automatically get the test state for all official branches. The last time I heard about this "it's free" thing, I thought I hear

Re: [BUG?] applypatch-msg hook no-longer thinks stdin is a tty

2015-10-02 Thread Junio C Hamano
Chris Packham writes: > As of git 2.6 this has stopped working and stdin always fails the tty > check. We now run that hook thru run_hook_ve(), which closes the standard input (as the hook is not reading anything). Perhaps you can check if your output is connected to the tty instead? -- To uns

Re: [PATCH 41/68] init: use strbufs to store paths

2015-10-02 Thread Jeff King
On Fri, Oct 02, 2015 at 08:00:24AM +0200, Torsten Bögershausen wrote: > Peff, are you planing a re-roll ? > Or. Junio, do you plan to fix it ? > Or should I send a patch on top of pu ? I am on vacation, so I am hoping that somebody on OS X can confirm that the patch that I sent earlier does indee

Re: can't install on OS X

2015-10-02 Thread Stephen Bash
- Original Message - > From: "Spencer Graves" > Sent: Friday, October 2, 2015 2:50:30 AM > Subject: can't install on OS X > > I downloaded "git-2.5.3-intel-universal-mavericks.dmg" per > instructions. When I tried to install it, I first had trouble because > it wasn't from the Mac App Sto

Re: Convenient shortcut to push delete current branch?

2015-10-02 Thread Mike Rappazzo
On Thu, Oct 1, 2015 at 2:37 PM, Robert Dailey wrote: > On Thu, Oct 1, 2015 at 1:22 PM, Jacob Keller wrote: >> On Thu, Oct 1, 2015 at 9:43 AM, Robert Dailey >> wrote: >>> For convenient pushing of current branch, git supports this syntax: >>> >>> $ git push origin HEAD >>> >>> This will push you

Re: can't install on OS X

2015-10-02 Thread Spencer Graves
On 10/2/2015 7:02 AM, Mike Rappazzo wrote: Looks like you have it installed properly. The typical usage is from the terminal, (try `git --version` to be sure). a-MacBook-Pro:~ sbgraves$ git --version xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing

Re: can't install on OS X

2015-10-02 Thread Mike Rappazzo
Looks like you have it installed properly. The typical usage is from the terminal, (try `git --version` to be sure). There is also a pretty great UI packaged with git called git-gui. You should be able to make a link or an alias to it in your Applications folder (or invoke it from the terminal `

[PATCH v9 5/5] worktree: add 'list' command

2015-10-02 Thread Michael Rappazzo
'git worktree list' iterates through the worktree list, and outputs details of the worktree including the path to the worktree, the currently checked out revision and branch, and if the work tree is bare. There is also porcelain format option available. Signed-off-by: Michael Rappazzo --- Docum

[PATCH v9 1/5] worktree: add top-level worktree.c

2015-10-02 Thread Michael Rappazzo
worktree.c contains functions to work with and get information from worktrees. This introduction moves functions related to worktrees from branch.c into worktree.c Signed-off-by: Michael Rappazzo --- Makefile| 1 + branch.c| 79 +-

[PATCH v9 0/5] worktree: list functions and command

2015-10-02 Thread Michael Rappazzo
Notable changes since v8[1]: - Rework the commit history to try to better maintain blame - Use ALLOC_GROW instead of pre-allocating when building the worktree array - Refine the `--porcelain` format and describe it in the documentation - Remove whitespace from expected and actual test output [

[PATCH v9 2/5] worktree: refactor find_linked_symref function

2015-10-02 Thread Michael Rappazzo
Refactoring will help transition this code to provide additional useful worktree functions. Signed-off-by: Michael Rappazzo --- worktree.c | 94 -- 1 file changed, 67 insertions(+), 27 deletions(-) diff --git a/worktree.c b/worktree.c

[PATCH v9 4/5] worktree: add details to the worktree struct

2015-10-02 Thread Michael Rappazzo
In addition to the absolute path in the worktree struct, add the location of the git dir, the head ref (if not detached), the head revision sha1, whether or not head is detached, and whether or not the worktree is a bare repo. Signed-off-by: Michael Rappazzo --- worktree.c | 55 +

[PATCH v9 3/5] worktree: add a function to get worktree details

2015-10-02 Thread Michael Rappazzo
The worktree structure provided for an individual worktree includes the absolute path of the worktree. The fuction to get the worktree details is a refactor of the find main/linked symref functions. Signed-off-by: Michael Rappazzo --- worktree.c | 161 ++-

Re: [PATCH/RFC 1/2] sha1_file: close all pack files after running

2015-10-02 Thread Johannes Schindelin
Hi Max, On 2015-10-02 12:05, Johannes Schindelin wrote: > On 2015-10-01 05:29, Max Kirillov wrote: >> When a builtin has done its job, but waits for pager or not waited >> by its caller and still hanging it keeps pack files opened. >> This can cause a number of issues, for example on Windows git

Re: [PATCH/RFC 2/2] sha1_file: set packfile to O_CLOEXEC at open

2015-10-02 Thread Johannes Schindelin
Hi Max, On 2015-10-01 05:29, Max Kirillov wrote: > Windows does not support setting O_CLOEXEC by fcntl, > but there is an open flag O_NOINHERIT which results in same > behaviour. Use it in git_open_noatime() and also bring > setting O_CLOEXEC there also to make it consistent. Rename > the function

Re: [PATCH/RFC 1/2] sha1_file: close all pack files after running

2015-10-02 Thread Johannes Schindelin
Hi Max, On 2015-10-01 05:29, Max Kirillov wrote: > When a builtin has done its job, but waits for pager or not waited > by its caller and still hanging it keeps pack files opened. > This can cause a number of issues, for example on Windows git gc > cannot remove the packs. I did not experience th

can't install on OS X

2015-10-02 Thread Spencer Graves
What's the procedure for installing Git under OS X 10.11? I downloaded "git-2.5.3-intel-universal-mavericks.dmg" per instructions. When I tried to install it, I first had trouble because it wasn't from the Mac App Store nor an "identified developer". I ultimately found "System Preferences"