Hi Brian,
On 2015-04-24 01:14, brian m. carlson wrote:
> On Thu, Apr 23, 2015 at 11:53:04AM -0400, Jeff King wrote:
>
>> If I were writing from scratch, I would probably keep things as tight as
>> possible, like:
>>
>> const char *base = basename(ssh);
>> plink = !strcasecmp(base, "plink") ||
Hi Peff,
On 2015-04-23 17:53, Jeff King wrote:
> What about "plink-0.83" that was mentioned earlier in the thread?
I was working a lot with Java projects where the base name is often considered
to be the part before a version number that is encoded into the file name, so I
think it would be a
Hi Rupert,
On 2015-04-23 21:25, rupert thurner wrote:
> On Thursday, April 16, 2015 at 2:45:11 PM UTC+2, Johannes Schindelin wrote:
>>
>> However, using this code for `getppid()` would be serious overkill (not to
>> mention an unbearable performance hit because you have to enumerate *all*
>> proce
Thanks for the submission. See comments below...
On Thu, Apr 23, 2015 at 10:13 PM, Quentin Neill wrote:
> From: Quentin Neill
You should drop this line. git-am will pluck your name and email
automatically from the email From: header.
> If you prefer seeing emails in your git blame outp
From: Quentin Neill
If you prefer seeing emails in your git blame output, rather
than sprinkling '-e' options everywhere you can just set
the new config blame.showemail to true.
---
Documentation/blame-options.txt | 5 +
Documentation/git-blame.txt | 4
bui
On Fri, Apr 24, 2015 at 12:48:43AM +0100, B M Corser wrote:
> Seeing some weird results out of rev-list, see my demo repo:
> https://github.com/bmcorser/rev-list-fail
That repo has a whole bunch of commits with identical committer
timestamps. The default order that git displays those in is going
Pete Harlan writes:
> Junio writes:
>> Michael Haggerty writes:
>>
>> > Document `git status -v`, including its new doubled `-vv` form.
>> >
>> > Signed-off-by: Michael Haggerty
>> >---
>>
>> Will queue on mg/status-v-v series, which did add description for
>> "commit -v", but "status -v" did n
Stefan Beller writes:
> On Thu, Apr 23, 2015 at 10:56 AM, Junio C Hamano wrote:
>
>>> + int save_errno = errno;
>>> + error("Couldn't reopen %s", lock->lk->filename.buf);
>>
>> No need to change this line, but I noticed that we might want to do
>> something about the firs
Remove overriding of __git_index_file_list_filter
since that method is no longer used in git-completion.bash.
Overriding that method was needed before to get
git-completion.bash to append a '/' to the end
of directories; this does not seem to be needed anymore since
that script no longer provides c
Junio writes:
> Michael Haggerty writes:
>
> > Document `git status -v`, including its new doubled `-vv` form.
> >
> > Signed-off-by: Michael Haggerty
> >---
>
> Will queue on mg/status-v-v series, which did add description for
> "commit -v", but "status -v" did not have the description to begin
On Thu, Apr 23, 2015 at 10:56 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> diff --git a/refs.c b/refs.c
>> index 4f495bd..7ce7b97 100644
>> --- a/refs.c
>> +++ b/refs.c
>> @@ -3041,6 +3041,13 @@ static int write_ref_sha1(struct ref_lock *lock,
>> errno = EINVAL;
>>
Seeing some weird results out of rev-list, see my demo repo:
https://github.com/bmcorser/rev-list-fail
I was after a one-liner to sort a bunch of commit hashes into
topological (or date) order. The commits were made by a script that
forges the commit time with --date in the hope of seeing stable
r
On Thu, Apr 23, 2015 at 11:53:04AM -0400, Jeff King wrote:
> On Thu, Apr 23, 2015 at 08:50:17AM +0200, Johannes Schindelin wrote:
>
> > > + tortoiseplink = tplink == ssh ||
> > > + (tplink && is_dir_sep(tplink[-1]));
> >
> > Maybe have a hel
On Thu, Apr 23, 2015 at 09:35:38PM +0100, John Keeping wrote:
> On Thu, Apr 23, 2015 at 09:43:44PM +0200, Jens Lehmann wrote:
> > Am 23.04.2015 um 21:07 schrieb Robert Dailey:
> > > On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey
> > > wrote:
> > >> On Fri, Apr 10, 2015 at 11:44 AM, John Keeping
Hi,
I did notice the problem a while ago and had traced it back to the
fact that the bash completion scripts no longer adds the trailing '/'
at the end of directories.
Tcsh needs that '/' to know not to add that annoying extra space.
Bash 3 needed to put it that trailing '/' but bash 4 did not.
On Thu, Apr 23, 2015 at 09:43:44PM +0200, Jens Lehmann wrote:
> Am 23.04.2015 um 21:07 schrieb Robert Dailey:
> > On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey
> > wrote:
> >> On Fri, Apr 10, 2015 at 11:44 AM, John Keeping wrote:
> >>> On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wro
On Mon, Apr 13, 2015 at 11:10:51AM +, Macario, Gianpaolo wrote:
> Unfortunately it looks to me that the `--prefix=xxx` option provided
> to configure will be hardcoded to the path returned by 'git
> --exec-path', and I do not see how this may actually be made dependent
> on the directory where
Jeff King writes:
> Yeah, this looks obviously correct.
It is funny that this dates back to the very beginning of defaulting
to the upstream, the code that "if ()" block implements, introduced
at 93e535a5 (merge: merge with the default upstream branch without
argument, 2011-03-23).
> As an asid
On Thu, Apr 23, 2015 at 01:01:44PM -0700, Junio C Hamano wrote:
> One of the first things cmd_merge() does is to see if the "--abort"
> option is given and run "reset --merge" and exit. When the control
> reaches this point, we know "--abort" was not given.
>
> Signed-off-by: Junio C Hamano
Ye
One of the first things cmd_merge() does is to see if the "--abort"
option is given and run "reset --merge" and exit. When the control
reaches this point, we know "--abort" was not given.
Signed-off-by: Junio C Hamano
---
builtin/merge.c | 16
1 file changed, 8 insertions(+), 8
Am 23.04.2015 um 21:07 schrieb Robert Dailey:
On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey wrote:
On Fri, Apr 10, 2015 at 11:44 AM, John Keeping wrote:
On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote:
I have a branch that contains a commit with a single change: A
submodule po
On Thu, Apr 23, 2015 at 11:13:32AM -0700, Stefan Beller wrote:
> On Wed, Apr 22, 2015 at 4:24 PM, brian m. carlson
> wrote:
> > To allow piecemeal conversion of the for_each_*_ref functions, introduce
> > an additional typedef for a callback function that takes struct
> > object_id * instead of u
On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey wrote:
> On Fri, Apr 10, 2015 at 11:44 AM, John Keeping wrote:
>> On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote:
>>> I have a branch that contains a commit with a single change: A
>>> submodule pointing to a new SHA1.
>>>
>>> When I r
Michael Haggerty writes:
> Signed-off-by: Michael Haggerty
> ---
Thanks.
> Documentation/RelNotes/2.4.0.txt | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/RelNotes/2.4.0.txt
> b/Documentation/RelNotes/2.4.0.txt
> index a0ee37d..c02de8d 100644
> --
Michael Haggerty writes:
> Signed-off-by: Michael Haggerty
> ---
Makes sense; will queue on nd/versioncmp-prereleases.
Thanks.
> Documentation/git-tag.txt | 11 +++
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.tx
Michael Haggerty writes:
> Document `git status -v`, including its new doubled `-vv` form.
>
> Signed-off-by: Michael Haggerty
> ---
Will queue on mg/status-v-v series, which did add description for
"commit -v", but "status -v" did not have the description to begin
with and we missed it.
Thank
On Fri, Apr 10, 2015 at 11:44 AM, John Keeping wrote:
> On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote:
>> I have a branch that contains a commit with a single change: A
>> submodule pointing to a new SHA1.
>>
>> When I rebase this branch onto the tip of its parent branch AND that
>
On Wed, Apr 22, 2015 at 4:24 PM, brian m. carlson
wrote:
> To allow piecemeal conversion of the for_each_*_ref functions, introduce
> an additional typedef for a callback function that takes struct
> object_id * instead of unsigned char *. Provide an extra field in
> struct ref_entry_cb for this
Stefan Beller writes:
> diff --git a/refs.c b/refs.c
> index 4f495bd..7ce7b97 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3041,6 +3041,13 @@ static int write_ref_sha1(struct ref_lock *lock,
> errno = EINVAL;
> return -1;
> }
> + if (lock->lk->fd == -1 && reope
On Thu, Apr 23, 2015 at 08:50:17AM +0200, Johannes Schindelin wrote:
> > + tortoiseplink = tplink == ssh ||
> > + (tplink && is_dir_sep(tplink[-1]));
>
> Maybe have a helper function here? Something like
> `basename_matches(const char *p
Michael Haggerty writes:
> On 04/23/2015 02:27 PM, Michael Haggerty wrote:
>> Make many textual tweaks to the 2.4.0 release notes.
>>
>> Signed-off-by: Michael Haggerty
>> ---
>> Documentation/RelNotes/2.4.0.txt | 336
>> ---
>> 1 file changed, 172 insertio
tl: skip to the second paragraph
So here is what I just experienced:
We had an emergency error in an application at work and as the
responsible developer was unavailable, I was asked to check it out and
look into it.
We are a small branch of a bigger company and our connection to the
company's sou
Hi Luke,
I found a silly mistake I was making in the command I've been using.
The folder under the depot should have been capitalized, but it
wasn't. Also, I expected that if there was a problem with the command,
it would fail with some message instead of creating an empty local git
repo.
Now I'l
Torsten,
The relevant part of the path in GIT_SSH was ‘/uplink_deploy/‘.
I did begin to use GIT_SSH_COMMAND as a workaround, but regardless this still
feels like an overly broad way to determine the value of the putty flag.
I was kind of surprised to find it being inferred from the value of GIT
On 04/23/2015 02:27 PM, Michael Haggerty wrote:
> Make many textual tweaks to the 2.4.0 release notes.
>
> Signed-off-by: Michael Haggerty
> ---
> Documentation/RelNotes/2.4.0.txt | 336
> ---
> 1 file changed, 172 insertions(+), 164 deletions(-)
>
> diff --
"Todo list" is the name that is used in the user-facing documentation.
Signed-off-by: Michael Haggerty
---
Documentation/RelNotes/2.4.0.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt
index c02de8d..7
Signed-off-by: Michael Haggerty
---
Documentation/RelNotes/2.4.0.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt
index a0ee37d..c02de8d 100644
--- a/Documentation/RelNotes/2.4.0.txt
+++ b/Documentation
Signed-off-by: Michael Haggerty
---
Documentation/git-tag.txt | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index bfba4ef..f5b267e 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -98,
Make many textual tweaks to the 2.4.0 release notes.
Signed-off-by: Michael Haggerty
---
Documentation/RelNotes/2.4.0.txt | 336 ---
1 file changed, 172 insertions(+), 164 deletions(-)
diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4
Document `git status -v`, including its new doubled `-vv` form.
Signed-off-by: Michael Haggerty
---
Documentation/git-status.txt | 9 +
1 file changed, 9 insertions(+)
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index b3319f7..9ec5897 100644
--- a/Documentat
Patches 1 and 2 add some manpage documentation for features mentioned
in the release notes that were not adequately documented.
Patches 3 and 4 correct a couple of concrete problems in the release
notes.
Patch 5 is a smörgåsbord of suggested stylistic changes to the release
notes. Feel free to pi
On Wed, 22 Apr 2015 11:59:04 -0700
Junio C Hamano wrote:
> Swapping the order in the code this late in the game after 8 years
> may affect people who have come to rely on the current behaviour and
> never read the doc, which is somewhat worrying, though.
I agree. I think the change should be wel
On 23 April 2015 at 09:37, Vitor Antunes wrote:
> That was a good combination to test. In fact, I am using such
> a client spec at my work place to exclude the import from
> Perforce of a folder that only contains binary files, but I never
> even considered to add files to that folder from git!
>
On April 22, 2015 9:47:42 PM GMT+01:00, Luke Diamand wrote:
>On 22/04/15 18:11, Junio C Hamano wrote:
>> Vitor Antunes writes:
>>
>>> The updates introduced in the third revision of these two patches
>consist only
>>> on updates to the commit messages to better clarify what they
>implement.
>>>
>
44 matches
Mail list logo
