Am 6/17/2013 15:57, schrieb Mathieu Liénard--Mayor:
Le 2013-06-17 15:54, Peter Krefting a écrit :
Mathieu Liénard--Mayor:
Actually, at first I dealt with it this way:
status_printf_ln(s, color,
_(Splitting %s while rebasing branch '%s' on '%s'.),
stopped_sha ?
From: Johannes Sixt j...@kdbg.org
The bash on Windows rewrites paths that look like absolute POSIX paths
when they are a command-line argument of a regular Windows program, such
as git and the test helpers. As a consequence, the actual tests performed
are not what the tests scripts expect
Am 11.06.2013 19:06, schrieb Yann Droneaud:
Hi,
I'm trying to setup a workflow to track vendor releases (upstream).
Each new release are provided as an archive of source code, data,
documentation, etc.
For each vendor releases, fixes need to be applied before making them
available to
Am 10.06.2013 19:27, schrieb SZEDER Gábor:
My main motivation is that, like in your example, in the bash prompt
tests I only have to check a single line of output, but because of
debuggability I always did:
echo (master) expected
__git_ps1 actual
test_cmp expected actual
Chained by
Am 6/9/2013 22:31, schrieb Junio C Hamano:
Jeff King p...@peff.net writes:
I'm a little negative on handling just SIGTERM. That would make the test
pass, but does it really address the overall issue? To me, the
usefulness is having exit values with consistent meanings.
Yes. Unless the
From: Erik Faye-Lund kusmab...@gmail.com
Returning the SIGALRM handler for SIGINT is not very useful.
Signed-off-by: Erik Faye-Lund kusmab...@gmail.com
Signed-off-by: Johannes Sixt j...@kdbg.org
---
Am 6/7/2013 16:20, schrieb Erik Faye-Lund:
On Fri, Jun 7, 2013 at 3:07 PM, Johannes Sixt j.s
Am 08.06.2013 08:51, schrieb Torsten Bögershausen:
Filesystems like VFAT or NTFS allow to create files regardless of
the write permissions of the directory.
Therefore mktemp to unwritable directory in t0700 will always fail on
Windows using NTFS.
This TC has been disabled for MINGW, and
Am 6/6/2013 19:40, schrieb Jeff King:
On Thu, Jun 06, 2013 at 10:21:47AM -0700, Junio C Hamano wrote:
The particular deficiency is that when a signal is raise()d whose SIG_DFL
action will cause process death (SIGTERM in this case), the
implementation of raise() just calls exit(3).
After a
Am 6/7/2013 14:00, schrieb Erik Faye-Lund:
On Fri, Jun 7, 2013 at 12:24 PM, Johannes Sixt j.s...@viscovery.net wrote:
Am 6/7/2013 12:12, schrieb Erik Faye-Lund:
On Thu, Jun 6, 2013 at 7:40 PM, Jeff King p...@peff.net wrote:
On Thu, Jun 06, 2013 at 10:21:47AM -0700, Junio C Hamano wrote
Am 6/7/2013 14:46, schrieb Erik Faye-Lund:
On Fri, Jun 7, 2013 at 2:19 PM, Johannes Sixt j.s...@viscovery.net wrote:
Am 6/7/2013 14:00, schrieb Erik Faye-Lund:
On Fri, Jun 7, 2013 at 12:24 PM, Johannes Sixt j.s...@viscovery.net wrote:
Am 6/7/2013 12:12, schrieb Erik Faye-Lund:
diff --git
Am 07.06.2013 08:11, schrieb Martin von Zweigbergk:
Changes since v5:
* Improved test_linear_range
* Changed TODOs to be about consistency, not --topo-order
Martin von Zweigbergk (7):
add simple tests of consistency across rebase types
add tests for rebasing with patch-equivalence
MinGW's bash does not recognize an exit code -1 as failure. See also
47e3de0e (MinGW: truncate exit()'s argument to lowest 8 bits) and 2488df84
(builtin run_command: do not exit with -1). Exit code 1 is good enough.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
test-chmtime.c | 8
1
In particular:
- move test preparations inside test_expect_success
- place test description on the test_expect_success line
- indent with a tab
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t3010-ls-files-killed-modified.sh | 123 ++--
1 file changed, 61
on whether SYMLINKS is present or not; but this is not the case
presently.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t3030-merge-recursive.sh | 62 +++---
1 file changed, 26 insertions(+), 36 deletions(-)
diff --git a/t/t3030-merge-recursive.sh b/t
In t4023 and t4114, we have to remove the entries using 'git rm' because
otherwise the entries that must turn from symbolic links to regular files
would stay symbolic links in the index. For the same reason, we have to
use 'git mv' instead of plain 'mv' in t3509.
Signed-off-by: Johannes Sixt j
; the corresponding modernization
patch is gone.
- Moved the t4011 change from the trivial cases to its own patch.
It still contains the effects of the former test_ln_s, but open-coded
and with a comment.
Johannes Sixt (10):
test-chmtime: Fix exit code on Windows
t3010: modernize style
in the worktree, which we can update as if it were a
symbolic link. diff-index picks up the symbolic link property from the
index.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t4011-diff-symlink.sh | 35 +--
1 file changed, 25 insertions(+), 10 deletions(-)
diff
and get rid of explicit SYMLINKS checks.
This undoes the special casing introduced in this test by 704a3143
(Use prerequisite tags to skip tests that depend on symbolic links,
2009-03-04).
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t-basic.sh | 39 ++-
1
, where trivial means:
- merely a replacement of 'ln -s a b git add b' by test_ln_s_add
is needed;
- a test for symbolic link on the file system can be split off (and
remains protected by SYMLINKS);
- existing code is equivalent to test_ln_s_add.
Signed-off-by: Johannes Sixt j...@kdbg.org
From: Johannes Sixt j...@kdbg.org
The test case depends on that test-sigchain can commit suicide by a call
to raise(SIGTERM) in a way that run-command.c::wait_or_whine() can detect
as death through a signal. There are no POSIX signals on Windows, and a
sufficiently close emulation
Am 6/4/2013 19:18, schrieb Junio C Hamano:
Martin von Zweigbergk martinv...@gmail.com writes:
---
+#TODO: make all flavors of rebase use --topo-order
+test_run_rebase success 'e n o' ''
+test_run_rebase success 'e n o' -m
+test_run_rebase success 'n o e' -i
I do not quite follow this
Am 6/5/2013 1:45, schrieb Junio C Hamano:
* jk/test-exit-code-by-signal (2013-06-02) 1 commit
(merged to 'next' on 2013-06-03 at 25af892)
+ t0005: test git exit code from signal death
Will merge to 'master'.
I haven't gotten around to run this new test on Windows. I've reason to
believe
Am 04.06.2013 23:06, schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
There are many instances where the treatment of symbolic links in the
object model and the algorithms are tested, but where it is not
necessary to actually have a symbolic link in the worktree. Make
adjustments
Am 04.06.2013 23:55, schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 88be904..563ac7f 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -19,12 +19,7 @@ filesystem
Am 6/4/2013 7:14, schrieb Martin von Zweigbergk:
On Mon, Jun 3, 2013 at 3:28 PM, Junio C Hamano gits...@pobox.com wrote:
+
+# checks that the revisions in $2 represent a linear range with the
+# subjects in $1
+test_linear_range () {
+ ! { git log --format=%p $2 | sane_grep ;}
An
on whether SYMLINKS is present or not; but this is not the case
presently.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t3030-merge-recursive.sh | 62 +++---
1 file changed, 26 insertions(+), 36 deletions(-)
diff --git a/t/t3030-merge-recursive.sh b/t
This undoes the special casing introduced in this test by 704a3143
(Use prerequisite tags to skip tests that depend on symbolic links,
2009-03-04).
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t3100-ls-tree-restrict.sh | 42 +++---
1 file changed, 15
the subsequent
change to use test_ln_s_add would otherwise be rather inconvenient or
obscure.
Johannes Sixt (11):
test-chmtime: Fix exit code on Windows
t2100: modernize style and unroll a loop of test cases
t3010: modernize style
tests: introduce test_ln_s and test_ln_s_add
tests: use
In particular, move all test preparations inside test_expect_success.
In a subsequent patch, we are going to move test case path3 out of the
loop of test cases. Use this opportunity to linearize the tests.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t2100-update-cache-badpath.sh | 81
In t4023 and t4114, we have to remove the entries using 'git rm' because
otherwise the entries that must turn from symbolic links to regular files
would stay symbolic links in the index. For the same reason, we have to
use 'git mv' instead of plain 'mv' in t3509.
Signed-off-by: Johannes Sixt j
-by: Johannes Sixt j...@kdbg.org
---
The changes in t9500-gitweb-* were not tested on a system that does not
have SYMLINKS.
t/t1004-read-tree-m-u-wf.sh| 7 +++---
t/t2001-checkout-cache-clash.sh| 7 +++---
t/t2003-checkout-cache-mkdir.sh| 8 +++
t/t2004-checkout-cache
'test_must_fail git update-index'.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t2100-update-cache-badpath.sh | 14 ++
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/t/t2100-update-cache-badpath.sh b/t/t2100-update-cache-badpath.sh
index a3f9255..47a9b05 100755
--- a/t/t2100
In particular:
- move test preparations inside test_expect_success
- place test description on the test_expect_success line
- indent with a tab
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t3010-ls-files-killed-modified.sh | 123 ++--
1 file changed, 61
and get rid of explicit SYMLINKS checks.
This undoes the special casing introduced in this test by 704a3143
(Use prerequisite tags to skip tests that depend on symbolic links,
2009-03-04).
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t-basic.sh | 39 ++-
1
system.
Move these tests into separate test cases that remain protected by
SYMLINKS.
There is one instance of expect_failure. There is a possibility that this
test case fails differently depending on whether SYMLINKS is present or
not; but this is not the case.
Signed-off-by: Johannes Sixt j
Am 01.06.2013 13:11, schrieb Ramkumar Ramachandra:
Johannes Sixt wrote:
+test_ln_s () {
+ if test_have_prereq SYMLINKS
+ then
+ ln -s $1 $2
+ else
+ printf '%s' $1 $2
+ fi
+}
What is this? We can't test_ln_s something and then 'git
Am 31.05.2013 08:49, schrieb Martin von Zweigbergk:
+# f
+# /
+# a---b---c---g---h
+# \
+# d---G---i
+#\ \
+# e---u
+#
+# uppercase = cherry-picked
+# h = reverted g
...
+test_expect_success rebase -p --onto in merged history drops patches
Am 30.05.2013 04:55, schrieb Jeff King:
So while it would be nice to work on paths with colons everywhere, I
doubt it is worth the effort to start checking it through the whole test
suite.
And on top of it, on Windows, you can't have a path component or file
name that contains a colon...
--
Am 30.05.2013 07:30, schrieb Martin von Zweigbergk:
On Wed, May 29, 2013 at 12:09 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk:
+# f
+# /
+# a---b---c---g---h
+# \
+# d---G---i
...
+test_run_rebase () {
+ result
Am 5/29/2013 5:24, schrieb Felipe Contreras:
+if [ -z $script ]; then
+ local -a locations
+ locations=(
+ '/etc/bash_completion.d/git' # fedora, old debian
+ '/usr/share/bash-completion/completions/git' # arch, ubuntu,
new debian
+
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk:
+test_run_rebase () {
+ result=$1
+ shift
+ test_expect_$result rebase $* --onto --root with merge-base does not
go to root
+ reset_rebase
+ git rebase $* --onto m --root g
+ test_cmp_rev
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk:
+# a---b---c
+# \ \
+# d---e \
+#\ \ \
+# n---o---w---v
+# \
+# z
+#TODO: make all flavors of rebase use --topo-order
+test_run_rebase success 'e n o'
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk:
+# f
+# /
+# a---b---c---g---h
+# \
+# d---G---i
+#\ \
+# e---u
+#
+# uppercase = cherry-picked
+# h = reverted g
+test_expect_failure rebase -p --onto in merged history does not lose
Am 26.05.2013 19:58, schrieb Antoine Pelisse:
The goal of the patch is to introduce the GNU diff
-B/--ignore-blank-lines as closely as possible. The short option is not
available because it's already used for break-rewrites.
When this option is used, git-diff will not create hunks that
Am 18.05.2013 09:42, schrieb Andreas Leha:
Am 14.05.2013 15:17, schrieb Andreas Leha:
Hi all,
how can I make git ignore the time stamp(s) in a PDF. Two PDFs that
differ only in these time stamps should be considered identical.
...
What I tried is a filter:
,[ ~/.gitconfig ]
| [filter
Am 18.05.2013 20:55, schrieb John Keeping:
On Sat, May 18, 2013 at 08:43:57PM +0200, Peter Lauri wrote:
But I just don't want to see that darn file. It is a config file that
I have changed, and I don't want to need to stash it for each git
svn action I want to perform... Any solution for that?
Am 17.05.2013 19:02, schrieb Thomas Rast:
At this point the splitting has already happened in the caller when it
does the (refactored)
+ if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS
So $@ and $@ is actually the same thing.
Not in general: If you omit the double-quotes,
Am 5/16/2013 22:50, schrieb Thomas Rast:
+match_pattern_list () {
+ arg=$1
+ shift
+ test -z $* return 1
+ for pat in $@
You should have double-quotes around $@ here, but then you can just as
well abbreviate to
for pat
and you don't need the 'test -z $*' check
Am 5/15/2013 10:40, schrieb Luc Bourhis:
I work on a case insensitive filesystem and I have core.ignorecase set to
true.
...
So I thought it was a job for git filter-branch, ...
However because of those two blobs, I have:
~ git status
# modified: .../fourCircles.py
and git
Am 14.05.2013 15:17, schrieb Andreas Leha:
Hi all,
how can I make git ignore the time stamp(s) in a PDF. Two PDFs that
differ only in these time stamps should be considered identical.
...
What I tried is a filter:
,[ ~/.gitconfig ]
| [filter pdfresetdate]
| clean =
Am 5/8/2013 18:16, schrieb Matt McClure:
That begs a follow-up question. It sounds as though Git will typically
delete unreachable objects. My team often shares links like
https://git.example.com/foo.git/log/d59051721bb0a3758f7c6ea0452bac122a377645?hp=0055e0959cd13780494fe33832bae9bcf91e4a90
Am 5/10/2013 3:13, schrieb Junio C Hamano:
* On the other hand, git log 'fc/*' might be a handy thing for
any command that wants to have multiple starting points for
revision traversal, so in principle I would not mind such an
enhancement to rev-list machinery.
Currently, we spell
Am 5/10/2013 8:37, schrieb Junio C Hamano:
What if we teach git rebase to record, perhaps by default, an
ours merge on top of Y that takes the tree state of Y but has X as
its second parent, ...
Please let's not go that route...
-- Hannes
--
To unsubscribe from this list: send the line
Am 5/8/2013 16:19, schrieb Matt McClure:
My interpretation of that is that `git prune` will not prune packed objects
by default. The following behavior seems inconsistent with that
interpretation.
[git@438587-beefcake01 panama.git]$ git prune -n | wc -l
9210
You have 9210 unreachable,
Am 04.05.2013 00:46, schrieb Martin Langhoff:
I am building a small git wrapper around puppet, and one of the
actions it performs is auto-fastforwarding of branches without
checking them out.
In simplified code... we ensure that we are on a head called master,
and in some cases ppg commit,
Am 5/1/2013 22:34, schrieb Jeff King:
struct object *lookup_object(const unsigned char *sha1)
{
- unsigned int i;
+ unsigned int i, first;
struct object *obj;
if (!obj_hash)
return NULL;
- i = hashtable_index(sha1);
+ first = i =
Am 5/2/2013 8:46, schrieb Jeff King:
On Thu, May 02, 2013 at 08:44:07AM +0200, Johannes Sixt wrote:
Am 5/1/2013 22:34, schrieb Jeff King:
struct object *lookup_object(const unsigned char *sha1)
{
- unsigned int i;
+ unsigned int i, first;
struct object *obj;
if (!obj_hash
Am 01.05.2013 21:55, schrieb Vikrant Varma:
On 01-05-2013 17:53, Ramkumar Ramachandra wrote:
Vikrant Varma wrote:
+void help_unknown_ref(const char* ref) {
+int i;
+struct similar_ref_cb ref_cb;
+ref_cb.similar_refs = (struct string_list)STRING_LIST_INIT_NODUP;
Why
will run remote-testgit
logic from t5801
Here's my
Signed-off-by: Johannes Sixt j...@kdbg.org
for this part in case someone wants to pick it up:
diff --git a/git-remote-testgit b/git-remote-testgit
index b395c8d..ffac950 100755
--- a/git-remote-testgit
+++ b/git-remote-testgit
@@ -1,4 +1,4
Am 4/26/2013 10:19, schrieb Yann Dirson:
2. git rebase -i master fails unless I've rebased my branch on top of
master. I always wished I could do the equivalent of 'git rebase -i
master..', but I can't. Can we give the A..B syntax a new meaning in
the context of rebase, namely $(git
Am 4/25/2013 12:09, schrieb Michael J Gruber:
fc407f9 (Add new simplified git-remote-testgit, 2012-11-28) introduced a
test which was meant to skip the test unless the test shell is bash.
Unfortunately, it tests for the availability of bash only. But users can
opt to use a different shell
Am 4/25/2013 13:21, schrieb Michael J Gruber:
Johannes Sixt venit, vidit, dixit 25.04.2013 12:59:
Am 4/25/2013 12:09, schrieb Michael J Gruber:
fc407f9 (Add new simplified git-remote-testgit, 2012-11-28) introduced a
test which was meant to skip the test unless the test shell is bash
Am 4/23/2013 21:31, schrieb Junio C Hamano:
* fc/transport-helper-error-reporting (2013-04-17) 9 commits
(merged to 'next' on 2013-04-22 at 5ba6467)
+ transport-helper: update remote helper namespace
+ transport-helper: trivial code shuffle
+ transport-helper: warn when refspec is not
Am 4/24/2013 10:04, schrieb Felipe Contreras:
On Wed, Apr 24, 2013 at 2:57 AM, Johannes Sixt j.s...@viscovery.net wrote:
Am 4/23/2013 21:31, schrieb Junio C Hamano:
* fc/transport-helper-error-reporting (2013-04-17) 9 commits
(merged to 'next' on 2013-04-22 at 5ba6467)
+ transport-helper
Am 24.04.2013 18:28, schrieb John Keeping:
On Wed, Apr 24, 2013 at 09:21:38AM -0700, Junio C Hamano wrote:
J6t meant a patch to remove the entire case...esac and replace it
with a single liner (target=${target#$curdir/}).
Ah, I missed the six-liner part. But that doesn't work because we
From: Johannes Sixt j...@kdbg.org
Bash on Windows does not implement process substitution.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
Am 4/24/2013 10:30, schrieb Johannes Sixt:
Am 4/24/2013 10:04, schrieb Felipe Contreras:
On Wed, Apr 24, 2013 at 2:57 AM, Johannes Sixt j.s...@viscovery.net
Am 4/22/2013 11:24, schrieb Matthieu Moy:
Following the discussion on merge with uncommited changes inside the
git pull --autostash thread, I did a bit of testing, and encountered a
case with silent data loss. In short: merge a branch introducing changes
to a file. If the file has been renamed
Am 19.04.2013 18:45, schrieb Junio C Hamano:
John Keeping j...@keeping.me.uk writes:
On Thu, Apr 18, 2013 at 03:40:41PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
+relative_path ()
+{
+ local target curdir result
+ target=$1
+ curdir=${2-$wt_prefix}
+
Am 19.04.2013 18:33, schrieb Junio C Hamano:
Johannes Sixt j.s...@viscovery.net writes:
Am 4/18/2013 19:05, schrieb Junio C Hamano:
Johannes Sixt j.s...@viscovery.net writes:
From: Johannes Sixt j...@kdbg.org
MSYS bash interprets the slash in the argument core.commentchar=/
as root
Am 19.04.2013 21:24, schrieb Junio C Hamano:
Felipe Contreras felipe.contre...@gmail.com writes:
On Fri, Apr 19, 2013 at 12:08 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
The code finds the changes of a commit, runs 'git blame' for each
Am 4/18/2013 7:18, schrieb Ilya Basin:
desired result:
A---B---C origin/master
/
D---E---F---G---A'---B'---C' *master
Variant 1:
git branch -f tmp
git reset --hard origin/master
git rebase tmp
Variant 1a:
git reset --hard origin/master
git
From: Johannes Sixt j...@kdbg.org
MSYS bash interprets the slash in the argument core.commentchar=/
as root directory and mangles it into a Windows style path. Use a
different core.commentchar to dodge the issue.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t6200-fmt-merge-msg.sh | 6
Am 4/18/2013 10:33, schrieb Ilya Basin:
JS Perhaps this one:
JSgit merge origin/master
JSgit rebase ORIG_HEAD
JS -- Hannes
Wouldn't I have to resolve conflicts twice?
Yes. But you did run 'git config rerere.enabled true' when you started
with git, didn't you? ;-)
Anyway,
Am 4/18/2013 19:05, schrieb Junio C Hamano:
Johannes Sixt j.s...@viscovery.net writes:
From: Johannes Sixt j...@kdbg.org
MSYS bash interprets the slash in the argument core.commentchar=/
as root directory and mangles it into a Windows style path. Use a
different core.commentchar to dodge
Am 4/16/2013 4:50, schrieb Jeff King:
On Mon, Apr 15, 2013 at 07:34:07PM -0700, Brandon Casey wrote:
Right. My assumption was that we are primarily interested in protecting
against the die_routine. Compat functions should never be calling die.
I think the rule we have been enforcing is less
Am 4/16/2013 15:01, schrieb Jeff King:
On Tue, Apr 16, 2013 at 09:18:46AM +0200, Johannes Sixt wrote:
Yeah, that seems sane; my biggest worry was that it would create
headaches for Windows folks, who would have to emulate pthread_key. But
it seems like we already added support in 9ba604a
with
*.txt text
in its .gitattributes.
Then with current git, any text files checked out have LF line
endings, instead of the expected CRLF.
Cc: Johannes Schindelin johannes.schinde...@gmx.de
Cc: Johannes Sixt j...@kdbg.org
Signed-off-by: Jonathan Nieder jrnie...@gmail.com
Signed
Am 4/17/2013 3:38, schrieb Tim Chase:
I asked this on IRC and played with some of their ideas, but struck
out with anything satisfying. I walked through [1] with the
following setup:
git init foo
cd foo
touch a.txt b.txt
git add a.txt b.txt
git commit -m Initial checkin
Am 4/15/2013 5:04, schrieb Junio C Hamano:
Ramkumar Ramachandra artag...@gmail.com writes:
... In my proposal, the
precedence order branch.name.pushremote, remote.pushdefault,
branch.name.remote, remote.default, origin, remains the same: we
just want to change which branch that name refers
Am 4/8/2013 23:54, schrieb Jeff King:
Yeah, it would make sense for filter-branch to have a --map-commit-ids
option or similar that does the update. At first I thought it might take
two passes, but I don't think it is necessary, as long as we traverse
the commits topologically (i.e., you
Am 02.04.2013 00:48, schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
Using 'git rerere forget .' after a merge that involved binary files
runs into an infinite loop if the binary file contains a zero byte.
Replace a strchrnul by memchr because the former does not make progress
Am 02.04.2013 12:31, schrieb Felipe Contreras:
And persistent_waitpid() to recover the information from the last run.
I'm not a fan of this new API, because it looks like a workaround
for a problem that should have been solved in a cleaner way. But if
we can't avoid it, please also add a
Am 02.04.2013 21:18, schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
Does the three-way merge machinery replay recorded resolution for
such a binary file correctly (after your fix, that is)?
Yes, it does. It recognizes the binary-ness and picks 'our' side. Only
then comes
Using 'git rerere forget .' after a merge that involved binary files
runs into an infinite loop if the binary file contains a zero byte.
Replace a strchrnul by memchr because the former does not make progress
as soon as the NUL is encountered.
Signed-off-by: Johannes Sixt j...@kdbg.org
.
Signed-off-by: John Keeping j...@keeping.me.uk
---
On Mon, Mar 25, 2013 at 10:42:19AM +, John Keeping wrote:
On Mon, Mar 25, 2013 at 08:41:59AM +0100, Johannes Sixt wrote:
This is gross. Can't we do much better here? Difftool already keeps a
GIT_INDEX of the files in the temporary tree ($tmpdir
Forgot to mention: The patch passes t7800 on Windows.
Thanks,
-- Hannes
--
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
Am 3/26/2013 10:31, schrieb John Keeping:
On Tue, Mar 26, 2013 at 09:38:42AM +0100, Johannes Sixt wrote:
One question though: Do I understand correctly that the temporary
directories are leaked in the case of an edit conflict? If so, is it
worth a warning for the user to clean up the garbage
The series looks good, but I can't test it because it does not apply
anywhere here.
Am 3/23/2013 14:31, schrieb John Keeping:
Currently the difftool --dir-diff tests may or may not use symlinks
depending on the operating system on which they are run. In one case
this has caused a test failure
Am 3/24/2013 16:15, schrieb John Keeping:
Subject: [PATCH] difftool: don't overwrite modified files
After running the user's diff tool, git-difftool will copy any files
that differ between the working tree and the temporary tree. This is
useful when the user edits the file in their diff
Am 3/25/2013 11:35, schrieb John Keeping:
On Mon, Mar 25, 2013 at 08:26:52AM +0100, Johannes Sixt wrote:
The series looks good, but I can't test it because it does not apply
anywhere here.
It's built on top of da/difftool-fixes, is there some problem that stops
it applying cleanly on top
Am 3/21/2013 8:41, schrieb Johannes Sixt:
Am 3/20/2013 23:59, schrieb David Aguilar:
I started digging in and the @worktree_files (aka @worktree above)
is populated from the output of git diff --raw
Seeing the output filename in diff --raw implies that one of the
tests added output
Am 3/22/2013 11:00, schrieb John Keeping:
On Fri, Mar 22, 2013 at 08:13:46AM +0100, Johannes Sixt wrote:
Am 3/21/2013 8:41, schrieb Johannes Sixt:
Am 3/20/2013 23:59, schrieb David Aguilar:
I started digging in and the @worktree_files (aka @worktree above)
is populated from the output of git
Am 22.03.2013 20:36, schrieb John Keeping:
When 'git difftool --dir-diff' is using --no-symlinks (either explicitly
or implicitly because it's running on Windows), any working tree files
that have been copied to the temporary directory are copied back after
the difftool completes. This
Am 22.03.2013 20:36, schrieb John Keeping:
Remove the stdin_contains and stdin_doesnt_contain helper functions
which add nothing but hide the output of grep, hurting debugging.
Thanks. Patch looks good.
-- Hannes
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
Am 22.03.2013 23:32, schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
Am 22.03.2013 16:02, schrieb Junio C Hamano:
Vadim Zeitlin vz-...@zeitlins.org writes:
A C++ method start such as
void
foo::bar()
wasn't recognized by cpp diff driver as it mistakenly
, both tests pass with this patch.
Tested-by: Johannes Sixt j...@kdbg.org
Thanks,
-- Hannes
--
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
Am 3/20/2013 18:10, schrieb Junio C Hamano:
Johannes Sixt j.s...@viscovery.net writes:
From: Johannes Sixt j...@kdbg.org
MSYS bash considers the part /g in the sed expression s/./=/g as an
absolute path after an assignment, and mangles it to a C:/something
string. Do not attract bash's
Am 3/20/2013 23:59, schrieb David Aguilar:
I started digging in and the @worktree_files (aka @worktree above)
is populated from the output of git diff --raw
Seeing the output filename in diff --raw implies that one of the
tests added output to the index somehow. I do not see that
Am 3/21/2013 12:03, schrieb Jeff King:
I was fooling around with clang and noticed that it complains about the
int x = x construct under -Wall. That is IMHO a deficiency in clang,
since the idiom has a well-defined use in silencing -Wuninitialized
warnings.
IMO, that's a myth. The construct
From: Johannes Sixt j...@kdbg.org
Two tests use GIT_TRACE=3 to dump debugging information of git. On
Windows, however, bash is unable to set up file descriptor 3 correctly
for its child process, so that git reports Bad file descriptor on
every trace attempt. The 'git clone' test succeeds
901 - 1000 of 1147 matches
Mail list logo
