On 05/03/14 16:22, Phillip Susi wrote:
On 03/04/2014 10:08 PM, Chris Packham wrote:
Could you provide a few more details such as your git version (git
--version) and an example of the failure. I've tried to reproduce
the problem based on the description provided but everything seems
to work
On Mon, Mar 03, 2014 at 04:24:15PM -0700, Paul Lotz wrote:
David,
OK, I did as you suggested, and the results were revealing.
First, I replaced echo with cat. Result: The contents of both files
appeared in the Git Bash Window.
Then I tried calling LVCompare from the Git Bash and
On 3/4/2014 10:15 AM, Junio C Hamano wrote:
From: Ilya Bobyr ilya.bo...@gmail.com
Date: Thu, 27 Feb 2014 22:51:37 -0800
We already replace old SHA with the clipboard content for the mouse
paste event. It seems reasonable to do the same when pasting from
keyboard.
Signed-off-by: Ilya Bobyr
I have a good news for you, for details contact me through
lottery...@yahoo.com
Sir Edmond Newton
_
This communication is intended for the use of the recipient to which it is
addressed, and may contain
From: Junio C Hamano gits...@pobox.com
Signed-off-by: David Aguilar dav...@gmail.com
---
This is a replacement patch for the current tip of da/difftool.
t/t7800-difftool.sh | 14 ++
1 file changed, 14 insertions(+)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index
On Fri, Feb 28, 2014 at 06:19:58PM +0100, Erik Faye-Lund wrote:
On Fri, Feb 28, 2014 at 6:00 PM, Kirill Smelkov k...@mns.spb.ru wrote:
On Fri, Feb 28, 2014 at 02:50:04PM +0100, Erik Faye-Lund wrote:
On Fri, Feb 28, 2014 at 2:44 PM, Erik Faye-Lund kusmab...@gmail.com
wrote:
On Mon, Feb
Hi,
Here's my usecase. I have created a BranchWithVeryLongName and I want to have
it pushed to origin. So I use this command with version 1.8.1.2:
git push origin BranchMistypedLongName
(note that I mistyped the branch name). The following happens:
1. git asks me for username and password
2.
On Wed, Mar 5, 2014 at 12:56 PM, Jeremy Nickurak jer...@nickurak.ca wrote:
git log seems to understand globs in the last path argument, and the
last path argument only. I didn't see anything in the git log man page
expressly saying this was to be expected, but it does seem like it
ought to
Loan Application at a low rate of 0.5% send your Name,Amount,Phone and country
to standar...@56788.com
Note: $5,000.00 USD minimum and $100,000,000 Maximum.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info
On Wed, Mar 5, 2014 at 11:25 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
static void update_common_dir(struct strbuf *buf, int git_dir_len)
{
+ /*
+* Remember to report_linked_checkout_garbage()
+* builtin/count-objects.c
+*/
I couldn't figure out why
On Wed, Mar 5, 2014 at 1:10 AM, Junio C Hamano gits...@pobox.com wrote:
I notice that the original code, with or without this change, allows
upload-pack spawned by daemon to attempt to write into GIT_DIR.
As upload-pack is supposed to be a read-only operation, this is
quite bad.
Perhaps we
Lee, could you improve your change in refs.c into a real patch, with a commit
message?
(And please have a look at the indentation with TABs)
A test case could be good, if time allows I can make a suggestion.
I will remove the refs.ignorecase flag and work on a test care or two,
it will have
Replaces all instances of starts_with() by skip_prefix(),
which can not only be used to check presence of a prefix,
but also used further on as it returns the string after the prefix,
if the prefix is present.
Signed-off-by: Karthik Nayak karthik@gmail.com
---
Hey Eric,
Here are the changes
Hey Eric,
Sorry about not cc'ing you again , still figuring out git send-email.
On Wed, Mar 5, 2014 at 7:36 PM, Karthik Nayak karthik@gmail.com wrote:
Replaces all instances of starts_with() by skip_prefix(),
which can not only be used to check presence of a prefix,
but also used further
2014-03-05 2:40 GMT+08:00 Junio C Hamano gits...@pobox.com:
From: Sandy Carter sandy.car...@savoirfairelinux.com
Date: Mon, 3 Mar 2014 09:55:53 -0500
Add missing leading dash to proposed commands in french output when
using the command:
git branch --set-upstream remotename/branchname
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 3/5/2014 3:10 AM, Chris Packham wrote:
My example is creating a commit on the temp branch then applying
it to the master branch using git am.
Do a reset HEAD~1 --hard, and git clean -x -f -d before git am.
I didn't notice the missing file
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Andrew Wong wrote:
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
fclose(fp);
rerere(allow_rerere_auto);
printf(_(Automatic merge
On Wed, Mar 5, 2014 at 3:01 AM, Duy Nguyen pclo...@gmail.com wrote:
On Wed, Mar 5, 2014 at 12:56 PM, Jeremy Nickurak jer...@nickurak.ca wrote:
git log seems to understand globs in the last path argument, and the
last path argument only. I didn't see anything in the git log man page
expressly
On Wed, Mar 05, 2014 at 09:26:43AM -0500, Phillip Susi wrote:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 3/5/2014 3:10 AM, Chris Packham wrote:
My example is creating a commit on the temp branch then applying
it to the master branch using git am.
Do a reset HEAD~1 --hard, and
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 3/5/2014 11:34 AM, Jeff King wrote:
I don't think those steps are necessary for Chris's example. When
he switches back to the master branch, git removes the subdirectory
(the file is tracked in temp but not master, so we remove it
when
On Wed, Mar 05, 2014 at 11:47:12AM -0500, Phillip Susi wrote:
I can't get Chris's script to fail on any version of git. Can you
show us an example of a patch that does not behave (or better yet,
a reproduction recipe to generate the patch with format-patch)?
AHA! It requires a conflict.
slash is initialized to a value that cannot be NULL. So remove the
guards against slash == NULL later in the loop.
Suggested-by: David Kastrup d...@gnu.org
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache-tree.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff
Suggested-by: Junio Hamano gits...@pobox.com
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache-tree.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c
index 4d439bd..d00f4ef 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -554,9
The search for the end of the slashes is part of the update of the
path variable for the next iteration as opposed to an update of the
slash variable. So iterate using path rather than slash.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache-tree.c | 5 +++--
1 file changed, 3
There is no need for an early
return it;
from the loop if slash points at the end of the string, because that
is exactly what will happen when the while condition fails at the
start of the next iteration.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache-tree.c | 2 --
1 file
If *slash == '/', then it is necessarily non-NUL.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache-tree.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cache-tree.c b/cache-tree.c
index 408ee57..39ad8c9 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -563,7
Who would have expected so much slop in one little function? Here are
the changes coming out of a long email thread.
I feel a little bit silly submitting six separate patches, but they
really are independent. And two of the changes were suggested by
other people, so splitting those out, at
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
cache-tree.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c
index d00f4ef..408ee57 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -555,8 +555,9 @@ static struct cache_tree
Junio C Hamano gits...@pobox.com writes:
Michael Haggerty mhag...@alum.mit.edu writes:
I really wish we could mix declarations with statements because I think
it is a big help to readability.
...
Unfortunately, I think we are in violent disagreement.
After re-reading the above, I realize
Am 05.03.2014 00:01, schrieb Henri GEIST:
Permit to do a 'git clone --recursive' through git-gui.
I really like where this is heading!
Some minor issues:
- I think we should be more verbose in the commit message,
including that and why the default should be on. Maybe
like this?
Permit
Is there any syntax to support partial negations of refspecs, such as:
+refs/heads/*:refs/remotes/origin/*
!refs/heads/dont-pull:
!:refs/remotes/origin/dont-push
If not now, is negation something that might be possible/reasonable in
a future version of Git, or is it difficult/unlikely to change?
Am 03.03.2014 21:34, schrieb Henri GEIST:
Le lundi 03 mars 2014 à 17:45 +, Jens Lehmann a écrit :
Am 03.03.2014 14:47, schrieb Henri GEIST:
This new option prevent git submodule add|update to clone the missing
submodules with the --separate-git-dir option.
Then the submodule will be
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 3/5/2014 12:13 PM, Jeff King wrote:
We apply the changes to modified and new to the working tree,
but we do not stage anything in the index. I suspect this is
because our invocation of apply --index (which is what is doing
the real work with
Andrew Wong andrew.k...@gmail.com writes:
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Andrew Wong wrote:
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
fclose(fp);
Andrew Wong andrew.k...@gmail.com writes:
On Wed, Feb 26, 2014 at 3:38 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Andrew Wong wrote:
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -909,7 +909,8 @@ static int suggest_conflicts(int renormalizing)
+ fix conflicts and
Jeff King p...@peff.net writes:
On Tue, Mar 04, 2014 at 12:52:18PM -0800, Junio C Hamano wrote:
I do not recall any past discussion on this topic, and searching the
archive only shows people echoing what I said above. Is this something
we've promised to work in the past?
The history lesson
On Wed, Mar 05, 2014 at 01:36:12PM +0400, Dmitry wrote:
Here's my usecase. I have created a BranchWithVeryLongName and I want
to have it pushed to origin. So I use this command with version
1.8.1.2:
git push origin BranchMistypedLongName
(note that I mistyped the branch name). The
In preparation for being able to check the left-hand side of
our push refspecs separately, this pulls the examination of
them out into its own function. There should be no behavior
change.
Signed-off-by: Jeff King p...@peff.net
---
remote.c | 49 ++---
The match_explicit_lhs function has all of the logic
necessary to verify the refspecs without actually doing any
work. This patch lets callers pass a NULL match pointer to
indicate they want a verify only operation.
For the most part, we just need to avoid writing to the NULL
pointer. However, we
When pushing, we do not even look at our push refspecs until
after we have made contact with the remote receive-pack and
gotten its list of refs. This means that we may go to some
work, including asking the user to log in, before realizing
we have simple errors like git push origin matser.
We
Jeff King p...@peff.net writes:
But I have not thought hard about it, so maybe there is a good reason
not to (it is a little weird just because the resulting index is a
partial application of the patch).
Originally .rej was a deliberate attempt to be not very Git but
more like 'patch', so I
On Wed, Mar 05, 2014 at 10:06:26AM -0800, Mickey Killianey wrote:
Is there any syntax to support partial negations of refspecs, such as:
+refs/heads/*:refs/remotes/origin/*
!refs/heads/dont-pull:
!:refs/remotes/origin/dont-push
If not now, is negation something that might be
Jeff King p...@peff.net writes:
On Wed, Mar 05, 2014 at 10:49:24AM -0800, Junio C Hamano wrote:
... the plan, at least in my mind, has always been exactly that: grafts
were a nice little attempt but is broken---if you really wanted to
muck with the history without rewriting (which is still
On Wed, Mar 05, 2014 at 11:18:17AM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
On Wed, Mar 05, 2014 at 10:49:24AM -0800, Junio C Hamano wrote:
... the plan, at least in my mind, has always been exactly that: grafts
were a nice little attempt but is broken---if you
Avoid scanning strings twice, once with strchr() and then with
strlen(), by using strchrnul(). Update the conditional expressions
involving the return value of strchrnul() with a check for '\0'.
Signed-off-by: Rohit Mani rohit.m...@outlook.com
---
I plan to apply for the GSoC.
archive.c
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
core.worktree::
Set the path to the root of the working tree.
+ If GIT_COMMON_DIR environment variable is set, core.worktree
+ is ignored and not used for determining the root of working tree.
Just thinking aloud to see if I got
Duy Nguyen pclo...@gmail.com writes:
If only there is a way to pass this info without a temporary
file. Multiplexing it to pack-objects' stdin should work. It may be
ugly, but it's probably the safest way.
Wait it does not look that ugly. We can feed --shallow SHA1 lines
before sending
Hi there, I'm NaN.
Recently I enrolled to this mailing list thanks to the GSoC.
I've looked the Ideas Page but -unfortunately- some projects are very
difficult for me.
I've looked the source code and I've seen that to perform a search
with a pattern to the branches list (and other commands) git
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
+ if (get_device_or_die(path) != get_device_or_die(get_git_dir())) {
+ strbuf_reset(sb);
+ strbuf_addf(sb, %s/locked, sb_repo.buf);
+ write_file(sb.buf, 1, located on a different file system\n);
+
Jeff King p...@peff.net writes:
On Wed, Mar 05, 2014 at 11:18:17AM -0800, Junio C Hamano wrote:
Given that we discourage grafts strongly and replace less so
(but still discourage it), telling the users that biting the bullet
and rewriting the history is _the_ permanent solution, I think it
Jeff King p...@peff.net writes:
types, we simply look for an identifier at the start of the
line that contains a (, meaning it is either a function
definition or a function call, and then not containing ;
which would indicate it is a call or declaration.
It is not worth worrying about:
Jeff King p...@peff.net writes:
We can't fully process the refspecs until we have talked to the other
side, because they may involve matching refs from the remote; I don't
think git even really looks at them until after we've connected.
But I think there are some obvious cases, like a bogus
On Wed, Mar 5, 2014 at 1:29 PM, Junio C Hamano gits...@pobox.com wrote:
If the user said git merge while another git merge is still
outstanding, we would want to say You have not concluded your
previous merge and die, and you presumably want to add the same
how to abort message there. Such a
On Wed, Mar 05, 2014 at 12:51:06PM -0800, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
We can't fully process the refspecs until we have talked to the other
side, because they may involve matching refs from the remote; I don't
think git even really looks at them until after
Andrew Wong andrew.k...@gmail.com writes:
... merge hints in the future as well.
I actually wish we did not have to add any hints in the first place.
Having one advice config/variable
for every single situation seems a bit overkill, and we would end up
with too many variables.
That goes
Vincenzo di Cicco enzodici...@gmail.com writes:
But: why the decision to support the Blob Pattern instead of the
Regular Expressions?
s/Blob/glob/;
Matching pathnames using fnmatch/glob is a fine UNIX tradition;
because we generally consider refnames also as pathname-like
things, we use
On Wed, Mar 5, 2014 at 8:55 PM, Vincenzo di Cicco enzodici...@gmail.com wrote:
Hi there, I'm NaN.
Recently I enrolled to this mailing list thanks to the GSoC.
I've looked the Ideas Page but -unfortunately- some projects are very
difficult for me.
Hi Vincenzo!
I also got interested in
Sun He sunheeh...@gmail.com writes:
Replacing memcpy with hashcpy is more directly and elegant.
Can we justify the change without being subjective?
Leave ppc/sha1.c alone, as it is an isolated component.
Pull cache.h(actually ../cache.h) in just for one memcpy
there is not proper.
That is
On Fri, Feb 28, 2014 at 3:26 PM, Conley Owens c...@android.com wrote:
$ git --version # This is just the git from MacPorts
git version 1.8.5.5
$ sw_vers
ProductName:Mac OS X
ProductVersion: 10.8.5
BuildVersion: 12F45
OK, I've tried using my own build from master, and I still get the
Jiang Xin worldhello@gmail.com writes:
2014-03-05 2:40 GMT+08:00 Junio C Hamano gits...@pobox.com:
From: Sandy Carter sandy.car...@savoirfairelinux.com
Date: Mon, 3 Mar 2014 09:55:53 -0500
Add missing leading dash to proposed commands in french output when
using the command:
git
tanay abhra tanay...@gmail.com writes:
On Wed, Mar 5, 2014 at 3:41 AM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
+found = skip_prefix(buf, sigcheck_gpg_status[i].check + 1);
+if(!found) {
Missing SP between the control
David,
We did succeed in getting a script to work. The local Git guru started with
your script (he independently sent me something very similar) and added some
tricks to make things work.
The contents of the shell script ended up as:
___
#!/bin/bash
# Method to determine absolute path
# The
Christian Couder chrisc...@tuxfamily.org writes:
Implement the logic to process trailers from stdin and arguments.
At the beginning trailers from stdin are in their own in_tok
doubly linked list, and trailers from arguments are in their own
arg_tok doubly linked list.
The lists are
Christian Couder chrisc...@tuxfamily.org writes:
diff --git a/trailer.c b/trailer.c
index 5b8e28b..5d69c00 100644
--- a/trailer.c
+++ b/trailer.c
@@ -378,3 +378,96 @@ static int git_trailer_config(const char *conf_key,
const char *value, void *cb)
...
+static struct trailer_item
Christian Couder chrisc...@tuxfamily.org writes:
diff --git a/trailer.c b/trailer.c
index 5d69c00..e0e066f 100644
--- a/trailer.c
+++ b/trailer.c
@@ -50,6 +50,13 @@ static size_t alnum_len(const char *buf, size_t len)
return len;
}
+static inline int contains_only_spaces(const
Christian Couder chrisc...@tuxfamily.org writes:
diff --git a/trailer.c b/trailer.c
index ab93c16..67e7baf 100644
--- a/trailer.c
+++ b/trailer.c
@@ -490,12 +544,22 @@ static struct trailer_item
*process_command_line_args(int argc, const char **arg
...
+ /* Add conf commands that
Christian Couder chrisc...@tuxfamily.org writes:
+# We want one trailing space at the end of each line.
+# Let's use sed to make sure that these spaces are not removed
+# by any automatic tool.
+test_expect_success 'setup 3' '
+ sed -e s/ Z\$/ / complex_message_trailers -\EOF
+Fixes: Z
For unborn branches, it now compares the index against the empty tree.
(Just like git status does.)
Signed-off-by: Maurice Bos m-ou...@m-ou.se
---
contrib/completion/git-prompt.sh | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/contrib/completion/git-prompt.sh
Le mercredi 05 mars 2014 à 19:00 +0100, Jens Lehmann a écrit :
Am 05.03.2014 00:01, schrieb Henri GEIST:
Permit to do a 'git clone --recursive' through git-gui.
I really like where this is heading!
Some minor issues:
- I think we should be more verbose in the commit message,
On 04/03/14 19:47, Christian Couder wrote:
This patch series implements a new command:
git interpret-trailers
[snip]
Minor problem: this series causes sparse to complain, thus:
trailer.c:642:6: warning: symbol 'process_trailers' was not \
declared. Should it be static?
I have a git-svn clone that I've been working on which is a full and
complete conversion of our SVN repository at work.
It started out as 1.4GB (git count-objects -v, looking at
'size-pack'). I have run the following script to clean up a directory
in the repo history that I suspect are huge (we
On Wed, Mar 5, 2014 at 6:55 PM, Robert Dailey rcdailey.li...@gmail.com wrote:
What I'd like to do is somehow hunt down the largest commit (*not*
blob) in the entire history of the repository to hopefully find out
where huge directories have been checked in.
I can't do a search for largest
I just wrote up the idea that fell out of the discussion [1] about the
other configuration features that I proposed. As far as I am concerned,
it can be merged as soon as somebody volunteers as a co-mentor. The
idea is embodied in a pull request against the git.github.io repository
[2]; the text
On Wed, Mar 05, 2014 at 08:55:30PM -0600, Robert Dailey wrote:
What I'd like to do is somehow hunt down the largest commit (*not*
blob) in the entire history of the repository to hopefully find out
where huge directories have been checked in.
I can't do a search for largest file (which most
74 matches
Mail list logo
