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/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 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/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 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/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/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
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 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
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 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/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 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 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/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 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 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 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.09.2013 10:24, schrieb Jiang Xin:
I have checked the behavior of UNC path on Windows (msysGit):
* I can cd to a UNC path:
cd //server1/share1/path
* can cd to other share:
cd ../../share2/path
* and can cd to other server's share:
cd ../../../server2/share/path
From: Johannes Sixt j...@kdbg.org
Provide PRId64 alongside PRIuMAX.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
I thought I had compiled 'next' on Windows recently...
This is an emergency fix for a compile error in 'master'.
compat/mingw.h | 1 +
1 file changed, 1 insertion(+)
diff
Am 19.09.2013 15:39, schrieb Ralf Baechle:
The original patch that introduced the symlink with the \n is kernel
commit 3b29aa5ba204c62b3ec8f9f5b1ebd6e5d74f75d3 and is archived in
patchwork at http://patchwork.linux-mips.org/patch/5745/ The patch
file contains a \n at the end - but one would
Am 21.09.2013 13:47, schrieb Felipe Contreras:
diff --git a/Makefile b/Makefile
index 3588ca1..18081bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1010,7 +1010,7 @@ ifndef sysconfdir
ifeq ($(prefix),/usr)
sysconfdir = /etc
else
-sysconfdir = etc
+sysconfdir = $(prefix)/etc
Not good:
Am 9/27/2013 14:10, schrieb Ramkumar Ramachandra:
+ else if (!strcmp(formatp, track)
+ !prefixcmp(name, upstream)) {
+ char buf[40];
+
+ if (!upstream_present)
+
Am 10/9/2013 12:32, schrieb Paolo Giarrusso:
On Wed, Oct 9, 2013 at 12:20 PM, Tay Ray Chuan rcta...@gmail.com wrote:
On Wed, Oct 9, 2013 at 11:57 AM, Paolo G. Giarrusso
p.giarru...@gmail.com wrote:
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index
Am 10.10.2013 17:52, schrieb Sebastian Schuberth:
Hi again,
the problem can also be reproduced in an easier way, independently of
mingwGitDevEnv and using the mingw_path function instead of
relative_path. If I install msysGit 1.8.4 from [1] and run
test-path-utils I get this on Windows
Am 10.10.2013 21:47, schrieb Sebastian Schuberth:
So the obvious thing would be to replace /a/b/ with
/foo/bar/ in the tests, but that just masks the problem, or?
The strange behavior is not a problem in Git, it is a problem of MSYS.
Using /foo/bar instead of /a/b in Git's test suite is a
Am 10/16/2013 1:57, schrieb Jonathan Nieder:
Junio C Hamano wrote:
You just made these two that the user clearly meant to express two
different things indistinguishable.
opt.sh -S
opt.sh -S ''
[...]
And that is exactly why gitcli.txt tells users to use the 'sticked'
form, and
Am 21.10.2013 03:31, schrieb Duy Nguyen:
On Mon, Oct 21, 2013 at 12:57 AM, Antoine Pelisse apeli...@gmail.com wrote:
My main motive was to not *stop* the process when a long path is met.
Because somebody created a repository on Linux with a long file-name
doesn't mean you should not be able to
Am 10/24/2013 7:25, schrieb Duy Nguyen:
On Thu, Oct 24, 2013 at 11:11 AM, Nasser Grainawi nas...@codeaurora.org
wrote:
It is not clear to me how you envision to make it work.
I don't have the source code.
Now you do:
Am 10/24/2013 22:04, schrieb Junio C Hamano:
Johannes Sixt j.s...@viscovery.net writes:
That said, I don't think that --change-id option that the user must not
forget to use is any better than a hook that the user must not forget to
install.
That is why I said this in my first response
Am 10/25/2013 0:21, schrieb Junio C Hamano:
+test_expect_success 'using reflog to find the fork point' '
+ git reset --hard
+ git checkout -b base $E
+
+ for count in 1 2 3 4 5
+ do
+ git commit --allow-empty -m Base commit #$count
+ git rev-parse
Am 10/25/2013 10:09, schrieb John Keeping:
On Fri, Oct 25, 2013 at 09:12:10AM +0200, Johannes Sixt wrote:
You could put the loops into a function from which you 'return', but that
is obscure in this case. The first iteration was better, IMO.
Wouldn't it be simpler to just return from
is opened during the test run. Request man
format explicitly to keep the test silent.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
I've posted this patch to the msysgit list in July, and Dscho has picked
it up for Git on Windows.
t/t3200-branch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/lib-credential.sh | 4
t/t7407-submodule-foreach.sh | 4
t/t9001-send-email.sh| 1 -
3 files changed, 9 deletions(-)
diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index 3c43ff1..957ae93 100755
--- a/t/lib
.
Patch 1 replaces test_cmp with cmp when binary data is compared.
Patch 2 is the actual fix.
Patch 3 removes some work-arounds that are not necessary anymore.
Johannes Sixt (3):
t5300-pack-object: do not compare binary data using test_cmp
Windows: a test_cmp that is agnostic to random LF CRLF
Users may set test_cmp to a comparison tool of their liking. The intent is
that the tool performs comparison of line-oriented texts. However, t5300
uses it also to compare binary data. Change those tests to use 'cmp'.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/t5300-pack-object.sh | 10
a diff tool that undoes the converted CRLF. To avoid that
sub-processes are spawned (which is very slow on Windows), the tool is
implemented as a shell function. Diff is invoked as usual only when a
difference is detected by the shell code.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
t/test-lib
Am 28.10.2013 10:13, schrieb Ben Walton:
Solaris' tr (both /usr/bin/ and /usr/xpg4/bin) uses the System V
semantics for tr whereby string1's length is truncated to the length
of string2 if string2 is shorter. The BSD semantics, as used by GNU tr
see string2 padded to the length of string1
Am 28.10.2013 20:22, schrieb Jonathan Nieder:
The git build system supports a NO_PERL switch to avoid installing
perl bindings or other features (like git add --patch) that rely on
perl on runtime, but even with NO_PERL it has not been possible for a
long time to run tests without perl.
Just a heads-up: This patch breaks t5601 totally on Windows. Test #4, a
local clone via file: protocol, fails already. I'm investigating now.
-- 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
Am 10/29/2013 22:07, schrieb Torsten Bögershausen:
@@ -610,17 +623,17 @@ struct child_process *git_connect(int fd[2], const char
*url_orig,
} else
end = host;
- path = strchr(end, c);
- if (path !has_dos_drive_prefix(end)) {
- if (c == ':') {
-
Am 10/30/2013 11:58, schrieb Nicolas Cornu:
This scrollbar is not optional and is useful if there is a lot of tags or
branches.
If this is the only case where the scrollbar is useful, i.e., it would
be handy only once every other week, then it is better to remember that
you can pan around in
Am 01.11.2013 20:34, schrieb Junio C Hamano:
In $gmane/234730, J6t pointed out that rev-list --exclude needs a
matching updates to the globbing option rev-parse supports.
Here is a follow-up to do just that. They are meant to be applied on
top of the two patch series that has been cooking in
Am 02.11.2013 21:33, schrieb Sebastian Schuberth:
On 26.10.2013 21:17, Johannes Sixt wrote:
In a number of tests, output that was produced by a shell script is
compared to expected output using test_cmp. Unfortunately, the MSYS
bash--
when invoked via git, such as in hooks--converts LF
Am 02.11.2013 21:47, schrieb Sebastian Schuberth:
So maybe it's a good point now to also change the MINGW prerequisite
name to MSYS as part of your patch, and then name the functions more
appropriately?
It's too late. The series is already in master, and I see no point in a
follow-up patch of
Am 11/4/2013 22:20, schrieb Torsten Bögershausen:
Bug fix for msygit in t5601 : use $PWD insted of $(pwd)
Not really. $PWD is /c/foo/bar style, but $(pwd) is c:/foo/bar, which is
equally good.
test_expect_success 'clone with excess parameters (2)' '
rm -fr dst
- test_must_fail
() uses start_command() to invoke the command; consequently,
the limits of the system still apply, but are diagnosed only at execve()
time. But these limits are more lenient than the 1K that git_connect()
imposed.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
Am 05.11.2013 08:14, schrieb Johannes
git_connect has grown large due to the many different protocols syntaxes
that are supported. Move the part of the function that parses the URL to
connect to into a separate function for readability.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
Apart from this simplification, the protocol
Am 05.11.2013 21:45, schrieb Torsten Bögershausen:
On 2013-11-05 20.39, Johannes Sixt wrote:
Thanks for picking this up, please see some minor nits inline,
and git_connect() is at the end
-struct child_process *git_connect(int fd[2], const char *url_orig
Am 09.11.2013 01:48, schrieb Jason St. John:
-`--since=date1` limits to commits newer than `date1`, and using it
-with `--grep=pattern` further limits to commits whose log message
+'\--since=date1' limits to commits newer than `date1`, and using it
+with '\--grep=pattern' further limits to
Am 09.11.2013 12:35, schrieb Torsten Bögershausen:
On 2013-11-08 23.29, Jeff King wrote:
On Fri, Nov 08, 2013 at 06:10:30PM +0100, Torsten Bögershausen wrote:
Side question:
Do we have enough test coverage for htonll()/ntohll(),
or do we want do the module test which I send a couple of days
Am 11.11.2013 22:29, schrieb Jens Lehmann:
The diff below fixes the problem you describe for me. (But I do not
consider it a worthwhile fix in its current form because a line
starting with Submodule might appear in a perfectly normal commit
message, while diff --git most probably won't).
Am 11/20/2013 4:49, schrieb Matthew Cengia:
The other day I was merging a feature branch (shown below as
origin/22869-new-kernel) into my staging release (shown below as 'wtf'),
and it *reverted* a bucket-load of changes I'd made on other branches
which had been merged into staging before. I
Am 11/20/2013 13:03, schrieb Matthew Cengia:
The only changes I expect are these:
mattcen@sonar:prisonpc(wtf)$ git --no-pager diff --numstat --oneline
\ $(git merge-base wtf origin/22869-new-kernel)
origin/22869-new-kernel 37 0 client/kernel/README 2797
0
Am 11/20/2013 12:47, schrieb Alexander GQ Gerasiov:
1. I have repository with tree like this:
dir1/
file1
file2
file3
dir2/
subdir1/
some files
2. Current branch is B.
3. I want to get dir1 from branch A, and save it's content on current
Am 20.11.2013 22:09, schrieb Eris Belew:
System: Windows Server 2008 R2
Git: git version 1.8.4.msysgit.0
Shell: Powershell V3 (No third-party modules loaded)
Summary:
When specifying a pathspec including a branch/commit, path separator
characters are not translated. Since tab-completion
Am 23.11.2013 14:18, schrieb Heikki Hokkanen:
If bash.prompt is set to false, disable the prompt. This is useful
for huge repositories like the home directory.
Signed-off-by: Heikki Hokkanen h...@users.sf.net
---
git-prompt.sh performance seems to be quite bad for big repositories, so
Am 11/26/2013 0:43, schrieb Jonathan Nieder:
Heikki Hokkanen wrote:
If running git config on each prompt seems too expensive, do you have
any better ideas?
Perhaps a GIT_PS1_NOT_FOR_THESE_REPOS=repo1:repo2:repo3 setting would
work.
Yeah, but... I find the wish to show the bash prompt in
Am 12/9/2013 3:23, schrieb Brett Randall:
* fixup! or squash! on it's own would default to fixing-up the
previous commit (or result of previous step of rebase if that was a
squash/fixup).
Why would you want that? To fixup the previous commit, just use 'git
commit --amend'. What am I missing?
From: Johannes Sixt j...@kdbg.org
The recent 5de460a2 (Refactor per-line part of getblobdiffline and its
support) introduced blobdiffmaybeseehere, and accidentally forgot the '$'
to access the parameter as a TCL variable. This resulted in a failing
Back button with the error
can't use non
Am 12/18/2013 15:53, schrieb Nguyễn Thái Ngọc Duy:
The code that's not converted to use parse_options() often does
if (!starts_with(arg, foo=)) {
value = atoi(arg + 4);
}
This patch removes those magic numbers with skip_prefix()
Signed-off-by: Nguyễn Thái Ngọc Duy
Am 5/22/2014 10:38, schrieb Elia Pinto:
2014-05-22 8:49 GMT+02:00 Matthieu Moy matthieu@grenoble-inp.fr:
Elia Pinto gitter.spi...@gmail.com writes:
@@ -1059,13 +1059,17 @@ cmd_summary() {
while read mod_src mod_dst sha1_src sha1_dst status sm_path
do
Am 5/22/2014 15:19, schrieb David Kastrup:
Torsten Bögershausen tbo...@web.de writes:
On 2014-05-22 14.48, Elia Pinto wrote:
Found by check-non-portable-shell.pl
Thanks for picking this up
-export TEST_DIRECTORY=$(pwd)/../../../t
+TEST_DIRECTORY=$(pwd)/../../../t export TEST_DIRECTORY
Am 5/26/2014 20:56, schrieb Caleb Thompson:
Signed-off-by: Caleb Thompson ca...@calebthompson.io
---
t/t7507-commit-verbose.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
index 6d778ed..3b06d73 100755
---
Please do not cull the Cc list.
Am 5/27/2014 8:14, schrieb Jeremiah Mahler:
On Tue, May 27, 2014 at 07:46:59AM +0200, Johannes Sixt wrote:
Am 5/26/2014 20:56, schrieb Caleb Thompson:
Signed-off-by: Caleb Thompson ca...@calebthompson.io
---
t/t7507-commit-verbose.sh | 2 +-
1 file changed
Am 5/28/2014 8:14, schrieb Jeremiah Mahler:
From signal(2)
The behavior of signal() varies across UNIX versions, and has also var‐
ied historically across different versions of Linux. Avoid its use:
use sigaction(2) instead. See Portability below.
This patch set replaces calls
Am 6/1/2014 20:10, schrieb Jeremiah Mahler:
Due to portability issues across UNIX versions sigaction(2) should be used
instead of signal(2).
From the signal(2) man page:
The behavior of signal() varies across UNIX versions, and has also var‐
ied historically across different versions
to tame down the subject line
if you think it's too strong ;)
--- 8 ---
From: Johannes Sixt j...@kdbg.org
Subject: [PATCH] fix brown paper bag breakage in t5150-request-pull.sh
The recent addition to the test case 'pull request format' interrupted
the single-quoted text, effectively adding a third
Am 6/1/2014 20:10, schrieb Jeremiah Mahler:
This is version 3 of the patch set to convert signal(2) to sigaction(2)
(previous discussion [1]).
[1]: http://marc.info/?l=gitm=140148352416926w=2
Changes in this revision include:
- Using NULL pointers instead of 0 as per the
Am 6/4/2014 5:13, schrieb David Turner:
It is possible to have two branches which are the same but for case.
This works great on the case-sensitive filesystems, but not so well on
case-insensitive filesystems. It is fairly typical to have
case-insensitive clients (Macs, say) with a
Am 05.06.2014 10:05, schrieb Stepan Kasal:
mingw.c defines several wrapper functionsi, like mingw_unlink().
These wrappers are deployed by macros like this:
#define unlink mingw_unlink
The function itself is preceded by #undef, leaving the wrapper out
of the game for the rest of
Am 07.06.2014 08:07, schrieb Arup Rakshit:
Hi,
I am working in a project, where I am using *Git*. Today, I have been advised
by my manager to do some change and it was an urgent request. I did the
change
and tested also, All was working fine. The big mistake I did, all the changes
I
Am 6/10/2014 1:05, schrieb Junio C Hamano:
Junio C Hamano gits...@pobox.com writes:
David Turner dtur...@twopensource.com writes:
Since Junio has picked up the first patch from previous versions of
this series, I'm just going to send the second (SSE) one. I decided
not to
Am 6/10/2014 1:23, schrieb Junio C Hamano:
Elia Pinto gitter.spi...@gmail.com writes:
@@ -1059,13 +1059,17 @@ cmd_summary() {
while read mod_src mod_dst sha1_src sha1_dst status sm_path
do
# Always show modules deleted or type-changed
Am 6/10/2014 8:52, schrieb Johannes Sixt:
Am 6/10/2014 1:23, schrieb Junio C Hamano:
Elia Pinto gitter.spi...@gmail.com writes:
@@ -1059,13 +1059,17 @@ cmd_summary() {
while read mod_src mod_dst sha1_src sha1_dst status sm_path
do
# Always show
Am 6/10/2014 16:55, schrieb Junio C Hamano:
Elia Pinto gitter.spi...@gmail.com writes:
@@ -832,7 +832,7 @@ Maybe you want to use 'update --init'?)
continue
fi
-if ! test -d $sm_path/.git -o -f $sm_path/.git
+if ! test -d
Am 12.06.2014 01:28, schrieb Pasha Bolokhov:
+test_expect_success setup '
+ mkdir repo-inside/
+ (
+ cd repo-inside/
+ for f in a b c d
+ do
+ echo DATA $f || exit 1
+ done
+ mkdir dir1 dir1/meta
Am 07.06.2014 09:57, schrieb Stepan Kasal:
From: Karsten Blees bl...@dcon.de
Date: Sat, 14 Jan 2012 22:24:19 +0100
Winansi.c has many static variables that are accessed and modified from
the [v][f]printf / fputs functions overridden in the file. This may cause
multi threaded git commands that
Am 13.06.2014 03:38, schrieb Joey Hess:
If git merge --no-commit is used to merge a commit adding a
file with an unusual mode -- specifically a symlink which has mode 12,
it fails to stage the right mode into the index.
This only happens when core.symlinks=false. I noticed it on FAT, but
Am 6/13/2014 14:33, schrieb Michael J Gruber:
with this loop, sorry:
for X in true false; do
for Y in false true; do
($X $Y || exit 1)
done
echo $X/last inner $Y: $?
done
gives
true/last inner true: 0
false/last inner true: 1
even though on both cases
Am 6/13/2014 15:06, schrieb Michael J Gruber:
Johannes Sixt venit, vidit, dixit 13.06.2014 14:54:
Am 6/13/2014 14:33, schrieb Michael J Gruber:
with this loop, sorry:
for X in true false; do
for Y in false true; do
($X $Y || exit 1)
done
echo $X/last inner $Y
Am 6/13/2014 15:31, schrieb Michael J Gruber:
rewrite of the form
a
b
test_must_fail c
d || exit 1
hoping that will make things both readable (by avoiding !) and concise
(by avoiding repeated exits).
Thanks!
Please note that we use 'test_must_fail' only for git invocations, but we
Am 18.06.2014 19:33, schrieb Junio C Hamano:
In the meantime, are Windows folks happy with the four topics queued
on 'pu' so far? I would like to start moving them down to 'next'
and to 'master' soonish.
They consist of these individual patches:
$ git shortlog ^master \
Am 27.06.2014 00:02, schrieb Junio C Hamano:
Four mingw series are still in limbo--are they in good enough shape
for Windows folks who wanted to upstream them?
I've now tested the Unicode patches a bit, and I didn't notice a
regression in my use-cases. The patches are good to go, IMHO.
--
Am 7/1/2014 6:26, schrieb Torsten Bögershausen:
And as test -n tests for a non-zero string,
could we write like this (and drop the local ?)?
if test -n $1
then
dir=$1/
else
dir=
fi
These six lines can be written as
dir=$1${1:+/}
and 'local'
Am 08.07.2014 21:34, schrieb Jens Lehmann:
And Msysgit complains
error: fchmod on c:/xxxt/trash
directory.t7613-merge-submodule/submodule_update_repo/.git/modules/sub1/config.lock
failed: Function not implemented
I'm not sure what this is about, seems to happen during the cp -R of
the
It looks like I totally missed the topic sk/mingw-unicode-spawn-args.
Now it's in master, and it breaks lots of test cases for me:
t0050-filesystem
t0110-urlmatch-normalization
t4014-format-patch
t4041-diff-submodule-option
t4120-apply-popt
t4201-shortlog
t4205-log-pretty-formats
401 - 500 of 1147 matches
Mail list logo
