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 to
Philip Oakley wrote:
From: Ramkumar Ramachandra artag...@gmail.com
Sent: Wednesday, March 20, 2013 12:44 PM
This follows-up [1], with three important differences:
1. pushremote_get() and remote_get() share code better. Thanks Jeff.
2. All spelling mistakes have been corrected. Thanks
Tay Ray Chuan wrote:
On Wed, Mar 20, 2013 at 8:44 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
remote.c: introduce remote.pushdefault
remote.c: introduce branch.name.pushremote
Perhaps we should clarify how this differs from remote.pushurl in the
documentation for it, in
After Jonathan's review of [1], I've decided to pick two changes to
apply in this iteration:
1. [1/6], [5/6] and [6/6] now use the return value of
git_config_string(), hence handling configuration errors properly.
I consider this a major and important improvement.
2. The commit message in
A small segment where handle_config() parses the branch.remote
configuration variable can be simplified using git_config_string().
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
remote.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/remote.c b/remote.c
The file was originally created in bcdb34f (Test wildcard push/fetch,
2007-06-08), and only contained tests that exercised wildcard
functionality at the time. In subsequent commits, many other tests
unrelated to wildcards were added but the test description was never
updated. Fix this.
mk_test() creates a repository with the constant name testrepo, and
this may be limiting for tests that need to create more than one
repository for testing. To fix this, create a new mk_test_with_name()
which accepts the repository name as $1. Reimplement mk_test() as a
special case of this
Currently, do_push() in push.c calls remote_get(), which gets the
configured remote for fetching and pushing. Replace this call with a
call to pushremote_get() instead, a new function that will return the
remote configured specifically for pushing. This function tries to
work with the string
This new configuration variable defines the default remote to push to,
and overrides `branch.name.remote` for all branches. It is useful
in the typical triangular-workflow setup, where the remote you're
fetching from is different from the remote you're pushing to.
Signed-off-by: Ramkumar
Junio C Hamano wrote:
Ramkumar Ramachandra artag...@gmail.com writes:
Andrew Wong wrote:
On 3/19/13, Ramkumar Ramachandra artag...@gmail.com wrote:
I know that this is expected behavior, but is there an easy way to get
rid of this inconsistency?
You can actually rely on rebase to run the
Hi,
Le 21.03.2013 21:31, Max Nanasy a écrit :
Yann Droneaud ydroneaud at opteya.com writes:
3) Merge options can't be overridden.
If I modify .git/config to set a merge option, for example forcing
fast-forward merge, this option cannot be overridden on command
line:
(git merge
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 diff --raw
Seeing the output
Set the configuration variable 'merge.ff' to either 'only' or 'no'
and check that this configuration can be overridden on command line.
Additionally, test for currently not tested option '--no-ff-only'
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
t/t7600-merge.sh | 26
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
On Fri, Mar 22, 2013 at 12:14:27PM +0100, Johannes Sixt wrote:
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
This series adds a pull.autostash, making 'git pull' a tad bit more
usable. It is part of my bigger plan to make 'git pull' just DTRT
(via configuration variables) in 90% of the cases.
[1/3] and [2/3] are tiny while we're here patches.
[3/3] is the main patch with tests.
Thanks for reading.
14e5d40c (pull: Fix parsing of -Xoption, 2010-01-17) added the lines
containing git-push and git-merge, even though the prevelant style
at the time was to use the unhyphenated git command form. Fix
this.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
git-pull.sh | 4 ++--
1 file
test_commit() is a well-defined function in test-lib-functions.sh that
allows you to create commits with a terse syntax. Prefer using it
over creating commits by hand.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5521-pull-options.sh | 4 ++--
1 file changed, 2 insertions(+), 2
This new configuration variable executes 'git stash' before attempting
to merge/rebase, and 'git stash pop' after a successful merge/rebase.
It makes it convenient for people to pull with dirty worktrees.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/config.txt | 5
I just happened to open the file when searching for the right file to
put my autostash tests.
Ramkumar Ramachandra (2):
t5520 (pull): update test description
t5520 (pull): use test_config where appropriate
t/t5520-pull.sh | 24 ++--
1 file changed, 10 insertions(+), 14
d09e79c (git-pull: allow pulling into an empty repository, 2006-11-16)
created the file with the description. At the time, there were only
tests to check pulling into an empty repository. The description was
never updated even after more tests, unrelated to the original, were
added. Fix this
Configuration from test_config does not last beyond the end of the
current test assertion, making each test easier to think about in
isolation.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
t/t5520-pull.sh | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
A C++ method start such as
void
foo::bar()
wasn't recognized by cpp diff driver as it mistakenly included foo::bar as a
label. However the colon in a label can't be followed by another colon, so
recognize this case specially to correctly detect C++ methods using this style.
On Fri, Mar 22, 2013 at 01:22:33PM +0530, Ramkumar Ramachandra wrote:
mk_test() creates a repository with the constant name testrepo, and
this may be limiting for tests that need to create more than one
repository for testing. To fix this, create a new mk_test_with_name()
which accepts the
Yann Droneaud ydrone...@opteya.com writes:
+test_expect_success 'merges with merge.ff=only and --no-ff-only' '
+ git reset --hard c1
+ test_tick
+ test_when_finished git config --unset merge.ff
+ git config merge.ff only
I see this was copied from existing tests, but we
y...@quest-ce.net writes:
From: Yann Droneaud ydrone...@opteya.com
This test ensures a merge commit is always created
when merging an annotated (signed) tag without --ff-only option.
Signed-off-by: Yann Droneaud ydrone...@opteya.com
---
Here's a proposition for a test tath check the
Jeff King p...@peff.net writes:
I think this is OK, and I do not mind if it gets applied. But what I was
hinting at in my earlier mail was that we might want to do this (I have
it as a separate patch on top of your 3/6 here, but it would make more
sense squashed in):
I would prefer to see a
Ramkumar Ramachandra artag...@gmail.com writes:
mk_empty () {
- rm -fr testrepo
- mkdir testrepo
+ repo_name=$1
+ test -z $repo_name repo_name=testrepo
+ rm -fr $repo_name
+ mkdir $repo_name
Your quoting is sloppy in this entire patch X-.
--
To unsubscribe
Le 22.03.2013 15:48, Junio C Hamano a écrit :
It's not in final shape: the line
EDITOR=false test_must_fail git merge signed
Because test_must_fail is a shell function, single-shot environment
assignment like this should not be used.
It's used throughout the test. The test 'merge
On Fri, Mar 22, 2013 at 01:22:35PM +0530, Ramkumar Ramachandra wrote:
diff --git a/remote.c b/remote.c
index 185ac11..bdb542c 100644
--- a/remote.c
+++ b/remote.c
@@ -350,6 +350,11 @@ static int handle_config(const char *key, const char
*value, void *cb)
const char *subkey;
On Fri, Mar 22, 2013 at 07:54:06AM -0700, Junio C Hamano wrote:
Ramkumar Ramachandra artag...@gmail.com writes:
mk_empty () {
- rm -fr testrepo
- mkdir testrepo
+ repo_name=$1
+ test -z $repo_name repo_name=testrepo
+ rm -fr $repo_name
+ mkdir $repo_name
Your
On Fri, Mar 22, 2013 at 07:52:47AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I think this is OK, and I do not mind if it gets applied. But what I was
hinting at in my earlier mail was that we might want to do this (I have
it as a separate patch on top of your 3/6 here,
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 included foo::bar as a
label. However the colon in a label can't be followed by another colon, so
recognize this case specially to
On Fri, Mar 22, 2013 at 03:56:15PM +0100, Yann Droneaud wrote:
Le 22.03.2013 15:48, Junio C Hamano a écrit :
It's not in final shape: the line
EDITOR=false test_must_fail git merge signed
Because test_must_fail is a shell function, single-shot environment
assignment like this
Philip Oakley philipoak...@iee.org writes:
Shouldn't Documentation/gitworkflows.txt also be updated with the
triangular workflow and its configuration?
What is missing from gitworkflows documentation is actually a
non-triangular workflow, where people pull from and push into the
same central
Yann Droneaud ydrone...@opteya.com writes:
Thanks. I wasn't aware of the --no-ff-only option and
thought --no-ff would be the opposite of --ff-only,
or at least disable it given the order of the options.
Please find a patch to document option --no-ff-only
Documentation/merge-options.txt
On Thu, Mar 21, 2013 at 12:49:50PM -0700, Jonathan Nieder wrote:
We could also convert the flag to an enum, which would
provide a compile-time check on the function input.
Unfortunately C permits out-of-bounds values for enums.
True, although I would think that most compilers take the
On Thu, Mar 21, 2013 at 11:44:02AM -0400, Jeff King wrote:
I am for dropping = x and leaving it uninitialized at the
declaration site, or explicitly initializing it to some
reasonable starting value (e.g. NULL if it is a pointer) and
adding a comment to say that the
Hi,
well my use case is actually that I'm trying to use the gem
'gem-browse' which uses 'git web--browse'
I'm not using Apple Terminal, I'm using iTerm2 and there doesn't seem
to be a SECURITYSESSIONID set, at least echo didn't find any. But
neither did I find it on Apple Terminal either.
What
There are two uses of the left and right commit
variables that make it hard to be sure what values they
have (both for the reader, and for gcc, which wrongly
complains that they might be used uninitialized).
The functions starts with a cascading if statement, checking
that the input sha1s exist,
These nonsense assignments are meant to squelch gcc warnings
that the variables might be used uninitialized. However, gcc
gets it mostly right, realizing that we will either
extract tree entries from both sides, or we will hit a
continue statement and go to the top of the loop.
However, while
It'd be cool if I were able to override config settings at every
nested directory.
For example, I have my ~/.gitconfig that has one email address in it,
but I also have multiple repos inside ~/dev which I want to use a
different email address for. The only way to do that now is to edit
all of
Ramkumar Ramachandra artag...@gmail.com writes:
test_commit() is a well-defined function in test-lib-functions.sh that
allows you to create commits with a terse syntax. Prefer using it
over creating commits by hand.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Hi.
Right now, when I use difftool --dir-diff, the temp dirs are creates as
e.g.:
/tmp/git-difftool.QqP8x/left
/tmp/git-difftool.QqP8x/right
Wouldn't it be nice, if instead of left/right... the specified commit
name would be used?
e.g.
/tmp/git-difftool.QqP8x/r1.1.1
/tmp/git-difftool.QqP8x/HEAD
Ramkumar Ramachandra artag...@gmail.com writes:
@@ -1786,6 +1786,11 @@ pull.rebase::
of merging the default branch from the default remote when git
pull is run. See branch.name.rebase for setting this on a
per-branch basis.
+
+pull.autostash::
+ When true,
Junio C Hamano gitster at pobox.com writes:
Vadim Zeitlin vz-git at zeitlins.org writes:
...
diff --git a/userdiff.c b/userdiff.c
index ea43a03..9415586 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -125,7 +125,7 @@ PATTERNS(tex,
^(((sub)*section|chapter|part)\\*{0,1}\\{.*)$,
Ramkumar Ramachandra artag...@gmail.com writes:
This new configuration variable overrides `remote.pushdefault` and
`branch.name.remote` for pushes. In a typical triangular-workflow
setup, you would want to set `remote.pushdefault` to specify the
remote to push to for all branches, and use
[this email is from last week, and I think most of was responded to in
other parts of the thread, but there were a few loose ends]
On Sat, Mar 16, 2013 at 02:38:12PM +0100, Michael Haggerty wrote:
* Change pack-refs to use the peeled information from ref_entries if it
is available, rather
On Fri, Mar 15, 2013 at 02:38:12PM -0500, Jed Brown wrote:
I find myself frequently running commands like this
$ comm -12 (git branch --no-merged master) (git branch --merged next)
That's a reasonable thing to want to do.
when checking for graduation candidates. Of course I first tried
Junio C Hamano gits...@pobox.com writes:
Jeff King p...@peff.net writes:
and so on. I haven't quite figured out what is going on. It looks like
we call update_pre_post_images with postlen==0, which causes it to just
write the fixed postimage into the existing buffer. But of course the
fixed
Hi Josh,
Josh Sharpe wrote:
For example, I have my ~/.gitconfig that has one email address in it,
but I also have multiple repos inside ~/dev which I want to use a
different email address for. The only way to do that now is to edit
all of these: ~/dev/*/.git/conf -- and there are lots of
Ramkumar Ramachandra wrote:
I'd really to have that final 'git continue' in Git 2.0. Can someone
attempt to break up the migration path into manageable logical steps
that we can start working on?
Is there any deadline or migration path needed? Depending on the
design, it might be possible
Ramkumar Ramachandra wrote:
A small segment where handle_config() parses the branch.remote
configuration variable can be simplified using git_config_string().
Looks correct.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
Ramkumar Ramachandra wrote:
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='fetching and pushing, with or without wildcard'
+test_description='fetching and pushing'
The description before and after are equally useless. You might as
On Fri, Mar 22, 2013 at 11:22:11AM -0700, Jonathan Nieder wrote:
* Maintaining configuration per repository to record a rather simple
is more complicated than ideal. It would be easier to understand
the configuration if ~/.gitconfig could spell out the rule
explicitly:
Logic in still_interesting function allows to stop the commits
traversing if the oldest processed commit is not older then the
youngest commit on the list to process and the list contains only
commits marked as not interesting ones. It can be premature when dealing
with a set of coequal commits.
Hi all,
I want to learn about how Git compares patches while doing a merge. For
example, if a patch has been cherry-picked from branch A to branch B, and then
downstream we do a git merge from A to B, how does Git know to skip the
cherry-picked patch? It would have a different SHA-1, so what
How about doing this?
The first patch is a cleanup as suggested by Johannes[1], the second
fixes the test failure on Windows and the third makes the test behaviour
more explicit and would have helped to detect this issue earlier.
[1/3] t7800: don't hide grep output
[2/3] t7800: fix tests
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 includes untracked files in the working
tree.
During
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 to be noticed only on Windows when the
test also fails on Linux when difftool is invoked with --no-symlinks.
Rewrite these tests
git-1.8.2, perl-5.16.3, File::Temp-0.23
Without patch:
$ git svn fetch
'tempfile' can't be called as a method at
/pro/lib/perl5/site_perl/5.16.3/Git.pm line 1117.
After patch:
$ git svn fetch
M t/06virtual.t
r15506 = 6c65be7ff36ffc6fd9b960a4b470ca297103004e
Jonathan Nieder jrnie...@gmail.com writes:
Ramkumar Ramachandra wrote:
I'd really to have that final 'git continue' in Git 2.0. Can someone
attempt to break up the migration path into manageable logical steps
that we can start working on?
Is there any deadline or migration path needed?
Kacper Kornet drae...@pld-linux.org writes:
Logic in still_interesting function allows to stop the commits
traversing if the oldest processed commit is not older then the
youngest commit on the list to process and the list contains only
commits marked as not interesting ones. It can be
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 to be noticed only on Windows when the
test also fails on Linux when difftool is invoked with --no-symlinks.
Rewrite these tests
On Fri, Mar 22, 2013 at 01:45:47PM -0700, Junio C Hamano wrote:
Kacper Kornet drae...@pld-linux.org writes:
Logic in still_interesting function allows to stop the commits
traversing if the oldest processed commit is not older then the
youngest commit on the list to process and the list
Jeff King p...@peff.net writes:
There are two uses of the left and right commit
variables that make it hard to be sure what values they
have (both for the reader, and for gcc, which wrongly
complains that they might be used uninitialized).
The functions starts with a cascading if statement,
Junio C Hamano wrote:
I would prefer to see a preparatory patch to teach mk_test/mk_empty
to _always_ take the new name (i.e. the result of your patch) and
then do whatever new things on top.
Yes, that sounds like a good way to go.
By the way, I am planning to _not_ look at new stuff today.
Ramkumar Ramachandra wrote:
This patch has no visible impact, but
serves to enable future patches to introduce configuration variables
to set pushremote_name. For example, you can now do the following in
handle_config():
if (!strcmp(key, remote.pushdefault))
On Fri, Mar 22, 2013 at 11:08:59AM -0700, Junio C Hamano wrote:
This may be sufficient. In the olden days, we relied on that all
whitespace fixing rules made the result shorter and took advantage
of it in update-pre-post-images to rewrite the images in place. The
oddball tab-in-indent (aka
Jeff King p...@peff.net writes:
Of the 8 patches, this is the one I find the least satisfying, if only
because I do not think gcc's failure is because of complicated control
flow, and rearranging the code would only hurt readability. And I'm
quite curious why it complains about mode, but not
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
diff --git a/Documentation/technical/api-setup.txt
b/Documentation/technical/api-setup.txt
index 4f63a04..59a947e 100644
--- a/Documentation/technical/api-setup.txt
+++ b/Documentation/technical/api-setup.txt
@@ -8,6 +8,23 @@ Talk about
*
Jonathan Nieder jrnie...@gmail.com writes:
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -322,7 +322,7 @@ static int push_with_options(struct transport
*transport, int flags)
static int do_push(const char *repo, int flags)
{
int i, errs;
-struct remote *remote =
On Tue, Mar 19, 2013 at 02:10:42PM -0400, Jeff King wrote:
The issue bisects to 94bc671 (Add directory pattern matching to
attributes, 2012-12-08). That commit actually tests not only that
subdir/ matches, but also that just subdir does not match.
[...]
So I think the regression is
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
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 included foo::bar
as a
label. However the colon
On Fri, Mar 22, 2013 at 11:53:04AM -0700, Senthil Natarajan wrote:
I want to learn about how Git compares patches while doing a merge.
For example, if a patch has been cherry-picked from branch A to branch
B, and then downstream we do a git merge from A to B, how does Git
know to skip the
John Keeping j...@keeping.me.uk writes:
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 includes
Sebastian Götte ja...@physik.tu-berlin.de writes:
git merge/pull:
When --verify-signatures is specified on the command-line of git-merge
or git-pull, check whether the commits being merged have good gpg
signatures and abort the merge in case they do not. This allows e.g.
auto-deployment from
On Fri, Mar 22, 2013 at 03:53:38PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
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
Jeff King p...@peff.net writes:
if (pathlen pathname[pathlen-1] == '/')
pathlen--;
would work. But it seems that match_basename, despite taking the length
of all of the strings we pass it, will happily use NUL-terminated
functions like strcmp or fnmatch. Converting the former
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
Hi,
Sebastian Götte wrote:
git merge/pull:
When --verify-signatures is specified on the command-line of git-merge
or git-pull, check whether the commits being merged have good gpg
signatures and abort the merge in case they do not. This allows e.g.
auto-deployment from untrusted repo hosts.
Junio C Hamano wrote:
Jonathan Nieder jrnie...@gmail.com writes:
- struct remote *remote = remote_get(repo);
+ struct remote *remote = pushremote_get(repo);
struct remote has url and pushurl fields. What do they mean in the
context of these two accessors? /me is confused.
Is the
Jeff King wrote:
On Fri, Mar 22, 2013 at 11:22:11AM -0700, Jonathan Nieder wrote:
It would be easier to understand
the configuration if ~/.gitconfig could spell out the rule
explicitly:
[...]
It sounds hard to do right, especially considering use
Johannes Sixt j6t at kdbg.org writes:
I also wonder if
label :
should also be caught, or is it too weird format to be worth
supporting?
It's easy to support, by inserting another [ \t] before the first colon.
So, why not?
This is really nitpicking, but if we do it, then
As suggested by Junio I split the preivous patch into four parts.
Sebastian Götte (4):
Move commit GPG signature verification to commit.c
merge/pull: verify GPG signatures of commits being merged
merge/pull Check for untrusted good GPG signatures
pretty printing: extend %G? to include 'N'
When --verify-signatures is specified on the command-line of git-merge
or git-pull, check whether the commits being merged have good gpg
signatures and abort the merge in case they do not. This allows e.g.
auto-deployment from untrusted repo hosts.
Signed-off-by: Sebastian Götte
Jeff King p...@peff.net writes:
On Fri, Mar 15, 2013 at 02:38:12PM -0500, Jed Brown wrote:
$ git branch --no-merged master --merged next
Yeah, sadly that does not work, as we use the same slot for the flag and
store only one of the two (and we also allow only one --merged head,
even
Jonathan Nieder jrnie...@gmail.com writes:
git merge/pull:
When --verify-signatures is specified on the command-line of git-merge
or git-pull, check whether the commits being merged have good gpg
signatures and abort the merge in case they do not. This allows e.g.
auto-deployment from
On Thu, Mar 21, 2013 at 10:50:02AM -0700, Junio C Hamano wrote:
Why could the test pass for you without it? It doesn't look like a
bug that depended on uninitialized memory or something from the
above observation.
It depends on uninitialized memory. For absolute paths, prefix is
useless
On Sat, Mar 23, 2013 at 10:13 AM, Duy Nguyen pclo...@gmail.com wrote:
which also includes all document bugs reported so far.
s/all/fixes for all/
--
Duy
--
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
On Fri, Mar 22, 2013 at 4:05 PM, John Keeping j...@keeping.me.uk wrote:
On Fri, Mar 22, 2013 at 03:53:38PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
When 'git difftool --dir-diff' is using --no-symlinks (either explicitly
or implicitly because it's running on
The current message is bisecting %s (or bisecting branch %s).
%s is the current branch when we started bisecting. Clarify that to
avoid confusion with good and bad refs passed to bisect command.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/branch.c| 2 +-
Any response for such a small fix?
2013/3/10 乙酸鋰 ch3co...@gmail.com:
Hi,
Here is the patch.
Regards,
ch3cooli
--
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
On Fri, Mar 22, 2013 at 06:24:39PM -0400, Jeff King wrote:
I'm having trouble figuring out the right solution for this.
Thanks for looking into this. It was on my todo list, but you beat me
to it :)
But then here we'll end up feeding foo/ to be compared with foo,
which we don't want. For a
On Sat, Mar 23, 2013 at 11:18:24AM +0700, Duy Nguyen wrote:
You can use nwildmatch() from this patch. I tested it lightly with
t3070-wildmatch.sh, feeding the strings with no terminating NUL. It
seems to work ok.
And valgrind spotted my faults, especially for using strchr. You would
need this
On Fri, Mar 22, 2013 at 9:52 AM, Christoph Anton Mitterer
cales...@scientia.net wrote:
Hi.
Right now, when I use difftool --dir-diff, the temp dirs are creates as
e.g.:
/tmp/git-difftool.QqP8x/left
/tmp/git-difftool.QqP8x/right
Wouldn't it be nice, if instead of left/right... the specified
Eric Sunshine sunsh...@sunshineco.com writes:
On Thu, Mar 21, 2013 at 8:52 AM, Thomas Rast tr...@student.ethz.ch wrote:
This is a bit hacky and should really be replaced by equivalent
support in --follow, and just using that. However, in the meantime it
s/using/use/
I'm not a native
99 matches
Mail list logo
