Re: Properties of trees referencing commit objects (mode 160000)?

On Sun, Mar 20, 2016 at 04:22:02PM -0700, Josh Triplett wrote: > I want to track the evolution of a patch series or other commit history, > through non-fast-forwarding actions like rebase, rebase -i, or commit > --amend. Similar in spirit to reflog, but with intentional commits and > commit

Re: [PATCH v2] Add the tag.gpgsign option to sign all created tags

Laurent Arnoud writes: > The `tag.gpgsign` config option allows to sign all > commits automatically. I presume that you meant "all annotated tags" here. But I am not sure it this is sensible. > Support `--no-sign` option to countermand configuration `tag.gpgsign`. That

Re: [PATCH 1/2] git-compat-util: st_add4: work around gcc 4.2.x compiler crash

On Mon, Mar 21, 2016 at 12:56 AM, Christian Couder wrote: > On Mon, Mar 21, 2016 at 5:35 AM, Eric Sunshine > wrote: >> >> diff --git a/git-compat-util.h b/git-compat-util.h >> index c07e0c1..4743954 100644 >> --- a/git-compat-util.h >> +++

Re: [PATCH 1/2] git-compat-util: st_add4: work around gcc 4.2.x compiler crash

On Mon, Mar 21, 2016 at 5:35 AM, Eric Sunshine wrote: > > diff --git a/git-compat-util.h b/git-compat-util.h > index c07e0c1..4743954 100644 > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -715,8 +715,8 @@ static inline size_t st_add(size_t a, size_t b) >

Re: [PATCH 1/2] git-compat-util: st_add4: work around gcc 4.2.x compiler crash

On Mon, Mar 21, 2016 at 12:35:57AM -0400, Eric Sunshine wrote: > Although changes by 5b442c4 (tree-diff: catch integer overflow in > combine_diff_path allocation, 2016-02-19) are perfectly valid, they > unfortunately trigger an internal compiler error in gcc 4.2.x: > > combine-diff.c: In

Re: [ANNOUNCE] Git v2.7.4 (and updates to older maintenance tracks)

[cc:+Torsten] On Sun, Mar 20, 2016 at 3:43 PM, Jeff King wrote: > On Sun, Mar 20, 2016 at 01:07:52PM -0400, Eric Sunshine wrote: >> On Sun, Mar 20, 2016 at 11:32 AM, Renato Botelho wrote: >> > 2.7.4 fails to build on FreeBSD 9.x, that uses by default gcc 4.2.1.

[PATCH 2/2] Revert "config.mak.uname: use clang for Mac OS X 10.6"

This reverts commit 7b6daf8d2fee1a9866b1d4eddbfaa5dbc42c5dbb. Now that st_add4() has been patched to work around the gcc 4.2.x compiler crash, revert the sledge-hammer approach of forcing Mac OS X 10.6 to unconditionally use 'clang' rather than the default compiler (gcc). Signed-off-by: Eric

[PATCH 1/2] git-compat-util: st_add4: work around gcc 4.2.x compiler crash

Although changes by 5b442c4 (tree-diff: catch integer overflow in combine_diff_path allocation, 2016-02-19) are perfectly valid, they unfortunately trigger an internal compiler error in gcc 4.2.x: combine-diff.c: In function 'diff_tree_combined': combine-diff.c:1391: internal compiler

[PATCH 0/2] work around gcc 4.2.x compiler crash

This patch series works around a gcc 4.2.1 compiler crash reported on Mac OS X[1] and FreeBSD[2] which is triggered by perfectly valid change from 5b442c4 (tree-diff: catch integer overflow in combine_diff_path allocation, 2016-02-19). patch 1: sidestep the problem via a simple re-ordering of

Re: [GIT PULL] l10n updates for 2.8.0 round 3

Thanks. On Sun, Mar 20, 2016 at 4:08 AM, Jiang Xin wrote: > Hi Junio, > > The following changes since commit 5c0c220c53823e2a9ebe8e566e649ca30cd7e8e0: > > l10n: zh_CN: for git v2.8.0 l10n round 3 (2016-03-16 00:27:40 +0800) > > are available in the git repository at:

Re: [PATCH] mergetools: created new mergetool file for ExamDiff

