(Adding Pete, Vitor, and Fusion in case they have any thoughts on
working with P4 servers that do case-folding, or at least failing
gracefully).
On 29/04/15 00:01, Lex Spoon wrote:
The last comment in the test took me a minute to decipher. I would
suggest no repo path called LC instead of no
Jeff King p...@peff.net writes:
On Tue, Apr 28, 2015 at 10:39:44PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I'm not sure of a solution short of replacing the use of sed here with
something else. perl would be a simple choice, but filter-branch does
not otherwise
On Wed, Apr 29, 2015 at 09:30:00AM -0700, Junio C Hamano wrote:
(
while read x test -n $x
do
:;
done
cat
) ../commit | eval $filter_msg
would not spin too much in shell loop, perhaps?
Yeah, that is not too bad. Probably we want read -r, just in
Phil Hord phil.h...@gmail.com writes:
On Wed, Apr 29, 2015 at 1:15 PM, Junio C Hamano gits...@pobox.com wrote:
Thanks, will queue.
Aside from the much more invasive possibility, the patch makes me
wonder if it would have been a better design to have a static todo
with a current pointer as
On Wed, Apr 29, 2015 at 1:15 PM, Junio C Hamano gits...@pobox.com wrote:
Thanks, will queue.
Aside from the much more invasive possibility, the patch makes me
wonder if it would have been a better design to have a static todo
with a current pointer as two state files. Then reschedule would
On Wed, Apr 29, 2015 at 12:09:46PM -0700, Jonathan Nieder wrote:
Hi,
Jeff King wrote:
But IMHO, using backticks looks much better. In the roff-formatted
manpages single quotes underline, but backticks use bold.
Are you sure? My copy of git.1.gz has backticks converted into no
On 04/29/2015 08:23 PM, Phil Hord wrote:
On Wed, Apr 29, 2015 at 9:01 AM Karthik Nayak karthik@gmail.com
wrote:
Currently 'git cat-file' throws an error while trying to
print the type or size of a broken/corrupt object. This is
because these objects are usually of unknown types.
Teach
On Wed, Apr 29, 2015 at 08:08:52PM +0200, Stefan Tatschner wrote:
While reading 'man git' I realized that the highlighting of the
environment variables is not consistent. This patch adds missing single
quotes and substitutes backticks with the proper quotes as well.
I think this is OK in that
On Wed, Apr 29, 2015 at 8:56 AM, Karthik Nayak karthik@gmail.com wrote:
cat-file: add documentation for '--allow-unkown-type' option.
Drop the end-of-line period.
Signed-off-by: Karthik Nayak karthik@gmail.com
It's not clear why this change is done separately from patch 3/5
(cat-file:
On Wed, Apr 29, 2015 at 8:54 AM, Karthik Nayak karthik@gmail.com wrote:
Signed-off-by: Karthik Nayak karthik@gmail.com
---
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index ab36b1e..8362019 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -47,6 +47,18 @@
On Wed, 2015-04-29 at 14:16 -0700, Jonathan Nieder wrote:
Hi,
David Turner wrote:
Instead, it would be cool if cat-file had a mode in which it would
follow symlinks.
Makes sense.
The major wrinkle is that symlinks can point outside the repository --
either because they are
This series is an attempt to make these two operations truly equivalent:
$ git pull . topic-a topic-b...
$ git fetch . topic-a topic-b...
$ git merge FETCH_HEAD
Compared to the previous one ($gmane/267809), there are only a few
minor changes:
- The first patch is new; it adds
Signed-off-by: Junio C Hamano gits...@pobox.com
---
builtin/merge.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 9f98538..eb3be68 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1098,6 +1098,10 @@ static struct
Jeff King wrote:
1. Git has to make a decision about what to do in corner cases. What
is our cwd for relative links? The project root?
I don't follow. Isn't symlink resolution always relative to the
symlink, regardless of cwd?
Thanks,
Jonathan
--
To unsubscribe from this list: send
Karthik Nayak karthik@gmail.com writes:
Update sha1_loose_object_info() to optionally allow it to read
from a loose object file of unknown/bogus type; as the function
usually returns the type of the object it read in the form of enum
for known types, add an optional typename field to
Karthik Nayak karthik@gmail.com writes:
Currently 'git cat-file' throws an error while trying to
print the type or size of a broken/corrupt object. This is
because these objects are usually of unknown types.
Teach git cat-file a '--allow-unkown-type' option where it prints
the type or
On Wed, Apr 29, 2015 at 03:42:57PM -0700, Junio C Hamano wrote:
* jk/at-push-sha1 (2015-03-31) 6 commits
- sha1_name: implement @{push} shorthand
- sha1_name: refactor upstream_mark
- remote.c: provide per-branch pushremote name
- remote.c: hoist branch.*.remote lookup out of
Jeff King p...@peff.net writes:
I had imagined we would stop resolution and you would just get the last
object peeled object. Combined with teaching cat-file to show more
object context, doing:
echo content dest ;# actual blob
ln -s dest link;# link to blob
ln -s broken foo ;#
Paul Tan pyoka...@gmail.com writes:
Hi Junio,
On Thu, Apr 30, 2015 at 6:42 AM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
* pt/xdg-config-path (2015-04-12) 7 commits
- path.c: remove home_config_paths()
- git-config: replace use of
Koosha Khajehmoogahi koo...@posteo.de writes:
Sorry for the delay. I will send a new reroll ASAP.
No rush.
I just wanted to make sure none of these is abandoned (and
drop any that is).
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On Wed, 2015-04-29 at 21:16 -0400, Jeff King wrote:
On Wed, Apr 29, 2015 at 06:06:23PM -0700, David Turner wrote:
3. Ditto for out-of-tree. Note that this would be the _raw_ symlink
contents, not any kind of simplification (so if you asked for
foo/bar/baz and it was
On Wed, 2015-04-29 at 20:37 -0400, Jeff King wrote:
On Wed, Apr 29, 2015 at 07:11:50PM -0400, Jeff King wrote:
Yeah, I agree if you let git punt on leaving the filesystem, most of the
complicated problems go away. It still feels a bit more magical than I
expect out of cat-file, and there
On Wed, Apr 29, 2015 at 11:20:55PM -0300, Thiago Farina wrote:
Do we need to set CURLOPT_NOBODY to 0 in
https://code.googlesource.com/git/+/master/http.c#1138? Do we do this
for the sake of doing, because it doesn't hurt?
According to the documentation in
On 04/30/2015 01:05 AM, Junio C Hamano wrote:
karthik nayak karthik@gmail.com writes:
On 04/29/2015 08:19 PM, Junio C Hamano wrote:
Karthik Nayak karthik@gmail.com writes:
Update sha1_loose_object_info() to optionally allow it to read
from a loose object file of unknown/bogus
A typicall setup under Windows:
core.eol is CRLF and a file is marked as text in .gitattributes,
or core.autocrlf is true
After 4d4813a5 git blame no longer works as expected,
every line is annotated as Not Committed Yet,
even though the working directory is clean.
commit 4d4813a5 removed the
On Mon, Apr 27, 2015 at 10:07 AM, Adam Steel adamgst...@gmail.com wrote:
Stefan,
So I switched git versions.
$ git --version
git version 2.3.1
I'm still getting the same regular rebase failures.
---
fatal: Unable to create
'/Users/asteel/Repositories/rails-teespring/.git/index.lock':
26 matches
Mail list logo
