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
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 *path,
Michael Haggerty mhag...@alum.mit.edu 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 mhag...@alum.mit.edu
---
Documentation/RelNotes/2.4.0.txt | 336
---
1
Michael Haggerty mhag...@alum.mit.edu writes:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Makes sense; will queue on nd/versioncmp-prereleases.
Thanks.
Documentation/git-tag.txt | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git
Michael Haggerty mhag...@alum.mit.edu writes:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
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
On Wed, Apr 22, 2015 at 4:24 PM, brian m. carlson
sand...@crustytoothpaste.net 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
Stefan Beller sbel...@google.com 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
On Fri, Apr 10, 2015 at 11:44 AM, John Keeping j...@keeping.me.uk 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
Michael Haggerty mhag...@alum.mit.edu writes:
Document `git status -v`, including its new doubled `-vv` form.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Will queue on mg/status-v-v series, which did add description for
commit -v, but status -v did not have the description to
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 gits...@pobox.com
---
builtin/merge.c | 16
1 file changed, 8
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
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
sand...@crustytoothpaste.net wrote:
To allow piecemeal conversion of the for_each_*_ref functions, introduce
an additional typedef for a callback function that takes struct
Am 23.04.2015 um 21:07 schrieb Robert Dailey:
On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey rcdailey.li...@gmail.com wrote:
On Fri, Apr 10, 2015 at 11:44 AM, John Keeping j...@keeping.me.uk wrote:
On Fri, Apr 10, 2015 at 11:30:20AM -0500, Robert Dailey wrote:
I have a branch that contains a
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 rcdailey.li...@gmail.com
wrote:
On Fri, Apr 10, 2015 at 11:44 AM, John Keeping j...@keeping.me.uk wrote:
On Fri, Apr 10, 2015 at
On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey rcdailey.li...@gmail.com wrote:
On Fri, Apr 10, 2015 at 11:44 AM, John Keeping j...@keeping.me.uk 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
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
Jeff King p...@peff.net 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).
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: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 rcdailey.li...@gmail.com
wrote:
On Fri, Apr 10, 2015 at 11:44 AM,
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
Stefan Beller sbel...@google.com writes:
On Thu, Apr 23, 2015 at 10:56 AM, Junio C Hamano gits...@pobox.com 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
Junio writes:
Michael Haggerty mhag...@alum.mit.edu writes:
Document `git status -v`, including its new doubled `-vv` form.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Will queue on mg/status-v-v series, which did add description for
commit -v, but status -v did not have
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
Hi Brian,
On 2015-04-23 02:06, brian m. carlson wrote:
+ tortoiseplink = tplink == ssh ||
+ (tplink is_dir_sep(tplink[-1]));
Maybe have a helper function here? Something like `basename_matches(const char
*path, const char
On Wed, Apr 22, 2015 at 4:30 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
+action = noop / ls-remote / fetch / push /
fetch-shallow
...
If we are going in this in-protocol message switches the service
route, we should also support archive
Hi,
the
```sh
git add config_real.xml
git stash -k
git reset
```
is not very well suited because the -k option to keep the index.
However, the index will still be put inside the stash.
So what you propose is equivalent to:
```sh
git stash
git stash apply stash@\{0\}
git checkout
On April 22, 2015 9:47:42 PM GMT+01:00, Luke Diamand l...@diamand.org wrote:
On 22/04/15 18:11, Junio C Hamano wrote:
Vitor Antunes vitor@gmail.com writes:
The updates introduced in the third revision of these two patches
consist only
on updates to the commit messages to better clarify
On 23 April 2015 at 09:37, Vitor Antunes vitor@gmail.com 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
Document `git status -v`, including its new doubled `-vv` form.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
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
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
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
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
+++
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
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
---
Make many textual tweaks to the 2.4.0 release notes.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/RelNotes/2.4.0.txt | 336 ---
1 file changed, 172 insertions(+), 164 deletions(-)
diff --git a/Documentation/RelNotes/2.4.0.txt
Todo list is the name that is used in the user-facing documentation.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Documentation/RelNotes/2.4.0.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes/2.4.0.txt
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 mhag...@alum.mit.edu
---
Documentation/RelNotes/2.4.0.txt | 336
---
1 file changed, 172 insertions(+), 164
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
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
On Wed, 22 Apr 2015 11:59:04 -0700
Junio C Hamano gits...@pobox.com 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
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 helper function
On Thu, Apr 23, 2015 at 10:56 AM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com 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,
Thanks for the submission. See comments below...
On Thu, Apr 23, 2015 at 10:13 PM, Quentin Neill quentin.ne...@gmail.com wrote:
From: Quentin Neill quentin.ne...@gmail.com
You should drop this line. git-am will pluck your name and email
automatically from the email From: header.
If
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 pchpubli...@gmail.com writes:
Junio writes:
Michael Haggerty mhag...@alum.mit.edu writes:
Document `git status -v`, including its new doubled `-vv` form.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
Will queue on mg/status-v-v series, which did add description
From: Quentin Neill quentin.ne...@gmail.com
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 +
44 matches
Mail list logo