On Sun, Mar 20, 2016 at 06:02:55PM -0700, Junio C Hamano wrote: > Jacob Nisnevich writes: > > > --- > > Missing sign-off. > > I'll Cc the area expert (David Aguilar). > > > mergetools/examdiff | 37 + > > 1 file changed, 37

Re: [Q] updates to gitk, git-gui and git-svn for 2.8?

Thanks, will do. -- 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] mergetools: created new mergetool file for ExamDiff

Jacob Nisnevich writes: > --- Missing sign-off. I'll Cc the area expert (David Aguilar). > mergetools/examdiff | 37 + > 1 file changed, 37 insertions(+) > create mode 100644 mergetools/examdiff > > diff --git

Re: [PATCH] Fixing segmentation fault when merging FETCH_HEAD

From: "Jose Ivan B. Vilarouca Filho" Hello, Eric. Thanks for suggestions. I've added a test in commit replacing git fetch origin by a fake FETCH_HEAD content. merge: don't dereference NULL pointer A segmentaion fault is raised when trying to merge FETCH_HEAD formed

Re: Properties of trees referencing commit objects (mode 160000)?

On Sun, Mar 20, 2016 at 04:07:25PM -0400, Jeff King wrote: > On Sun, Mar 20, 2016 at 11:45:24AM -0700, Josh Triplett wrote: > > > No, we do not follow "gitlinks" like this for reachability. Neither for > > > pruning, nor for object transfer via push/fetch. So you'd need to have a > > > separate

Re: Properties of trees referencing commit objects (mode 160000)?

On Sun, Mar 20, 2016 at 03:30:27PM -0700, Junio C Hamano wrote: > Josh Triplett writes: > > > On Sun, Mar 20, 2016 at 12:18:04AM -0400, Jeff King wrote: > >> On Sat, Mar 19, 2016 at 03:13:48PM -0700, Josh Triplett wrote: > >> > >> > I'm building some tools to track commit

Re: Properties of trees referencing commit objects (mode 160000)?

Josh Triplett writes: > On Sun, Mar 20, 2016 at 12:18:04AM -0400, Jeff King wrote: >> On Sat, Mar 19, 2016 at 03:13:48PM -0700, Josh Triplett wrote: >> >> > I'm building some tools to track commit objects, and I'm thinking of >> > using submodule-style references to

Re: "git tag --contains " is too chatty, if is invalid

Jeff King writes: > On Sat, Mar 19, 2016 at 10:19:02PM +0530, Chirayu Desai wrote: > >> > Yeah, I agree that showing the "-h" help is a bit much. >> > This is a side effect of looking up in the commit in the parse-options >> > callback. It has to signal an error to the option

Creates unreadable pack files on platforms with sizeof(unsigned long) != sizeof(uintmax_t)

Hi, while playing around with some git settings I encountered some problems on Windows x64 using the 64bit build of git. And it is not restricted to that platform. Recipe to break: mkdir test && cd test && truncate -s 5g largefile.bin && git init && git add . && git commit -m "changes" && git

Re: [PATCH v3 1/3] submodule: add test to demonstrate that shallow recursive clones fail

On 20.03.2016 12:40, Jeff King wrote: > On Sun, Mar 20, 2016 at 06:05:34PM +0100, Lars Schneider wrote: > +test_expect_failure shallow-clone-recursive ' + URL="file://$(pwd | sed "s/[[:space:]]/%20/g")/repo" && >>> >>> This would break if the test suite is in a path containing any

Re: [RFC/GSoC] Introduction

Junio C Hamano writes: > Lars Schneider writes: > >> On 14 Mar 2016, at 07:57, Junio C Hamano wrote: >> >>> I recall back in the days when people said that Hg's command set was >>> so much more pleasant to use that some people

Re: [RFC/GSoC] Introduction

Sidhant Sharma writes: > On Monday 14 March 2016 01:46 PM, Lars Schneider wrote: > >> I also thought about (2). The obvious advantage of having something like >> "ggit" as part of Git core is that it would be shipped with the standard >> Git distribution. That would

Re: Properties of trees referencing commit objects (mode 160000)?

