Am 10/2/2012 9:51, schrieb Angelo Borsotti:
This is the log of the second execution:
$ emptycommit
+ rm -rf local
+ mkdir local
+ cd local
+ git init
Initialized empty Git repository in d:/gtest/local/.git/
+ echo aaa
+ git add f1
warning: LF will be replaced by CRLF in f1.
The file
Am 10/2/2012 23:56, schrieb Angelo Borsotti:
The problem I am trying to solve is to push to a remote server the
source files only,
while keeping in the local repo both sources and binaries. To do it, I
keep an orphan
branch, [...]
# this is the commit on the master branch
git init
echo
Clicking on a line that connects commit nodes produces this error:
can't read cflist_top: no such variable
can't read cflist_top: no such variable
while executing
$cflist tag remove highlight $cflist_top.0 $cflist_top.0 lineend
(procedure highlightfile line 4)
invoked from within
Am 10/1/2012 12:41, schrieb Howard Miller:
- I have an existing (long standing) project in git with an upstream in github
- I added a subdirectory which I had forgotten was itself a git
project (i.e. it has its own .git directory)
- I committed the subdirectory (git add /path/to/subdir; git
Am 28.09.2012 14:04, schrieb Pete Wyckoff:
It does not notice chmod +x or -x; there is nothing
for this test to do.
Signed-off-by: Pete Wyckoff p...@padd.com
---
t/t9815-git-p4-submit-fail.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
From: Johannes Sixt j...@kdbg.org
Running make t3070-wildmatch aborts with this error:
$ make t3070-wildmatch
*** t3070-wildmatch.sh ***
# passed all 11 test(s)
1..11
cat t3070-wildmatch.sh t3070-wildmatch
/bin/sh.exe: t3070-wildmatch: File exists
make: *** [t3070-wildmatch
Am 9/26/2012 1:25, schrieb Junio C Hamano:
Johannes Sixt j.s...@viscovery.net writes:
Am 9/20/2012 21:46, schrieb Adam Spiers:
test_expect_success 'general options plus command' '
- test_completion git --version check checkout
- test_completion git --paginate check checkout
Am 21.09.2012 22:25, schrieb Joshua Jensen:
- Original Message -
From: Junio C Hamano
Date: 9/21/2012 2:04 PM
Joshua Jensen jjen...@workspacewhiz.com writes:
Is there any particular reason you do that as two separate steps?
It would feel more natural, at least to me, to do something
From: Johannes Sixt j...@kdbg.org
We have now an explicit UI to edit the todo sheet and need not disclose
the name of the file.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
git-rebase--interactive.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/git-rebase
Am 9/19/2012 22:24, schrieb Adam Spiers:
skip)
- tput bold; tput setaf 2;; # bold green
+ tput setaf 4;;# blue
It's unreadable on black background. Keep it bold; that works on both
black and white background.
-- Hannes
--
To
Am 9/18/2012 8:31, schrieb Martin von Zweigbergk:
Add more test cases to check that the topology after a rebase is as
expected. Conflicts are not considered, but patch-equivalence is.
---
Tests pass and fail as indicated by the suffix
(_success/_failure). Your input especially appreciated
Am 9/18/2012 13:20, schrieb Matthieu Moy:
Johannes Sixt j.s...@viscovery.net writes:
From: Johannes Sixt j...@kdbg.org
When the todo sheet of interactive rebase instructs to run a non-existing
command, the operation stops with the following error:
Execution failed: no-such
You can
Am 9/18/2012 17:01, schrieb Yi, EungJun:
--index-filter git rm --cached -qr -- . git reset -q -- filename
Hmm... I tried as you said, but it seems to lose history.
I think it should be '... git reset -q $GIT_COMMIT -- filename'
-- Hannes
--
To unsubscribe from this list: send the line
Am 9/14/2012 15:03, schrieb Michael J Gruber:
git replaces $Id$... upon checkout. Any byte sequence that begins
with $Id: and ends with $ in the worktree file is replaced with $Id$
upon check-in.
Now, the there are two problems after you add $Id$ and check-in
(commit):
- commit does not
Am 14.09.2012 18:58, schrieb Erik Faye-Lund:
tput () {
case $1 in
bold)
- echo -ne \033[1m ;;
+ printf \033[1m ;;
setaf)
- echo -ne \033[0;3$2m ;;
+ printf
Am 14.09.2012 20:11, schrieb Erik Faye-Lund:
On Fri, Sep 14, 2012 at 7:28 PM, Johannes Sixt j...@kdbg.org wrote:
printf '\033[0;3%sm' $2 ;;
Is there a reason for %s rather than %d? It seem it only takes
integers,..
No reason. I just mechanically converted your
Am 10.09.2012 18:14, schrieb Andrew Wong:
Occasionally, while I'm in the middle of an interactive rebase, I'd change my
mind about the todo list and want to modify it. This means manually digging
out the todo file from the rebase directory, and invoking the editor. So I
thought it might be
Am 10.09.2012 18:54, schrieb Jeff King:
On Mon, Sep 10, 2012 at 12:46:45PM -0400, Andrew Wong wrote:
Just edit may be a bit misleading, as we already have the edit
action inside the todolist. I'd call this --edit-list to avoid
ambiguity.
I thought that might be a bit confusing too.
Am 09.09.2012 19:01, schrieb Ralf Thielow:
If core.ignorecase is true, git blame fails
when the given path differs to the real path in case
sensitivity.
...
+ dir = opendir(res.buf);
...
+ struct dirent *ent = readdir(dir);
...
Am 9/4/2012 10:14, schrieb mhag...@alum.mit.edu:
From: Michael Haggerty mhag...@alum.mit.edu
There is currently a bug: if passed an absolute top-level path that
doesn't exist (e.g., /foo) it incorrectly interprets the path as a
relative path (e.g., returns $(pwd)/foo). So mark the test as
Am 9/4/2012 10:14, schrieb mhag...@alum.mit.edu:
From: Michael Haggerty mhag...@alum.mit.edu
These tests already pass, but make sure they don't break in the
future.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
It would be great if somebody would check whether these tests
Am 04.09.2012 19:23, schrieb Joachim Schmitz:
From: Junio C Hamano [mailto:gits...@pobox.com]
Only with the observation of clone, I cannot tell if your timer is
working. You can try repacking the test repository you created by
your earlier git clone with git repack -a -d -f and see what
Am 03.09.2012 21:26, schrieb Junio C Hamano:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
fetch does printf(%-*s, width, foo) where foo can be an utf-8
string, but width is bytes, not letters. This results in misaligned
ref summary table.
but width is bytes, not letters is a misleading
Am 01.09.2012 09:43, schrieb Marco Stornelli:
Il 31/08/2012 23:35, Johannes Sixt ha scritto:
Am 31.08.2012 16:09, schrieb Marco Stornelli:
+CCS=`perl -e 'local $/=undef; open FILE, $ENV{'PATCHTMP'};
$text=FILE;
+close FILE; $addr = $1 if $text =~ /Cc: (.*?(,\n .*?)*)\n/s; $addr
=~ s/\n//g
Am 31.08.2012 16:09, schrieb Marco Stornelli:
+CCS=`perl -e 'local $/=undef; open FILE, $ENV{'PATCHTMP'}; $text=FILE;
+close FILE; $addr = $1 if $text =~ /Cc: (.*?(,\n .*?)*)\n/s; $addr =~
s/\n//g;
+print $addr;'`
The quoting is broken in this line (sq within sq does not work).
Am I correct
Am 22.08.2012 19:00, schrieb Brandon Casey:
So I think the body of [compat_mkdir] can become
something like:
if (len dir[len-1] == '/')
dir = tmp_dir = xstrndup(dir, len-1);
Don't use x* wrappers in the compat layer, at least not those that
allocate memory: They behave
Am 22.08.2012 20:02, schrieb Joachim Schmitz:
From: Johannes Sixt [mailto:j...@kdbg.org]
Don't use x* wrappers in the compat layer, at least not those that allocate
memory: They behave unpredictably due to try_to_free_routine and may lead
to recursive invocations.
I was just following
Am 21.08.2012 17:42, schrieb Tim Chase:
On 08/21/12 10:22, Thomas Rast wrote:
misleadingly suggesting that the change occurred in the call_me()
function, rather than in main()
I think that's intentional, and matches what 'diff -p' does...
Okay...I tested diff -p and can't argue (much) with
Am 8/20/2012 12:36, schrieb Joachim Schmitz:
int var = var;
char *othervar = othervar;
...
What is the reason for using that self-init stuff? I don't think it is
really portable, is it?
It is used to avoid var may be used uninitialized warnings for some
compilers. Officially (according
Am 19.08.2012 16:50, schrieb Ramsay Jones:
Brian Gernhardt wrote:
I've been getting a couple of test failures and finally had the
time to track them down.
t4034-diff-words fails tests 22 diff driver 'bibtex' and 26 diff
driver 'html'. Bisecting shows that the file started giving me
errors
Am 8/17/2012 1:35, schrieb Pete Wyckoff:
+++ b/t/t9815-git-p4-submit-fail.sh
@@ -0,0 +1,93 @@
+
+#!/bin/sh
This initial blank line is an accident, right? ;-)
-- Hannes
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Am 10.08.2012 18:27, schrieb Shawn Pearce:
There is no need to define your own mmap(). Define NO_MMAP=1 in the
Makefile. Git already has its own fake mmap and knows how to write it
back to disk when making changes.
Or better to say: the fake mmap has functionality that is sufficient for
git.
Am 8/8/2012 14:05, schrieb Nguyen Thai Ngoc Duy:
uOn Wed, Aug 8, 2012 at 6:17 PM, Thomas Gummerer t.gumme...@gmail.com wrote:
+static struct cache_entry *read_entry(struct directory_entry *de,
+ unsigned long *entry_offset,
+ void **mmap,
+
The Makefile already offers the variable $(FIND) and uses it except in one
place. Fix it.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
For my Windows builds, I need FIND=/usr/bin/find in config.mak because
I have /usr/bin is too late in PATH to override MS's incompatible 'find'.
Makefile
Am 24.07.2012 14:17, schrieb Chris Webb:
There is a bug with git rebase -i --root when a fixup or squash line is
applied to the new root. We attempt to amend the commit onto which they
apply with git reset --soft HEAD^ followed by a normal commit. Unlike a
real commit --amend, this sequence will
Am 31.07.2012 14:48, schrieb Chris Webb:
Chris Webbch...@arachsys.com writes:
If we have a conflict in the middle of a chain of fixup/squashes, as far as
I can see, we have a HEAD with all the previous successful fixups applied,
conflict markers for the current failed pick, and when the
Am 7/19/2012 23:20, schrieb Alexey Muranov:
On 19 Jul 2012, at 19:34, Konstantin Khomoutov wrote:
On Thu, 19 Jul 2012 18:21:21 +0200 Alexey Muranov
alexey.mura...@gmail.com wrote:
[...]
I do not still understand very well some aspects of Git, like the
exact purpose of remote tracking
Am 7/18/2012 9:27, schrieb Martin von Zweigbergk:
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 37c1b23..fe3fdd1 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -16,11 +16,9 @@ skip)
;;
esac
-test -n $rebase_root root_flag=--root
test -n $keep_empty
Am 20.07.2012 11:49, schrieb Michael Haggerty:
Other possibilities (according to git-check-ref-format(1)):
refs/.heads/.a/.b/c
refs/heads./a./b./c (problematic on some Windows filesystems?)
Yes. Probably all filesystems.
refs/heads../a../b../c
Same here.
Am 20.07.2012 17:44, schrieb Jeff King:
So I think a suffix like :d is probably the least horrible.
Not so. It does not work on Windows :-( in the expected way. Trying to
open a file with a colon-separated suffix either opens a resource fork
on NTFS or fails with invalid path.
-- Hannes
--
To
Am 7/18/2012 8:20, schrieb Martin von Zweigbergk:
On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman nhor...@tuxdriver.com wrote:
pick_one () {
ff=--ff
+
case $1 in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
case $force_rebase in '') ;; ?*) ff= ;; esac
output git
Am 7/17/2012 12:55, schrieb Carlos Martín Nieto:
But more important would be /why/ you feel that rebase -i is the tool
you should be using. If you'd like to move the branch pointer back,
that's what the reset command is for.
Perhaps because that's not what the OP wanted to do?
Sometimes it
From: Johannes Sixt j...@kdbg.org
For some reason, 'echo X | dd bs=1k seek=1' creates a file with 2050 bytes
on Windows instead of the expected 1026 bytes, so that a test fails. Since
the actual contents of the file are irrelevant as long as there is at
least one zero byte so that the diff
Am 7/12/2012 1:30, schrieb Junio C Hamano:
- test $(wc -l actual) = 16
+ test $(wc -l actual) = 16
We have a helper function for this:
test_line_count = 16 actual
-- Hannes
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Am 11.07.2012 23:08, schrieb Jens Lehmann:
Am 11.07.2012 22:39, schrieb Johannes Sixt:
At this point we can be in a subdirectory of the worktree. With
cd_to_toplevel we move up in the directory hierarchy (cd out). Then a
relative $gitdir or $sm_path now points to the wrong directory
Am 11.07.2012 20:11, schrieb Jens Lehmann:
Since 69c305178 (submodules: refactor computation of relative gitdir path)
cloning a submodule recursively fails for recursive submodules when a
symbolic link is part of the path to the work tree of the superproject.
This happens when module_clone()
Am 11.07.2012 22:06, schrieb Jens Lehmann:
Am 11.07.2012 21:10, schrieb Johannes Sixt:
Am 11.07.2012 20:11, schrieb Jens Lehmann:
Since 69c305178 (submodules: refactor computation of relative gitdir path)
cloning a submodule recursively fails for recursive submodules when a
symbolic link
1101 - 1147 of 1147 matches
Mail list logo
