Hi,
On Fri, Nov 09, 2012 at 07:42:26PM +0100, Heiko Voigt wrote:
Since this is a change in behaviour I would like to further think about
the implications this brings if we fix this. Not sure how many people
clone from .. The correct behavior (as documented) is the one you
introduce with your
Even though a relative path can be without them the
documentation explicitely talks about them. Lets ensure
that behavior with a test.
Signed-off-by: Heiko Voigt hvo...@hvoigt.net
---
t/t7400-submodule-basic.sh | 12
1 file changed, 12 insertions(+)
diff --git
If a remote is configured in a superproject relative submodule urls
should be relative to that remote. Since we have a bug in relative
path calculation for superproject paths that contain a /. using
../submodule was accepted here. We are going to fix this behavior so
we first need to correct these
A trailing /. for the superprojects origin is treated as
a full path component. This is wrong. Lets add a test and
fix this.
Signed-off-by: Heiko Voigt hvo...@hvoigt.net
---
git-submodule.sh | 22 ++
t/t7400-submodule-basic.sh | 44
On Tue, Nov 13, 2012 at 8:47 AM, Jeff King p...@peff.net wrote:
But I still don't see how that has anything to do with what send-email
does or should do. That is why I said strawman above. You seem to
think I am saying that send-email should use the system that generated
those broken names,
On Windows, arguments starting with a forward slash is mangled as if
it were full pathname. This causes the patterns beginning with a slash
not to be passed to test-wildmatch correctly. Avoid mangling by never
accepting patterns starting with a slash. Those arguments must be
rewritten with a
Felipe Contreras venit, vidit, dixit 12.11.2012 23:47:
On Mon, Nov 12, 2012 at 10:41 PM, Jeff King p...@peff.net wrote:
On Sun, Nov 11, 2012 at 07:48:14PM +0100, Felipe Contreras wrote:
3. Exporters should not use it if they have any broken-down
representation at all. Even knowing that
Jeff King venit, vidit, dixit 12.11.2012 21:42:
On Mon, Nov 12, 2012 at 03:18:02PM +0100, Michael J Gruber wrote:
'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
replacements.
Make it parse the
Michael J Gruber venit, vidit, dixit 12.11.2012 15:18:
'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
replacements.
Make it parse the argument to 'replace -d' in the same way.
Signed-off-by: Michael
'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
replacements.
Make it parse the argument to 'replace -d' in the same way.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Notes:
v4 names
Git's ispace does not include 11 and 12. Git's isprint includes
control space characters (10-13). According to glibc-2.14.1 on C
locale on Linux, this is wrong. This patch fixes it.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
I wrote a small C program to compare the result of all
Hi,
On Mon, Nov 12, 2012 at 03:07:46PM -0500, Marc Khouzam wrote:
Hi,
[...]
Signed-off-by: Marc Khouzam marc.khou...@gmail.com
[...]
Thanks
Marc
---
contrib/completion/git-completion.bash | 53
+++-
contrib/completion/git-completion.tcsh | 34
Hi All Users,
I am beginner in git. I am doing my first steps with this tool.
Now, I used git gui on linux OS.
I don't know what I could change branches ?
I need to change current working branch to do a commit.
I can see in the menu branch :
Create
checkout
rebase
Reset
--
Could anyone help me
On Tue, Nov 13, 2012 at 11:30:19AM +0100, Michael J Gruber wrote:
Michael J Gruber venit, vidit, dixit 12.11.2012 15:18:
'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
replacements.
Make it parse
On Mon, Nov 12, 2012 at 4:15 AM, David Lang da...@lang.hm wrote:
Using a web browser requires connectivity at the time you are doing the
review.
Mailing list based reviews can be done at times when you don't have
connectivity.
I am not against email-based reviews but I'd like to point out
On Tue, Nov 13, 2012 at 11:34:11AM +0100, Michael J Gruber wrote:
'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
replacements.
Make it parse the argument to 'replace -d' in the same way.
We currently only support getpass, which does not echo at all, for
git_terminal_prompt on Windows. The Windows console is perfectly
capable of doing this, so let's make it so.
This implementation tries to reuse the /dev/tty-code as much as
possible.
The big reason that this becomes a bit hairy
We currently only support getpass, which does not echo at all, for
git_terminal_prompt on Windows. The Windows console is perfectly
capable of doing this, so let's make it so.
This implementation tries to reuse the /dev/tty-code as much as
possible.
The big reason that this becomes a bit hairy
Set a control-handler to prevent the process from terminating, and
simulate SIGINT so it can be handled by a signal-handler as usual.
Signed-off-by: Erik Faye-Lund kusmab...@gmail.com
---
compat/mingw.c | 76 ++
compat/mingw.h | 6 +
2
On Windows, the terminal cannot be opened in read-write mode, so
we need distinct pairs for reading and writing. Since this works
fine on other platforms as well, always open them in pairs.
Signed-off-by: Erik Faye-Lund kusmab...@gmail.com
---
compat/terminal.c | 29 ++---
The getpass-implementation we use on Windows isn't at all ideal;
it works in raw-mode (as opposed to cooked mode), and as a result
does not deal correcly with deletion, arrow-keys etc.
Instead, use cooked mode to read a line at the time, allowing the
C run-time to process the input properly.
There's no remaining call-sites, and as pointed out in the
previous commit message, it's not quite ideal. So let's just
lose it.
Signed-off-by: Erik Faye-Lund kusmab...@gmail.com
---
compat/mingw.c | 15 ---
compat/mingw.h | 2 --
2 files changed, 17 deletions(-)
diff --git
Sorry, I messed up the subject (lacking RFC-prefix), so I aborted
after sending the cover-letter. I'll resend with a proper prefix right
away.
On Tue, Nov 13, 2012 at 3:01 PM, Erik Faye-Lund kusmab...@gmail.com wrote:
We currently only support getpass, which does not echo at all, for
On Mon, Nov 12, 2012 at 3:24 PM, Jeff King p...@peff.net wrote:
On Mon, Nov 12, 2012 at 01:55:46PM -0500, Drew Northup wrote:
On Sun, Nov 11, 2012 at 6:28 PM, glpk xypron xypron.g...@gmx.de wrote:
Gitweb can be used to generate an RSS feed.
Arbitrary tags can be inserted into the XML
Hi,
I ran git 1.8.0 command line
git revert --no-commit rev1 rev2
I see a prepared commit message like
Revert description from one commit
This reverts commit SHA1 of one commit.
The actual revert content is correct - it is all the relevant commits
that were selected. I expect the message to
On Tue, Nov 13, 2012 at 3:44 PM, Drew Northup n1xim.em...@gmail.com wrote:
On Mon, Nov 12, 2012 at 3:24 PM, Jeff King p...@peff.net wrote:
On Mon, Nov 12, 2012 at 01:55:46PM -0500, Drew Northup wrote:
+ # No XSS script/script inclusions
+ if ($input =~ m!(script)(.*)(/script)!){
Hello.
Am wondering if 'checkout branch path' undeletes the files? For the example
below I'd like the 'file00.txt' to be deleted and never checked out from the
previous branch... How can I do that?
$ git init
Jeff King p...@peff.net wrote on 02.11.2012 16:26:16:
On Tue, Oct 30, 2012 at 10:50:42AM +0100, karsten.bl...@dcon.de wrote:
'update-index --refresh' and 'diff-index' (without --cached) don't
honor
the core.preloadindex setting yet. Porcelain commands using these
(such as
git [svn]
Jeff King p...@peff.net wrote on 02.11.2012 16:38:00:
On Fri, Nov 02, 2012 at 11:26:16AM -0400, Jeff King wrote:
Still, I don't think we need to worry about performance regressions,
because people who don't have a setup suitable for it will not turn on
core.preloadindex in the first
v1 is here:
http://mid.gmane.org/1349196670-2844-1-git-send-email-artag...@gmail.com
v2 is here:
http://mid.gmane.org/1351766630-4837-1-git-send-email-artag...@gmail.com
v3 is here:
http://mid.gmane.org/1352653146-3932-1-git-send-email-artag...@gmail.com
This version was prepared in response
19299a8 (Documentation: Move diff.driver.* from config.txt to
diff-config.txt, 2011-04-07) moved the diff configuration options to
diff-config.txt, but forgot about diff.wordRegex, which was left
behind in config.txt. Fix this.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Introduce a diff.submodule configuration variable corresponding to the
'--submodule' command-line option of 'git diff'.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
Documentation/diff-config.txt|7 +++
Documentation/diff-options.txt |3 ++-
diff.c
From: Jeff King p...@peff.net
Once upon a time the builtin_diff function used one color, and the color
variables were called set and reset. Nowadays it is a much longer
function and we use several colors (e.g., add, del). Rename set to
meta to show that it is the color for showing diff meta-info
Currently, 'git diff --submodule' displays output with a bold diff
header for non-submodules. So this part is in bold:
diff --git a/file1 b/file1
index 30b2f6c..2638038 100644
--- a/file1
+++ b/file1
For submodules, the header looks like this:
Submodule submodule1
Jeff King wrote:
On Sun, Nov 11, 2012 at 10:29:05PM +0530, Ramkumar Ramachandra wrote:
@@ -223,6 +238,15 @@ int git_diff_basic_config(const char *var, const char
*value, void *cb)
return 0;
}
+ if (!strcmp(var, diff.submodule)) {
Shouldn't this be in
The problem with input filtering is that you can only filter for one
output scenario. What if the the input is going to be output in a wiki
like environment, or to pdf, or whatever? Then you have to unescape
the data again, and maybe apply filtering/escaping for those
environments.
You only know
On Tue, Nov 13, 2012 at 4:45 PM, Kevin i...@ikke.info wrote:
The problem with input filtering is that you can only filter for one
output scenario. What if the the input is going to be output in a wiki
like environment, or to pdf, or whatever? Then you have to unescape
the data again, and maybe
Jeff King p...@peff.net writes:
On Tue, Nov 13, 2012 at 07:42:58AM +0100, Felipe Contreras wrote:
...
5) GIT_COMMITTER
Who should the emails appear to be from? [Felipe Contreras 2nd
felipe.contrera...@gmail.com]
Whoa, what happened there?
Well:
$sender = $repoauthor ||
Ramkumar Ramachandra artag...@gmail.com writes:
Jeff King wrote:
On Sun, Nov 11, 2012 at 10:29:05PM +0530, Ramkumar Ramachandra wrote:
@@ -223,6 +238,15 @@ int git_diff_basic_config(const char *var, const char
*value, void *cb)
return 0;
}
+ if (!strcmp(var,
Michael J Gruber g...@drmicha.warpmail.net writes:
Michael J Gruber venit, vidit, dixit 12.11.2012 15:18:
'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
replacements.
Make it parse the argument to
乙酸鋰 ch3co...@gmail.com writes:
I ran git 1.8.0 command line
git revert --no-commit rev1 rev2
I see a prepared commit message like
Revert description from one commit
This reverts commit SHA1 of one commit.
The actual revert content is correct - it is all the relevant commits
that were
Peter Vereshagin pe...@vereshagin.org writes:
Am wondering if 'checkout branch path' undeletes the files?
git checkout branch path (by the way, branch does not have to be
a branch name; any commit object name would do, like git checkout
HEAD^^ hello.c) is a way to check out named path(s) out of
karsten.bl...@dcon.de writes:
Jeff King p...@peff.net wrote on 02.11.2012 16:38:00:
On Fri, Nov 02, 2012 at 11:26:16AM -0400, Jeff King wrote:
Still, I don't think we need to worry about performance regressions,
because people who don't have a setup suitable for it will not turn on
On Tue, Nov 13, 2012 at 10:06:26AM +0100, Felipe Contreras wrote:
Those people would also not be using a new version of git-send-email,
and it will always prompt. I thought we were talking about what
send-email should do in future versions. Namely, loosening that safety
valve (the prompt)
There are no users of this global variable, as queriers
go through the user_ident_sufficiently_given accessor.
Let's make it private, which will enable further
refactoring.
Signed-off-by: Jeff King p...@peff.net
---
cache.h | 4
ident.c | 6 +-
2 files changed, 5 insertions(+), 5
We keep track of whether the user ident was given to us
explicitly, or if we guessed at it from system parameters
like username and hostname. However, we kept only a single
variable. This covers the common cases (because the author
and committer will usually come from the same explicit
source),
Git-var currently only accepts a single value to print. This
is inefficient if the caller is interested in finding
multiple values, as they must invoke git-var multiple times.
This patch lets callers specify multiple variables, and
prints one per line.
Signed-off-by: Jeff King p...@peff.net
---
Internally, we keep track of whether the author or committer
ident information was provided by the user, or whether it
was implicitly determined by the system. However, there is
currently no way for external programs or scripts to get
this information without re-implementing the ident logic
git var recently learned to report on whether an ident we
fetch from it was configured explicitly or implicitly. Let's
make that information available to callers of the ident
function.
Because evaluating ident in an array versus scalar context
already has a meaning, we cannot return our extra
If git-send-email is configured with sendemail.from, we will
not prompt the user for the From address of the emails.
If it is not configured, we prompt the user, but provide the
repo author or committer as a default. Even though we
probably have a sensible value for the default, the prompt
is a
Junio C Hamano gits...@pobox.com writes:
Michael J Gruber g...@drmicha.warpmail.net writes:
Michael J Gruber venit, vidit, dixit 12.11.2012 15:18:
'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
On Tue, Nov 13, 2012 at 09:44:06AM -0500, Drew Northup wrote:
I don't buy the argument that we don't need to clean up the input as
well. There are scant few of us that are going to name a file
scriptalert(Something Awful)/script in this world (I am
probably one of them). Input validation is
On Tue, Nov 13, 2012 at 08:13:04AM -0800, Junio C Hamano wrote:
That's right, AUTHOR_IDENT would fall back to the default email and full
name.
Yeah, I find that somewhat questionable in the current behavior, and I'd
consider it a bug. Typically we prefer the committer ident when given
On Tue, Nov 13, 2012 at 12:35 AM, Jeff King p...@peff.net wrote:
On Sun, Nov 11, 2012 at 06:06:50PM +0100, Felipe Contreras wrote:
There's no point in asking this over and over if the user already
properly configured his/her name and email.
Signed-off-by: Felipe Contreras
On Tue, Nov 13, 2012 at 6:04 PM, Jeff King p...@peff.net wrote:
On Tue, Nov 13, 2012 at 09:44:06AM -0500, Drew Northup wrote:
Besides, inserting one call to esc_html only fixes one attack path. I
didn't look to see if all others were already covered.
Properly quoting output is something that
Jeff King p...@peff.net writes:
On Tue, Nov 13, 2012 at 08:13:04AM -0800, Junio C Hamano wrote:
That's right, AUTHOR_IDENT would fall back to the default email and full
name.
Yeah, I find that somewhat questionable in the current behavior, and I'd
consider it a bug. Typically we
On Tue, Nov 13, 2012 at 09:23:00AM -0800, Matt Kraai wrote:
Minor nits:
On Tue, Nov 13, 2012 at 11:53:20AM -0500, Jeff King wrote:
@@ -750,6 +750,10 @@ and either returns it as a scalar string or as an
array with the fields parsed.
Alternatively, it can take a prepared ident string
Junio C Hamano gits...@pobox.com writes:
As the topic seems to be already in Peff's next, here is a trivial
fix for this in incremental form.
-- 8 --
Subject: format-patch: add a blank line between notes and diffstat
The last line of the note text comes immediately before the diffstat
What's cooking in git.git (Nov 2012, #03; Tue, 13)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
This is my final what's cooking as
Am 13.11.2012 11:06, schrieb Nguyễn Thái Ngọc Duy:
On Windows, arguments starting with a forward slash is mangled as if
it were full pathname. This causes the patterns beginning with a slash
not to be passed to test-wildmatch correctly. Avoid mangling by never
accepting patterns starting with
Am 11.11.2012 11:13, schrieb Nguyễn Thái Ngọc Duy:
- if (c1 == CHAR_CLASS_MAX_LENGTH)
+ if (c1 CHAR_CLASS_MAX_LENGTH)
Nice catch! With this one and 14/13, all tests in t3070 pass on Windows.
-- Hannes
--
To unsubscribe from this list: send the line
Junio C Hamano gits...@pobox.com writes:
... and it is broken X-.
The blank line should be added before the diffstat, not after the
notes message (t3307 shows a case where we give notes without
diffstat, and we shouldn't be adding an extra blank line in that
case.
Second try.
-- 8 --
On Tue, Nov 13, 2012 at 11:15 AM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
Felipe Contreras venit, vidit, dixit 12.11.2012 23:47:
On Mon, Nov 12, 2012 at 10:41 PM, Jeff King p...@peff.net wrote:
On Sun, Nov 11, 2012 at 07:48:14PM +0100, Felipe Contreras wrote:
3. Exporters should
On Mon, Nov 12, 2012 at 9:07 PM, Marc Khouzam marc.khou...@gmail.com wrote:
this patch allows tcsh-users to get the benefits of the awesome
git-completion.bash script. It could also help other shells do the same.
Maybe you can try to take a look at the same for zsh:
Hello.
2012/11/13 08:43:31 -0800 Junio C Hamano gits...@pobox.com = To Peter
Vereshagin :
JCH Peter Vereshagin pe...@vereshagin.org writes:
JCH
JCH Am wondering if 'checkout branch path' undeletes the files?
JCH
JCH git checkout branch path (by the way, branch does not have to be
JCH a branch
Jeff King wrote:
On Sat, Nov 10, 2012 at 06:33:38PM +, Ramsay Jones wrote:
We should probably wrap it. I'm planning to queue this on top of Chris's
patch:
Unfortunately, I haven't had time yet to test this patch. (Early this week, I
went into hospital for a minor surgical procedure - I
Douglas Mencken wrote:
*Any* git clone fails with:
fatal: premature end of pack file, 106 bytes missing
fatal: index-pack failed
At first, I tried 1.8.0, and it failed. Then I tried to build 1.7.10.5
then, and it worked. Then I tried 1.7.12.2, but it fails the same way
as 1.8.0.
So I
Hi.
Am 13.11.2012 11:46, schrieb Nguyễn Thái Ngọc Duy:
Git's ispace does not include 11 and 12. Git's isprint includes
control space characters (10-13). According to glibc-2.14.1 on C
locale on Linux, this is wrong. This patch fixes it.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
Am 13.11.2012 11:46, schrieb Nguyễn Thái Ngọc Duy:
Git's isprint includes
control space characters (10-13). According to glibc-2.14.1 on C
locale on Linux, this is wrong. This patch fixes it.
isprint() is not in master, yet. Can we perhaps still introduce it in
such a way that we never have
Am 13.11.2012 11:46, schrieb Nguyễn Thái Ngọc Duy:
Git's ispace does not include 11 and 12. [...]
According to glibc-2.14.1 on C locale on Linux, this is wrong.
11 and 12 being vertical tab (\v) and form-feed (\f). This lack goes
back to the introduction of git's own character classifier
From: Felipe Contreras 2nd felipe.contrera...@gmail.com
Currently we keep getting questions even when the user has properly
configured his full name and password:
Who should the emails appear to be from?
[Felipe Contreras felipe.contre...@gmail.com]
And once a question pops up, other
Am 13.11.2012 11:46, schrieb Nguyễn Thái Ngọc Duy:
@@ -14,11 +14,11 @@ enum {
P = GIT_PATHSPEC_MAGIC, /* other non-alnum, except for ] and } */
X = GIT_CNTRL,
U = GIT_PUNCT,
- Z = GIT_CNTRL | GIT_SPACE
+ Z = GIT_CNTRL_SPACE
};
-const unsigned char
On Tue, Nov 13, 2012 at 11:15 AM, René Scharfe
rene.scha...@lsrfire.ath.cx wrote:
Linus, do you remember if you left them out on purpose?
Umm, no.
I have to wonder why you care? As far as I'm concerned, the only valid
space is space, TAB and CR/LF.
Anything else is *noise*, not space. What's
On Tue, Nov 13, 2012 at 11:40 AM, Linus Torvalds
torva...@linux-foundation.org wrote:
I have to wonder why you care? As far as I'm concerned, the only valid
space is space, TAB and CR/LF.
Anything else is *noise*, not space. What's the reason for even caring?
Btw, expanding the whitespace
Jeff King p...@peff.net writes:
This is my final what's cooking as interim maintainer. I didn't
graduate anything to master, but I updated my plans for each topic to
give Junio an idea of where I was.
After exploding the first-parent history between your master..pu
into component topics and
Thanks for the review.
On Tue, Nov 13, 2012 at 6:14 AM, SZEDER Gábor sze...@ira.uka.de wrote:
Hi,
On Mon, Nov 12, 2012 at 03:07:46PM -0500, Marc Khouzam wrote:
Hi,
[...]
Signed-off-by: Marc Khouzam marc.khou...@gmail.com
[...]
Thanks
Marc
---
When commiting with git-commit no newline in the author string
is possible. But other git clients don't have the same validations
for the author name. And, it is possible to have a commit like:
commit
Merge: a b
Author: User Name
user.n...@domain.com
Date: Thu Nov 8 17:01:02
On Tue, Nov 13, 2012 at 5:48 PM, Jeff King p...@peff.net wrote:
On Tue, Nov 13, 2012 at 10:06:26AM +0100, Felipe Contreras wrote:
I think you are the one that is not understanding what I'm saying. But
I don't think it matters.
This is what I'm saying; the current situation with 'git commit'
* ml/cygwin-mingw-headers (2012-11-12) 1 commit
- Update cygwin.c for new mingw-64 win32 api headers
Make git work on newer cygwin.
Will merge to 'next'.
(Sorry for late answer, I managed to test the original patch minutes before
Peff merged it to pu)
(And thanks for maintaining git)
-Original Message-
From: Torsten Bögershausen
Sent: Tuesday, November 13, 2012 3:45 PM
* ml/cygwin-mingw-headers (2012-11-12) 1 commit
- Update cygwin.c for new mingw-64 win32 api headers
Make git work on newer cygwin.
Will merge to 'next'.
(Sorry for late answer, I
On Mon, Nov 12, 2012 at 9:47 AM, Junio C Hamano gits...@pobox.com wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
The log message of the original commit (0454dd93bf) described the
following scenario: a /home partition under which user home directories
are automounted, and setting
On 13.11.12 19:55, Ramsay Jones wrote:
Douglas Mencken wrote:
*Any* git clone fails with:
fatal: premature end of pack file, 106 bytes missing
fatal: index-pack failed
At first, I tried 1.8.0, and it failed. Then I tried to build 1.7.10.5
then, and it worked. Then I tried 1.7.12.2, but it
Chris Rorvick ch...@rorvick.com writes:
Minor changes since from v2 set. Reposting primarily because I mucked
up the Cc: list (again) and hoping to route feedback to the appropriate
audience.
This patch set can be divided into two sets:
1. Provide useful advice for rejected tag
Am 13.11.2012 17:46, schrieb Junio C Hamano:
karsten.bl...@dcon.de writes:
If anything, fix your mailer probably is the policy you are
looking for, I think.
Well then...I've cloned myself @gmail, I hope this is better.
Just some provoking thoughts...(if I may):
RFC-5322 recommends wrapping
Torsten Bögershausen tbo...@web.de writes:
Are there more people running PowerPC (on the server side) ?
I cannot reproduce the problem (on openSUSE 12.2).
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
And now for
If a file is deleted with git rm and a patch
is then generated with git format-patch -M -
--
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
(Sorry about the partial message.
evolution and ctrl-enter sends, grumble...)
If a file is deleted with git rm and a patch
is then generated with git format-patch -M -D
git am is unable to apply the resultant patch.
Is this working as designed?
--
To unsubscribe from this list: send the line
Joe Perches j...@perches.com writes:
(Sorry about the partial message.
evolution and ctrl-enter sends, grumble...)
If a file is deleted with git rm and a patch
is then generated with git format-patch -M -D
git am is unable to apply the resultant patch.
Is this working as designed?
I
Jeff King p...@peff.net writes:
What's cooking in git.git (Nov 2012, #03; Tue, 13)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
On Tue, 2012-11-13 at 14:55 -0800, Junio C Hamano wrote:
Joe Perches j...@perches.com writes:
(Sorry about the partial message.
evolution and ctrl-enter sends, grumble...)
If a file is deleted with git rm and a patch
is then generated with git format-patch -M -D
git am is unable to
Jeff King p...@peff.net writes:
We currently just look at raw blob data when using -S to
pickaxe. This is mostly historical, as pickaxe predates the
textconv feature. If the user has bothered to define a
textconv filter, it is more likely that their search string will be
on the textconv
Peter Vereshagin pe...@vereshagin.org writes:
$ rm -r pathdir
$ git checkout branch00 pathdir
$ find pathdir/
pathdir/
pathdir/file00.txt
pathdir/file01.txt
$
Hasn't this been fixed at 0a1283b (checkout $tree $path: do not
clobber local changes in $path not in $tree,
Hi,
On Tue, Nov 13, 2012 at 03:12:44PM -0500, Marc Khouzam wrote:
+if [ -n $1 ] ; then
+ # If there is an argument, we know the script is being executed
+ # so go ahead and run the _git_complete_with_output function
+ _git_complete_with_output $1 $2
Where does the second argument
Phil Hord wrote:
Junio C Hamano wrote:
Phil Hord ho...@cisco.com writes:
State token strings which may be emitted and their meanings:
merge a merge is in progress
am an am is in progress
am-is-emptythe am patch is empty
rebase
On Sun, Nov 11, 2012 at 11:08 PM, Chris Rorvick ch...@rorvick.com wrote:
Minor changes since from v2 set.
.
An email thread initiated by Angelo Borsotti did not come to a
consensus on how push should behave with regard to tag references.
Minor Nit: Without the link to gmane it
Hi,
I've got two more comments.
On Mon, Nov 12, 2012 at 03:07:46PM -0500, Marc Khouzam wrote:
@@ -2481,3 +2483,52 @@ __git_complete gitk __gitk_main
if [ Cygwin = $(uname -o 2/dev/null) ]; then
__git_complete git.exe __git_main
fi
+
+# Method that will output the result of the
On Tue, Nov 13, 2012 at 07:31:45PM +0100, Felipe Contreras wrote:
On Mon, Nov 12, 2012 at 9:07 PM, Marc Khouzam marc.khou...@gmail.com wrote:
+ # Call _git() or _gitk() of the bash script, based on the first
+ # element of the command-line
+ _${COMP_WORDS[0]}
You might
The list of all git commands is computed from the output of 'git help
-a', which already includes 'help', so there is no need to explicitly
add it once more when computing the list of porcelain commands.
Note that 'help' wasn't actually offered twice because of this,
because Bash filters
On 11/13/2012 03:45 PM, Torsten Bögershausen wrote:
* ml/cygwin-mingw-headers (2012-11-12) 1 commit
- Update cygwin.c for new mingw-64 win32 api headers
Make git work on newer cygwin.
Will merge to 'next'.
(Sorry for late answer, I managed to test the original patch minutes before
Peff
Do I have the right list for bug reports? Apologies if not.
On Tue, Nov 6, 2012 at 5:58 PM, Jack O'Connor oconnor...@gmail.com wrote:
I'm summarizing from here:
http://stackoverflow.com/questions/5904256/git-subtree-merge-into-a-deeply-nested-subdirectory
Quick repro:
1) I do an initial
1 - 100 of 104 matches
Mail list logo