On Sun, Mar 20, 2016 at 11:45:24AM -0700, Josh Triplett wrote: > Will git clone/checkout/etc handle it properly in that case, in the > absence of a .gitmodules file? Or would it only work with custom tools? I think checkout just creates an empty tree for any gitlinks, and waits for the

Re: [ANNOUNCE] Git v2.7.4 (and updates to older maintenance tracks)

On Sun, Mar 20, 2016 at 01:07:52PM -0400, Eric Sunshine wrote: > On Sun, Mar 20, 2016 at 11:32 AM, Renato Botelho wrote: > >> On Mar 17, 2016, at 18:07, Junio C Hamano wrote: > >> Git v2.7.4 Release Notes > >> > >> Junio C Hamano (4): > >> Git 2.4.11 >

Re: [PATCH v3 1/3] submodule: add test to demonstrate that shallow recursive clones fail

On Sun, Mar 20, 2016 at 06:05:34PM +0100, Lars Schneider wrote: > >> +test_expect_failure shallow-clone-recursive ' > >> + URL="file://$(pwd | sed "s/[[:space:]]/%20/g")/repo" && > > > > This would break if the test suite is in a path containing any other white > > space > > than U+0020

Re: [GSOC/RFC] GSoC Proposal Draft | Git Beginner

Sidhant Sharma writes: > Implement a beginner mode for Git. > > Abstract > > Git is a very powerful version control system, with an array of features > that lend the user with great capabilities. But it often so happens that some > beginners are overwhelmed by its

Re: [PATCH 00/16] git bisect improvements

I have been recently following this series of patches and it seems a bit stale. These patches haven't been followed up with improvement patches. If it is okay with you then can I work more upon these patches in my GSoC project. These really seem interesting and Git could really benefit from this.

Re: Properties of trees referencing commit objects (mode 160000)?

On Sun, Mar 20, 2016 at 12:18:04AM -0400, Jeff King wrote: > On Sat, Mar 19, 2016 at 03:13:48PM -0700, Josh Triplett wrote: > > > I'm building some tools to track commit objects, and I'm thinking of > > using submodule-style references to commit objects in tree objects (mode > > 16) to do so.

[PATCH v2 1/2] Documentation: fix git-p4 AsciiDoc formatting

From: Lars Schneider Noticed-by: Eric Sunshine Signed-off-by: Lars Schneider --- Documentation/git-p4.txt | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/git-p4.txt

[PATCH v2 0/2] git-p4: fix AsciiDoc formatting

