Re: [PATCH v4 6/8] branch.c: use 'ref-filter' data structures

On Sun, Sep 13, 2015 at 12:53 PM, Karthik Nayak wrote: > Make 'branch.c' use 'ref-filter' APIs for iterating through refs > sorting. This removes most of the code used in 'branch.c' replacing it > with calls to the 'ref-filter' library. > > Make 'branch.c' use the

[PATCH v4 7/8] branch.c: use 'ref-filter' APIs

Make 'branch.c' use 'ref-filter' APIs for iterating through refs sorting. This removes most of the code used in 'branch.c' replacing it with calls to the 'ref-filter' library. Make 'branch.c' use the 'filter_refs()' function provided by 'ref-filter' to filter out tags based on the options set.

Re: [Feature Request] git blame showing only revisions from git rev-list --first-parent

On Sat, Sep 12, 2015 at 01:29:43AM -0700, Junio C Hamano wrote: > >> - for (p = commit->parents; p; p = p->next) > >> + for (p = commit->parents; > >> + p && !revs->first_parent_only; > >> + p = p->next) > >>add_child(revs,

Re: [PATCH v7 1/3] worktree: add top-level worktree.c

On Sat, Sep 12, 2015 at 10:39 PM, Eric Sunshine wrote: > On Fri, Sep 4, 2015 at 5:39 PM, Michael Rappazzo wrote: >> + } >> + } else if (strbuf_read_file(ref, path_to_ref, 0) >= 0) { >> + if (starts_with(ref->buf,

[PATCH v4 5/8] branch: drop non-commit error reporting

Remove the error reporting variable to make the code easier to port over to using ref-filter APIs. This variable is not required as in ref-filter we already check for possible errors and report them. Based-on-patch-by: Jeff King Mentored-by: Christian Couder

[PATCH v4 4/8] branch: move 'current' check down to the presentation layer

We check if given ref is the current branch in print_ref_list(). Move this check to print_ref_item() where it is checked right before printing. Based-on-patch-by: Jeff King Mentored-by: Christian Couder Mentored-by: Matthieu Moy

[PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list

Remove show_detached() and make detached HEAD to be rolled into regular ref_list by adding REF_DETACHED_HEAD as a kind of branch and supporting the same in append_ref(). This eliminates the need for an extra function and helps in easier porting of branch.c to use ref-filter APIs. Before

[PATCH v4 2/8] branch: bump get_head_description() to the top

This is a preperatory patch for 'roll show_detached HEAD into regular ref_list'. This patch moves get_head_description() to the top so that it can be used in print_ref_item(). Based-on-patch-by: Jeff King Mentored-by: Christian Couder Mentored-by:

[PATCH v4 0/8] port the filtering part of branch.c to use ref-filter APIs

This makes branch.c use the ref-filter APIs for filtering of refs for 'git branch -l'. This is part of the series of unification of code of 'git branch -l, git tag -l and git for-each-ref'. The previous version can be found here: http://thread.gmane.org/gmane.comp.version-control.git/276377 The

[PATCH v4 6/8] branch.c: use 'ref-filter' data structures

Make 'branch.c' use 'ref-filter' data structures and make changes to support the new data structures. This is a part of the process of porting 'branch.c' to use 'ref-filter' APIs. This is a temporary step before porting 'branch.c' to use 'ref-filter' completely. As this is a temporary step, most

[PATCH v4 6/8] branch.c: use 'ref-filter' data structures

Make 'branch.c' use 'ref-filter' APIs for iterating through refs sorting. This removes most of the code used in 'branch.c' replacing it with calls to the 'ref-filter' library. Make 'branch.c' use the 'filter_refs()' function provided by 'ref-filter' to filter out tags based on the options set.

[PATCH v4 1/8] branch: refactor width computation

From: Karthik Nayak Remove unnecessary variables from ref_list and ref_item which were used for width computation. This is to make ref_item similar to ref-filter's ref_array_item. This will ensure a smooth port of branch.c to use ref-filter APIs in further patches.

[PATCH v4 8/8] branch: add '--points-at' option

Add the '--points-at' option provided by 'ref-filter'. The option lets the user to list only branches which points at the given object. Add documentation and tests for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy

Re: Git configure/make does not honor ARFLAGS

On Sun, Aug 30, 2015 at 05:34:59PM -0400, Jeffrey Walton wrote: > I'm working on an old OS X machine. I needed to perform: > > AR=libtool > ARFLAGS="-static -o" > ... > make configure > ./configure ... > make Hrm. Your "$(AR)" is not really "ar" then, is it? It has been a long time

Re: [PATCH v4 1/8] branch: refactor width computation

Karthik Nayak writes: > @@ -667,26 +675,22 @@ static int print_ref_list(int kinds, int detached, int > verbose, int abbrev, stru > clear_commit_marks(item->commit, ALL_REV_FLAGS); > } > clear_commit_marks(filter,

Re: [PATCH v4 1/8] branch: refactor width computation

Karthik Nayak writes: > Happy to explain. Thanks for the clarification. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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

Re: [PATCH v4 4/8] branch: move 'current' check down to the presentation layer

On Sun, Sep 13, 2015 at 5:45 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> We check if given ref is the current branch in print_ref_list(). Move >> this check to print_ref_item() where it is checked right before >> printing. > > You may

Re: [PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list

On Sun, Sep 13, 2015 at 5:42 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> @@ -679,15 +682,20 @@ static int print_ref_list(int kinds, int detached, int >> verbose, int abbrev, stru >> if (verbose) >> maxwidth =

Re: [PATCH v4 6/8] branch.c: use 'ref-filter' data structures

Karthik Nayak writes: > /* Print detached HEAD before sorting and printing the rest */ > - if (detached) { > - print_ref_item(_list.list[index - 1], maxwidth, verbose, > abbrev, > -detached, remote_prefix); > -

Re: [PATCH] gitk: accelerators for the main menu

On Wed, Sep 09, 2015 at 03:20:53PM +0200, Giuseppe Bilotta wrote: > This allows fast, keyboard-only usage of the menu (e.g. Alt+V, N to open a > new view). > > Signed-off-by: Giuseppe Bilotta Thanks, applied. Paul. -- To unsubscribe from this list: send the line

Re: [PATCH v4 1/8] branch: refactor width computation

On Sun, Sep 13, 2015 at 5:21 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> @@ -667,26 +675,22 @@ static int print_ref_list(int kinds, int detached, int >> verbose, int abbrev, stru >>

Re: [PATCH, RESEND] gitk: adjust the menu line numbers to compensate for the new entry

On Tue, Sep 08, 2015 at 01:16:37AM +0200, Beat Bolli wrote: > Commit d835dbb9 ("gitk: Add a "Copy commit summary" command", > 2015-08-13) in the upstream gitk repo added a new context menu entry. > Therefore, the line numbers of the entries below the new one need to be > adjusted when their text

Re: [PATCH v4 6/8] branch.c: use 'ref-filter' data structures

On Sun, Sep 13, 2015 at 5:56 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> /* Print detached HEAD before sorting and printing the rest */ >> - if (detached) { >> - print_ref_item(_list.list[index - 1], maxwidth,

Re: [PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list

On Sun, Sep 13, 2015 at 8:12 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> @@ -679,15 +682,20 @@ static int print_ref_list(int kinds, int detached, int >> verbose, int abbrev, stru >> if (verbose) >> maxwidth =

Re: [PATCH v4 4/8] branch: move 'current' check down to the presentation layer

Karthik Nayak writes: > We check if given ref is the current branch in print_ref_list(). Move > this check to print_ref_item() where it is checked right before > printing. You may want to add a sentence saying why this is good. Given the context, it's relatively clear

Re: [PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list

Karthik Nayak writes: > @@ -679,15 +682,20 @@ static int print_ref_list(int kinds, int detached, int > verbose, int abbrev, stru > if (verbose) > maxwidth = calc_maxwidth(_list, strlen(remote_prefix)); > > - qsort(ref_list.list, ref_list.index,

[PATCH v4 4/8] branch: move 'current' check down to the presentation layer

We check if given ref is the current branch in print_ref_list(). Move this check to print_ref_item() where it is checked right before printing. This enables a smooth transition to using ref-filter APIs, as we can later replace the current check while printing to just check for FILTER_REFS_DETACHED

Re: [PATCH v4 6/8] branch.c: use 'ref-filter' data structures

Karthik Nayak writes: > On Sun, Sep 13, 2015 at 5:56 PM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> /* Print detached HEAD before sorting and printing the rest */ >>> - if (detached) { >>> -

Re: Git configure/make does not honor ARFLAGS

On Sun, Sep 13, 2015 at 1:11 PM, Eric Sunshine wrote: > On Sun, Sep 13, 2015 at 6:17 AM, Jeff King wrote: >> On Sun, Aug 30, 2015 at 05:34:59PM -0400, Jeffrey Walton wrote: >>> I'm working on an old OS X machine. I needed to perform: >>> >>> AR=libtool

Re: [PATCH] l10n: de.po: translate 123 new messages

Hi Ralf, thanks for your work! I have only a few things to add: one little typo: @@ -1228,20 +1227,19 @@ msgstr[1] "" msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "

Re: No negotiation for repos on HTTP servers?

On Sun, Sep 13, 2015 at 09:31:54PM +0200, Christoffer Haglund wrote: > Our team that use git repos hosted on a number of different > environments, including HTTP servers using Kerberos or NTLM to > authenticate users. Command-line git needs explicit credentials to > work against these repos, while

Re: [PATCH v4 3/8] branch: roll show_detached HEAD into regular ref_list

On Sun, Sep 13, 2015 at 12:46 PM, Eric Sunshine wrote: > On Sun, Sep 13, 2015 at 8:12 AM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> @@ -679,15 +682,20 @@ static int print_ref_list(int kinds, int detached,

Re: [PATCH] l10n: de.po: translate 123 new messages

Hi, Just some comments: > #: advice.c:103 > -#, fuzzy > msgid "Please, commit your changes before you can merge." > -msgstr "Bitte gebe die Versionsbeschreibung für deine Änderungen ein." > +msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie \"merge\" ausführen." I think this translation

No negotiation for repos on HTTP servers?

Hi, I wonder if I've hit a bug in git, or perhaps in libcurl. Our team that use git repos hosted on a number of different environments, including HTTP servers using Kerberos or NTLM to authenticate users. Command-line git needs explicit credentials to work against these repos, while Visual

Re: Git configure/make does not honor ARFLAGS

On Sun, Sep 13, 2015 at 6:17 AM, Jeff King wrote: > On Sun, Aug 30, 2015 at 05:34:59PM -0400, Jeffrey Walton wrote: >> I'm working on an old OS X machine. I needed to perform: >> >> AR=libtool >> ARFLAGS="-static -o" >> ... >> make configure >> ./configure ... >> make >

Re: [PATCH v8 1/2] submodule refactor: use git_pathdup_submodule() in add_submodule_odb()

On Fri, Sep 11, 2015 at 03:53:40AM -0400, Jeff King wrote: > > Now that we have strbuf_git_path_submodule(), is there any reason to > switch this away from a strbuf? > > That saves us a bunch of strlen calls, and it makes the diff way > shorter. My ulterior motive is that the result also

[PATCH] strtoul_ui: actually report error in case of negative input

If s == "-1" and CPU is i386, then none of the checks is triggered, including the last "(unsigned int) ul != ul", because ul == 2**32 - 1, which fits into "unsigned int". Fix it by changing the last check to trigger earlier, as soon as it becomes bigger than INT_MAX. Signed-off-by: Max Kirillov

Re: [PATCH v8 0/2] Submodule object path

On Thu, Sep 10, 2015 at 06:10:13PM -0700, Junio C Hamano wrote: > When I push the updated 'pu' out, could you please check I follow the pu merges. So far resolutions seem correct and all tests pass. If you don't mind re-resolving it as I send newer versions I will base them on master. Thank you.

[PATCH v9 2/2] path: implement common_dir handling in git_pathdup_submodule()

When submodule is a linked worktree, "git diff --submodule" and other calls which directly access the submodule's object database do not correctly calculate its path. Fix it by changing the git_pathdup_submodule() behavior, to use either common or per-worktree directory. Do it similarly as for

[PATCH v9 0/2] Submodule object path

Since v8: Use strbuf_git_path_submodule() as Jeff suggested Max Kirillov (2): submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb() path: implement common_dir handling in git_pathdup_submodule() cache.h | 1 + path.c

[PATCH v9 1/2] submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()

Functions which directly operate submodule's object database do not handle the case when the submodule is linked worktree (which are introduced in c7b3a3d2fe). Instead of fixing the path calculation use already existing strbuf_git_path_submodule() function without changing overall behaviour. Then

Re: Bloom filters for have/want negotiation

On 09/12/2015 07:16 AM, Shawn Pearce wrote: > On Fri, Sep 11, 2015 at 2:13 PM, Michael Haggerty > wrote: >> I have been thinking about Wilhelm Bierbaum's talk at the last GitMerge >> conference [1] in which he describes a scheme for using Bloom filters to >> make the

Re: Git configure/make does not honor ARFLAGS

On Sun, Sep 13, 2015 at 01:11:46PM -0400, Eric Sunshine wrote: > > Hrm. Your "$(AR)" is not really "ar" then, is it? It has been a long > > time since I played with libtool, but what is the reason that you are > > calling libtool and not "ar" in the first place. Is it that you do not > > have

Re: Git configure/make does not honor ARFLAGS

On Sun, Sep 13, 2015 at 09:57:08PM -0700, Junio C Hamano wrote: > On Sun, Sep 13, 2015 at 9:30 PM, Jeff King wrote: > > > > Ah, OK. Today I learned something. :) > > > > Jeffrey, can you produce a tested patch which works for you? > > If I am not mistaken, I think I already have

RE: Git Deployment using existing multiple environments

Thank you for the reply. Let's say I do setup three different repositories then how can we move work from one repository to the other. For example, from Test Environment to UAT. If there are any links that you can provide me that I can check, it'll be great. Regards, Sukhwinder Singh

Re: [Feature Request] git blame showing only revisions from git rev-list --first-parent

On Sun, Sep 13, 2015 at 3:07 AM, Jeff King wrote: >> The thing is, traversing first-parent chain in reverse fundamentally >> is undefined. You can fork multiple topics at the tip of 'master' >> and each of the topics may be single strand of pearls, but which one >> of the topics

Re: Git configure/make does not honor ARFLAGS

On Sun, Sep 13, 2015 at 9:59 PM, Jeff King wrote: > > My follow-up question was going to be: is this something we should be > setting in config.mak.uname for appropriate versions of Darwin? It > wasn't clear to me from Eric's description if this is something that > particular

Re: Git configure/make does not honor ARFLAGS

On Sun, Sep 13, 2015 at 9:30 PM, Jeff King wrote: > > Ah, OK. Today I learned something. :) > > Jeffrey, can you produce a tested patch which works for you? If I am not mistaken, I think I already have one on 'pu' (I think I did that as an afternoon-tea time hack or something). --