From: Lars Schneider diff to v1: * reference external pages similar to git-bisect-lk2009 (thanks Luke) * fix quotation marks (you can see the error here: https://git-scm.com/docs/git-p4/2.7.4 ... search for cp1252 ) Thanks, Lars Lars Schneider (2): Documentation:

[PATCH v2 2/2] Documentation: use ASCII quotation marks in git-p4

From: Lars Schneider Signed-off-by: Lars Schneider --- Documentation/git-p4.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 6457634..8afb31d 100644 ---

Re: GSoC Project | Improvise git bisect

Pranit Bauva writes: > When I am writing > functions, I am thinking to make some tests which will be copied > contents of t/t6030-bisect-porcelain.sh with s/bisect/bisect--helper/g > uncommenting tests as I implement more functions. I don't think you need that. When you

Re: [PATCH v8 2/2] commit: add a commit.verbose config variable

On Sun, Mar 20, 2016 at 11:04 PM, Eric Sunshine wrote: > On Sun, Mar 20, 2016 at 7:05 AM, Pranit Bauva wrote: >> On Sun, Mar 20, 2016 at 9:26 AM, Eric Sunshine >> wrote: >>> However, more intuitive would probably be to

Re: [PATCH] Add the tag.gpgsign option to sign all created tags

On Sun, Mar 20, 2016 at 12:52:17PM -0400, Jeff King wrote: > That behavior makes more sense to me, but I don't think it's what your > patch does (v1 or v2). Perhaps it would make sense to add some tests, > both to verify that it is behaving as expected, and to protect that > behavior from future

Re: [PATCH v8 2/2] commit: add a commit.verbose config variable

On Sun, Mar 20, 2016 at 7:05 AM, Pranit Bauva wrote: > On Sun, Mar 20, 2016 at 9:26 AM, Eric Sunshine > wrote: >> However, more intuitive would probably be to create another "editor" >> similar to the 'check-for-diff' editor this script already

Re: [ANNOUNCE] Git v2.7.4 (and updates to older maintenance tracks)

[cc:+peff] On Sun, Mar 20, 2016 at 11:32 AM, Renato Botelho wrote: >> On Mar 17, 2016, at 18:07, Junio C Hamano wrote: >> Git v2.7.4 Release Notes >> >> Junio C Hamano (4): >> Git 2.4.11 >> Git 2.5.5 >> Git 2.6.6 >> Git 2.7.4 > > FYI, >

Re: [PATCH v3 1/3] submodule: add test to demonstrate that shallow recursive clones fail

On 15 Mar 2016, at 20:50, Stefan Beller wrote: > On Sun, Dec 20, 2015 at 3:19 PM, wrote: >> From: Lars Schneider >> >> "git clone --recursive --depth 1 --single-branch " clones the >> submodules successfully. However,

Re: [PATCH] Add the tag.gpgsign option to sign all created tags

On Sun, Mar 20, 2016 at 01:20:23PM +0100, Laurent Arnoud wrote: > Hi Jeff, > > On Sun, Mar 20, 2016 at 12:29:12AM -0400, Jeff King wrote: > > We have commit.gpgsign, so this makes some sense. Would you want to sign > > _all_ tags created with "git tag", including lightweight tags, or only > >

Re: [PATCH v2] Add the tag.gpgsign option to sign all created tags

On 20/03/16 15:07, Laurent Arnoud wrote: > The `tag.gpgsign` config option allows to sign all > commits automatically. ^^^ presumably you meant tags. > > Support `--no-sign` option to countermand configuration `tag.gpgsign`. > > Signed-off-by: Laurent Arnoud >

[GSOC/RFC] GSoC Proposal Draft | Git Beginner

Hi, I have drafted my proposal for the project 'Git Beginner', and would like to request your suggestions on improving it. I'm also reading up the Git documentation and the Git ProBook (again) to make notes for the beginner documentation. Would be great to hear your comments on it. Thanks and

Re: GSoC Project | Improvise git bisect

I didn't mention it before, I was thinking to move directly everything from git-bisect.sh to bisect.c . But then I would have to redirect to a shell script. And ultimately remove bisect--helper.c Your suggestions is a lot better. I could first move individual functions to bisect--helper.c. This

Re: [RFC/GSoC] Introduction

On Sunday 20 March 2016 09:38 PM, Lars Schneider wrote: > On 20 Mar 2016, at 16:51, Sidhant Sharma wrote: > >> On Sunday 20 March 2016 09:09 PM, Lars Schneider wrote: >>> Hi Sidhant, >>> >>> that sounds about right to me. In what language do you plan to implement >>> the

Re: [PATCH/RFC/GSoC 3/3] t0301: test credential-cache support of XDG_RUNTIME_DIR

On 17/03/2016 01:24, Junio C Hamano wrote: 惠轶群 writes: Is it because the wish is to always use /tmp/git-$uid/ as a fallback for $XDG_RUNTIME_DIR (as opposed to ~/.git-credential-cache/, which is specific to the credential-cache and would look strange if we used it for

Re: [RFC/GSoC] Introduction

On 20 Mar 2016, at 16:51, Sidhant Sharma wrote: > On Sunday 20 March 2016 09:09 PM, Lars Schneider wrote: >> Hi Sidhant, >> >> that sounds about right to me. In what language do you plan to implement the >> wrapper? > I'm comfortable in programming with C, so I think I

Re: [GSoC] Introduction and Project Discussion

On 19 Mar 2016, at 18:36, Chirayu Desai wrote: > Hi, > > I am a first year computer engineering student from India, studying at > the Silver Oak College of Engineering and Technology, > I had already put part of this in "[PATCH/GSoC] pull: implement > --[no-]autostash

Re: [RFC/GSoC] Introduction

On Sunday 20 March 2016 09:09 PM, Lars Schneider wrote: > Hi Sidhant, > > that sounds about right to me. In what language do you plan to implement the > wrapper? I'm comfortable in programming with C, so I think I can use that. Otherwise, I'm also comfortable with python and familiar with bash,

Re: [RFC/GSoC] Introduction

Hi Sidhant, that sounds about right to me. In what language do you plan to implement the wrapper? Best, Lars On 17 Mar 2016, at 15:52, Sidhant Sharma wrote: > Hi, > > So to sum up, the list of tasks for the project would be: > 1. A wrapper is to be implemented around

Re: [ANNOUNCE] Git v2.7.4 (and updates to older maintenance tracks)

> On Mar 17, 2016, at 18:07, Junio C Hamano wrote: > > The latest maintenance release Git v2.7.4 is now available at the > usual places. The same set of bugfix patches from the current > 'master' have been backported to older maintenance tracks and are > available as v2.4.11,

Re: GSoC Project | Improvise git bisect

Hi, On Sun, 20 Mar 2016, Pranit Bauva wrote: > The plan: > > - Place bisect.c in builtin/ > - Implement a skeletal cmd_bisect() which will redirect to > git-bisect.sh (1e1ea69f) I would highly advise a different course of action: - move functionality one by one from bisect.sh to

Re: [ANNOUNCE] Git v2.8.0-rc2

2016-03-20 10:45 GMT+01:00 Jiang Xin : > 2016-03-16 21:33 GMT+08:00 Michael J Gruber : >> Junio C Hamano venit, vidit, dixit 14.03.2016 18:47: >>> Junio C Hamano writes: >>> But if it makes it easier for translations

[PATCH v2] Add the tag.gpgsign option to sign all created tags

The `tag.gpgsign` config option allows to sign all commits automatically. Support `--no-sign` option to countermand configuration `tag.gpgsign`. Signed-off-by: Laurent Arnoud Reviewed-by: Jeff King --- Documentation/config.txt | 3 +++

Re: [PATCH/RFC/GSoC 01/17] perf: introduce performance tests for git-rebase

On 03/18, Johannes Schindelin wrote: > Hi Thomas, > > On Fri, 18 Mar 2016, Thomas Gummerer wrote: > > > On 03/16, Johannes Schindelin wrote: > > > Hrm. rebase -f just makes the reset an implicit part of the rebase, so it > > > seems we cannot perf *just* the rebase. We are stuck with perf'ing

Re: [PATCH] pretty-print: de-tabify indented logs to make things line up properly

On Wed, Mar 16, 2016 at 9:29 AM, Linus Torvalds wrote: > > This should all line up: > > Column 1 Column 2 > > A B > ABCD EFGH > SPACESInstead of Tabs > > Even with multi-byte UTF8 characters: > >

Re: Tabs in commit messages - de-tabify option in strbuf_stripspace()?

Marc Branchaud writes: > On 16-03-15 09:02 PM, Stefan Beller wrote: >> On Tue, Mar 15, 2016 at 6:00 PM, Stefan Beller wrote: >>> >>> Instead of converting to whitespaces in Git, we could make use of the >>> set_tabs capability for ttys and setup the

Re: GSoC Project | Improvise git bisect

Pranit Bauva writes: > The project Idea: Incremental Rewrite from shell to C of git-bisect.sh > > The plan: > > - Place bisect.c in builtin/ > - Implement a skeletal cmd_bisect() which will redirect to > git-bisect.sh (1e1ea69f) > - Introduce a structure for parsing

Re: GSoC Project | Improvise git bisect

On Sun, Mar 20, 2016 at 12:35 PM, Pranit Bauva wrote: > The project Idea: Incremental Rewrite from shell to C of git-bisect.sh > > The plan: > > - Place bisect.c in builtin/ > - Implement a skeletal cmd_bisect() which will redirect to > git-bisect.sh (1e1ea69f) > -

Re: [GSoC] Introduction and Project Discussion

Hi, On 03/19, Chirayu Desai wrote: > Hi, > > I am a first year computer engineering student from India, studying at > the Silver Oak College of Engineering and Technology, > I had already put part of this in "[PATCH/GSoC] pull: implement > --[no-]autostash for usage when rebasing", but at that

git diff --exit-code does not honour textconv setting

Hi, I realized that "git diff --exit-code" does not honour textconv settings. Maybe this behaviour is desired. It can be partially circumvented by using the "-b" flag if one does not care about whitespace changes. To reproduce this, create an empty repository and run the following commands: (I

[PATCH v2/GSoC 2/4] path.c: implement xdg_runtime_dir()

this function does the following: 1. if $XDG_RUNTIME_DIR is non-empty, `$XDG_RUNTIME_DIR/git` is used in next step, otherwise `/tmp/git-$uid` is taken. 2. ensure that above directory does exist. what's more, it must has correct permission and ownership. 3. a newly allocated string consisting of

Re: [PATCH] Add the tag.gpgsign option to sign all created tags

Hi Jeff, On Sun, Mar 20, 2016 at 12:29:12AM -0400, Jeff King wrote: > We have commit.gpgsign, so this makes some sense. Would you want to sign > _all_ tags created with "git tag", including lightweight tags, or only > those that would already create a tag object (i.e., annotated tags)? Yes those

Re: GSoC Project | Improvise git bisect

The project Idea: Incremental Rewrite from shell to C of git-bisect.sh The plan: - Place bisect.c in builtin/ - Implement a skeletal cmd_bisect() which will redirect to git-bisect.sh (1e1ea69f) - Introduce a structure for parsing the command line flags. - Start converting individual

Re: [PATCH 18/19] index-helper: autorun

Hi Duy, On Fri, 18 Mar 2016, Duy Nguyen wrote: > On Thu, Mar 17, 2016 at 9:43 PM, Johannes Schindelin > wrote: > > > I know of use cases where the index weighs 300MB, and falling back to > > reading it directly *really* hurts. > > For crying out loud, what do you

Re: [PATCH] That works

On Thu, Mar 17, 2016 at 10:47:50AM -0700, Stefan Beller wrote: > sent from git-send-email with a corrupt .mailrc file. Great, but could probably use a better commit message. ;P -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

[GIT PULL] l10n updates for 2.8.0 round 3

Hi Junio, The following changes since commit 5c0c220c53823e2a9ebe8e566e649ca30cd7e8e0: l10n: zh_CN: for git v2.8.0 l10n round 3 (2016-03-16 00:27:40 +0800) are available in the git repository at: git://github.com/git-l10n/git-po tags/l10n-2.8.0-rnd3 for you to fetch changes up to

Re: [PATCH v8 2/2] commit: add a commit.verbose config variable

On Sun, Mar 20, 2016 at 9:26 AM, Eric Sunshine wrote: > On Fri, Mar 18, 2016 at 5:19 PM, Pranit Bauva wrote: >> Add commit.verbose configuration variable as a convenience for those >> who always prefer --verbose. >> >> Signed-off-by: Pranit Bauva

Re: [ANNOUNCE] Git v2.8.0-rc2

2016-03-16 21:33 GMT+08:00 Michael J Gruber : > Junio C Hamano venit, vidit, dixit 14.03.2016 18:47: >> Junio C Hamano writes: >> >>> But if it makes it easier for translations teams and the i18n >>> coordinator to work together if I also pulled the

Re: [PATCH/RFC] parse-options.c: make OPTION__COUNTUP consider negative values

On Sun, Mar 20, 2016 at 9:40 AM, Jeff King wrote: >> > We are also changing semantics without changing the interface, which >> > means any topics in flight (that you _cannot_ review, because you have >> > not seen them yet) may be subtly broken. To me that is not an absolute >> >

Re: parse-options does not recognize "unspecified" behavior

On Wed, Mar 16, 2016 at 02:53:17PM -0700, Stefan Beller wrote: > On Wed, Mar 16, 2016 at 2:44 PM, Jeff King wrote: > > On Wed, Mar 16, 2016 at 05:37:03PM -0400, Eric Sunshine wrote: > > > >> A much easier solution would be to update OPT_VERBOSE() to understand > >> that negative

Re: [PATCH/RFC/GSoC 3/3] t0301: test credential-cache support of XDG_RUNTIME_DIR

2016-03-17 1:24 GMT+08:00 Junio C Hamano : > 惠轶群 writes: > >>> Is it because the wish is to always use /tmp/git-$uid/ as a fallback >>> for $XDG_RUNTIME_DIR (as opposed to ~/.git-credential-cache/, which >>> is specific to the credential-cache and would look

[PATCH v2 2/4] pretty-print: simplify the interaction between pp_handle_indent() and its caller

Instead of sometimes handling the output itself and some other times forcing the caller handle the output, make pp_handle_indent() responsible to handle the output for all cases. Signed-off-by: Junio C Hamano --- * This and the other two patches that follow show what

[PATCH 1/2] gitk: Add a 'rename' option to the branch context menu

Signed-off-by: Rogier Goossens --- gitk | 96 1 file changed, 85 insertions(+), 11 deletions(-) diff --git a/gitk b/gitk index 805a1c7..84b49bc 100755 --- a/gitk +++ b/gitk @@ -2664,6 +2664,7 @@

[PATCH v2 0/2] gitk: Two improvements to the branch context menu

Hi, Hereby the revised patches. Changes since v1: - Rebased on latest master - Made the changes you suggested - Moved 'rename branch' menu option above 'delete branch' - Cleaned up some code duplication that the previous patches introduced. Rogier. -- To unsubscribe from this list: send the

[PATCH 2/2] gitk: Allow checking out a remote branch

Git allows checking out remote branches, creating a local tracking branch in the process. Allow gitk to do this as well, provided a local branch of the same name does not yet exist. Signed-off-by: Rogier Goossens --- gitk | 36 +++- 1

Re: GSoC Project | Improvise git bisect

On Sun, Mar 20, 2016 at 3:35 AM, Stefan Beller wrote: > Once upon a time, a discussion produced this proposal[1], > which tries to split up the set as good as possible (50:50) instead > of inspecting the branch/merging structure of the underlying graph. > Thanks! This

Re: Update *.po with git.pot?

2016-03-19 14:53 GMT+08:00 Peter Krefting : > Ralf Thielow: > >> Since translations are made in one commit, this commit is messed up with >> the msgmerge update so when you look at the commit later, you'll have a hard >> time to find out what the actual changes in

Re: [PATCH/RFC/GSoC 05/17] rebase-options: implement rebase_options_load() and rebase_options_save()

On Wed, Mar 16, 2016 at 5:04 AM, Paul Tan wrote: >> >> How is this specific to the state file? All it does is create the >> leading directory >> if it doesn't exist? (So I'd expect file_exists(concat(dir, file)) to >> have the same >> result without actually creating the

Re: [PATCH 3/2] dir.c: fix dir re-inclusion rules with "NODIR" and "MUSTBEDIR"

On Fri, Mar 18, 2016 at 11:51 AM, Durham Goode wrote: > On 3/17/16 4:49 PM, Junio C Hamano wrote: >> >> Thanks for these 5 patches, two of which need to be discarded ;-). >> I think you can pick either one of 1/2, pick the one that says >> "non-NULL" (as opposed to "something") in

Re: [PATCH/GSoC] parse-options: Add a new nousage opt

This is being discussed in the "Re: "git tag --contains " is too chatty, if is invalid" thread. $gmane/289312 On Sun, Mar 20, 2016 at 12:16 PM, Chirayu Desai wrote: > * To show only error text on an error instead of the full usage > * Currently used only by commands

Re: "git tag --contains " is too chatty, if is invalid

I went for 3, and have sent a patch for that here - [PATCH/GSoC] parse-options: Add a new nousage opt However, it currently has one bug Running 'git tag --contains qq' twice will first show an error, then print qq, meaning that the first command creates the tag qq. Running 'git tag -l --contains

[PATCH/GSoC] parse-options: Add a new nousage opt

* To show only error text on an error instead of the full usage * Currently used only by commands with options "--with" or "--contains", such as 'tag', 'branch', 'for-each-ref'. It now prints only $ git tag --contains qq error: malformed object name qq instead of the full usage text after

Re: [PATCH] pretty-print: de-tabify indented logs to make things line up properly

On Wed, Mar 16, 2016 at 12:32 PM, Junio C Hamano wrote: > > may give us a better structure if we are going to give users a knob > to disable this tab expansion, i.e. move the addition of 4 spaces to > the caller, name the body of such a function strbuf_expand_add(), > and then