Documentation/git-checkout.txt: Inconsistent naming of paths arguments

2013-07-19 Thread Adam Brengesjö
From SYNOPSIS: git checkout [-p|--patch] [tree-ish] [--] [paths…] From DESCRIPTION git checkout [-p|--patch] [tree-ish] [--] pathspec… 1. Named paths in SYNOPSIS, but pathspec in DESCRIPTION. (It's referred to as path in the body text). 2. paths is marked as optional in SYNOPSIS, but

Re: [PATCH] Add the GIT_SENTINEL macro

2013-07-19 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: It seems to apply well on the tip of jk/gcc-function-attributes. - This macro is not about git at all, so I'll edit the patch to call it GCC_ATTR_SENTINEL before applying. Would naming it something like

Re: [PATCH 6/6] diff: deprecate -q option to diff-files

2013-07-19 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: We should remove the support for -q in Git 2.0. No. I hope you are teasing. I don't mind seeing support for -q dropped, but I really don't think it's worth delaying git 2.0 for that. Would s/in Git 2.0/in some future

Re: Documentation/git-checkout.txt: Inconsistent naming of paths arguments

2013-07-19 Thread Duy Nguyen
On Fri, Jul 19, 2013 at 2:16 PM, Adam Brengesjö ca.brenge...@gmail.com wrote: From SYNOPSIS: git checkout [-p|--patch] [tree-ish] [--] [paths…] From DESCRIPTION git checkout [-p|--patch] [tree-ish] [--] pathspec… 1. Named paths in SYNOPSIS, but pathspec in DESCRIPTION. (It's referred

Re: [PATCH] git add -e: Explicitly specify that patch should have no color

2013-07-19 Thread Matthieu Moy
Andrew Wong andrew.k...@gmail.com writes: After this commit: 4c7f1819b3c142ace98269a556bc929c80e7c9fd make color.ui default to 'auto' the patch file for 'git add -e' receives all the color codes. This is because diffopt.use_color defaults to -1, which causes want_color to now return

Git Clone Parameter

2013-07-19 Thread Allan Acheampong
Hi, it would be nice to have a parameter on 'git clone' that not only clones the repo, but also creates local branches for ALL the branches that are in the repo. I'm new to git, but I found it very confusing to understand the difference between remote , remotes. Is it in the cloned repo, or is

Re: Git Clone Parameter

2013-07-19 Thread Ramkumar Ramachandra
Allan Acheampong wrote: I could write a script with for each in but thats way too much hassle $ git for-each-ref --format=%(refname) refs/remotes/origin/ | sed 's/refs\/remotes\/origin\///;/HEAD\|master/d' | xargs git checkout -b (completely untested ofcourse) Do you see what the problem is

[RFC] checkout --rebase

2013-07-19 Thread Ramkumar Ramachandra
Hi, I'm often work on small topic branches, and find myself doing this quite often: # on branch master $ git checkout um-build $ git rebase master This is horribly inefficient; the first operation takes a _really_ long time to complete, since master updates itself very often and I have to

[RFC] Delete current branch

2013-07-19 Thread Ramkumar Ramachandra
Hi, Many of my ideas turn out to be really stupid, and I need to throw away my feature branch. So, I find myself doing this often: # on branch menuconfig-jk $ git checkout master $ git branch -DBACKSAPCE # er, what was the branch name again? $ git checkout - # Ah $ git checkout

Re: [RFC] checkout --rebase

2013-07-19 Thread Sebastian Staudt
Isn't this what you want? $ git rebase master um-build 2013/7/19 Ramkumar Ramachandra artag...@gmail.com: Hi, I'm often work on small topic branches, and find myself doing this quite often: # on branch master $ git checkout um-build $ git rebase master This is horribly

Re: [RFC] checkout --rebase

2013-07-19 Thread Ramkumar Ramachandra
Sebastian Staudt wrote: Isn't this what you want? $ git rebase master um-build Ha, yes. Sorry about the stupidity. -- 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

Re: [RFC] checkout --rebase

2013-07-19 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: Sebastian Staudt wrote: Isn't this what you want? $ git rebase master um-build Ha, yes. Sorry about the stupidity. Hm, I'm not entirely sure how to optimize the codepath to eliminate the checkout. It seems to be absolutely necessary atleast in the -i codepath.

Re: [RFC] checkout --rebase

2013-07-19 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: diff --git a/git-rebase.sh b/git-rebase.sh index 0039ecf..7405d9a 100755 --- a/git-rebase.sh +++ b/git-rebase.sh Er, sorry. I think it suffices to check that $branch_name equals HEAD, for this optimization. -- To unsubscribe from this list: send the line

Re: [PATCH] TIG: Fix to reinstate proper operation with no arguments

2013-07-19 Thread Drew Northup
On Fri, Jul 19, 2013 at 12:07 AM, Jonas Fonseca fons...@diku.dk wrote: On Thu, Jul 18, 2013 at 9:30 AM, Drew Northup n1xim.em...@gmail.com wrote: Somehow this patch breaks the main view to not open the correct commit in diff view when enter is pressed. Back to the debugger... Does this

[PATCH v2 0/3] git-gui translation update

2013-07-19 Thread Yamada Saburo
lib/option.tcl |2 +- po/git-gui.pot | 1056 +++ po/ja.po | 1143 ++-- 3 files changed, 1195 insertions(+), 1006 deletions(-) -- To unsubscribe from this list: send the line unsubscribe

Re: [PATCH v2 1/3] Add translation (yes,no,ask)

2013-07-19 Thread Yamada Saburo
Signed-off-by: Yamada Saburo devil.tamac...@gmail.com --- lib/option.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/option.tcl b/lib/option.tcl index 0cf1da1..7af858c 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -158,7 +158,7 @@ proc do_options {} {

Re: [PATCH v2 2/3] Update po/git-gui.pot

2013-07-19 Thread Yamada Saburo
Signed-off-by: Yamada Saburo devil.tamac...@gmail.com --- po/git-gui.pot | 1056 +++- 1 file changed, 578 insertions(+), 478 deletions(-) diff --git a/po/git-gui.pot b/po/git-gui.pot index 0c94f9c..97ed37a 100644 --- a/po/git-gui.pot +++

Re: [RFC] checkout --rebase

2013-07-19 Thread Ramkumar Ramachandra
Damn it: checkout doesn't get executed at all because the $mb = $onto condition fails; I was looking in the wrong place. It's format-patch and am that are slowing things down terribly. Has anyone looked into stripping out the dependency? Why is cherry-pick deficient? My current workaround is

[PATCH v6 1/4] config: add support for http.url.* settings

2013-07-19 Thread Kyle J. McKay
The credentials configuration values already support url-specific configuration items in the form credential.url.*. This patch adds similar support for http configuration values. The url value is considered a match to a url if the url value is either an exact match or a prefix of the url which

[PATCH v6 0/4] config: add support for http.url.* settings

2013-07-19 Thread Kyle J. McKay
NOTE: This patch requires the following preparatory change: f1ff763 http.c: fix parsing of http.sslCertPasswordProtected variable which is currently in pu. This patch series adds support for http.url.* settings. The patch is organized as a series of improvements on the functionality: 1/4 -

[PATCH v6 4/4] config: allow http.url.* any user matching

2013-07-19 Thread Kyle J. McKay
Previously the url had to specify an exactly matching user name and password if those were present in the url being matched against. Now the password portion is always ignored and omitting the user name from url allows it to match against any user name. Signed-off-by: Kyle J. McKay

[PATCH v6 3/4] tests: add new test for the url_normalize function

2013-07-19 Thread Kyle J. McKay
In order to perform sane URL matching for http.url.* options, http.c normalizes URLs before performing matches. A new test-url-normalize test program is introduced along with a new t5200-url-normalize.sh script to run the tests. Since the url_normalize function currently lives in http.c this

[PATCH v6 2/4] config: improve support for http.url.* settings

2013-07-19 Thread Kyle J. McKay
Improve on the http.url.* url matching behavior by first normalizing the urls before they are compared. With this change, for example, the following configuration section: [http https://example.com/path;] useragent = example-agent sslVerify = false will properly match a

Re: Git Clone Parameter

2013-07-19 Thread Johannes Sixt
Am 7/19/2013 11:21, schrieb Allan Acheampong: Something like 'git clone theRepo -createLocalBranchesForAllBranches' Perhaps: $ git clone theRepo $ git fetch origin refs/heads/*:refs/heads/* (untested). There may be ways to write the same shorter, but I've lost track of what is and what is not

[PATCH] status_printf_ln: Suppress false positive warnings of empty format string.

2013-07-19 Thread Stefan Beller
This is a response to 8dd0ee823f1829a3aa228c3c73e31de5c89b5317. Instead of having an empty string as format for the printf like function status_printf_ln, we could insert an empty string into the format parameter. A similar fixup commit is found in linux (2e4c332913b5), but there the empty

Re: Documentation/git-checkout.txt: Inconsistent naming of paths arguments

2013-07-19 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Fri, Jul 19, 2013 at 2:16 PM, Adam Brengesjö ca.brenge...@gmail.com wrote: From SYNOPSIS: git checkout [-p|--patch] [tree-ish] [--] [paths…] From DESCRIPTION git checkout [-p|--patch] [tree-ish] [--] pathspec… 1. Named paths in SYNOPSIS, but

Re: [RFC] Delete current branch

2013-07-19 Thread Ramkumar Ramachandra
Andreas Schwab wrote: Ramkumar Ramachandra artag...@gmail.com writes: # er, what was the branch name again? $ git checkout - You could take a look in the reflog. Yeah, or use the @{-N} revision to do that for me. My scripted version is essentially: test true = $(git rev-parse

Re: [RFC] Delete current branch

2013-07-19 Thread Andreas Schwab
Ramkumar Ramachandra artag...@gmail.com writes: # er, what was the branch name again? $ git checkout - You could take a look in the reflog. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 And now for something

Re: [RFC] Delete current branch

2013-07-19 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Many of my ideas turn out to be really stupid, and I need to throw away my feature branch. So, I find myself doing this often: # on branch menuconfig-jk $ git checkout master $ git branch -DBACKSAPCE # er, what was the branch name

Re: [PATCH v2 03/19] read-cache: move index v2 specific functions to their own file

2013-07-19 Thread Thomas Gummerer
Duy Nguyen pclo...@gmail.com writes: On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer t.gumme...@gmail.com wrote: @@ -489,8 +479,8 @@ extern void *read_blob_data_from_index(struct index_state *, const char *, unsig #define CE_MATCH_RACY_IS_DIRTY 02 /* do stat comparison even if

Re: Git Clone Parameter

2013-07-19 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: Am 7/19/2013 11:21, schrieb Allan Acheampong: Something like 'git clone theRepo -createLocalBranchesForAllBranches' Perhaps: $ git clone theRepo $ git fetch origin refs/heads/*:refs/heads/* (untested). There may be ways to write the same

[PATCH] Cygwin has trustable filemode

2013-07-19 Thread Mark Levedahl
The supported Cygwin distribution on supported Windows versions provides complete support for POSIX filemodes, so enable this by default. git as distributed by the Cygwin project is configured this way. This fixes one testsuite failure: t3300 test 17 (diff-index -M -p with mode change quotes

Re: Git Clone Parameter

2013-07-19 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Allan Acheampong wrote: I could write a script with for each in but thats way too much hassle $ git for-each-ref --format=%(refname) refs/remotes/origin/ | sed 's/refs\/remotes\/origin\///;/HEAD\|master/d' | xargs git checkout -b

Re: Git Clone Parameter

2013-07-19 Thread Junio C Hamano
Allan Acheampong allanad...@gmail.com writes: ... I'm new to git, but I found it very confusing to understand the difference between remote , remotes. Is it in the cloned repo, or is it in a remote place? If its local, why doesn't it get shown when I do 'git branch' but when I do 'git branch

Re: [RFC/PATCH v2 1/1] cygwin: Add fast_lstat() and fast_fstat() functions

2013-07-19 Thread Mark Levedahl
On 07/18/2013 07:32 PM, Junio C Hamano wrote: Mark Levedahl mleved...@gmail.com writes: Unlike the results on the fast Win7 laptop, the above show statistically significant slow down from the fast_lstat approach. I'm just not seeing a case for the special case handling, and of course Junio has

Re: [PATCH] status_printf_ln: Suppress false positive warnings of empty format string.

2013-07-19 Thread Stefan Beller
Even if the variant is faster, it does not matter if its output is incorrect ;-) Agreed. I think we discussed this already? The conclusion was it is silly for GCC to warn on -Wformat-zero-length for user-defined function in the first place, IIRC. func(other, args, fmt,...), when

Re: [PATCH] status_printf_ln: Suppress false positive warnings of empty format string.

2013-07-19 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: This is a response to 8dd0ee823f1829a3aa228c3c73e31de5c89b5317. Instead of having an empty string as format for the printf like function status_printf_ln, we could insert an empty string into the format parameter. A similar fixup commit is

Typo in git-reset man page.

2013-07-19 Thread Ibrahim M. Ghazal
On this line: https://git.kernel.org/cgit/git/git.git/tree/Documentation/git-reset.txt#n12 tree-sh should be tree-ish. -- 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

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-19 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: Junio C Hamano wrote: [ ... ] * rr/send-email-ssl-verify (2013-07-06) 6 commits - SQUASH??? update to support SSL_ca_file as well as SSL_ca_path - SQUASH??? send-email: cover both smtps and starttls cases - fixup! send-email: squelch

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: +When `git pull` that does not explicitly specify what branch from +which repository is to be integrated with your history on the +command line, recent Git will refuse to work until you specify how +that integration should happen, either with a

[PATCH] Documentation, git reset: fix typo.

2013-07-19 Thread Stefan Beller
Reported-By: Ibrahim M. Ghazal img...@gmail.com Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- Documentation/git-reset.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index a404b47..f445cb3 100644 ---

Re: [RFC] Delete current branch

2013-07-19 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Did you know that the general way to spell the branch previously you were on is @{-1} and checkout - is an ugly special case that is possible only because checkout does not happen to take a - as a valid argument that means something else (like the more usual read from

Re: Git Clone Parameter

2013-07-19 Thread Ramkumar Ramachandra
Junio C Hamano wrote: git branch -t $branchname origin/$branchname A couple of notes here: 1. I use git branch -u personally. Why the -t variant? 2. Don't we auto-track? (or is that only on checkout) -- To unsubscribe from this list: send the line unsubscribe git in the body of a

Re: Git Clone Parameter

2013-07-19 Thread Ramkumar Ramachandra
Junio C Hamano wrote: You would at least need xargs -n 1 for the produced command line to make any sense, and it is wasteful to actually check out each and every branch to the working tree only to create it. Right. xargs -n 1, git branch, and refname:short. -- To unsubscribe from this list:

Re: [PATCH] Cygwin has trustable filemode

2013-07-19 Thread Junio C Hamano
Mark Levedahl mleved...@gmail.com writes: Junio - The above notes are more accurate than in my previous commit message, so if this commit survives into next/master, I would prefer this version as opposed to the one now on pu (da875762) Thanks, will replace. What do we want to do with the

Re: [RFC] Delete current branch

2013-07-19 Thread Taylor Hedberg
Junio C Hamano, Fri 2013-07-19 @ 09:48:06-0700: But there is a very commonly accepted long tradition for - to mean read from the standard input, so we cannot reuse it to mean the branch I was previously on for every command without first making sure the command will never want to use - for the

Re: [PATCH] Documentation, git reset: fix typo.

2013-07-19 Thread Jonathan Nieder
Stefan Beller wrote: --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -9,7 +9,7 @@ SYNOPSIS [verse] 'git reset' [-q] [tree-ish] [--] paths... -'git reset' (--patch | -p) [tree-sh] [--] [paths...] +'git reset' (--patch | -p) [tree-ish] [--] [paths...]

Re: [RFC] Delete current branch

2013-07-19 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: Did you know that the general way to spell the branch previously you were on is @{-1} and checkout - is an ugly special case that is possible only because checkout does not happen to take a - as a valid argument that means

Re: [PATCH v3 1/3] l10n: de.po: switch from pure German to German+English (part 1)

2013-07-19 Thread Ralf Thielow
Am 17. Juli 2013 18:24 schrieb Ralf Thielow ralf.thie...@gmail.com: This switches the translation from pure German to German+English. Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 568 +++ 1 file changed, 284

Re: [RFC] Delete current branch

2013-07-19 Thread Ramkumar Ramachandra
Junio C Hamano wrote: That limits the context we could use - and we cannot consistently use it everywhere. I find _that_ ugly from the design cleanliness point of view. Right, noted. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v2 00/19] Index-v5

2013-07-19 Thread Thomas Gummerer
Junio C Hamano gits...@pobox.com writes: Thomas Gummerer t.gumme...@gmail.com writes: Ah ok, I understand. I think it's best to add a GIT_INDEX_VERSION=x config option to config.mak, where x is the index version that should be tested. Whatever you do, please do not call it

Re: [PATCH] do_one_ref(): save and restore value of current_ref

2013-07-19 Thread Michael Haggerty
On 07/17/2013 09:03 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: If do_one_ref() is called recursively, then the inner call should not permanently overwrite the value stored in current_ref by the outer call. Aside from the tiny optimization loss, peel_ref()

Re: [PATCH 1/3] treewalk.c: Rename variable ret to cb_bits and remove some dead lines.

2013-07-19 Thread Junio C Hamano
The ret was meant to mean the return value we got from the callback function, not the return value we would give our caller. This rename is a bit misleading in that cb_bits == -1 does not mean full bits set, and it does not tell us much what these bits signify. They are used to answer this

Re: [PATCH] Cygwin has trustable filemode

2013-07-19 Thread Mark Levedahl
On 07/19/2013 12:40 PM, Junio C Hamano wrote: Thanks, will replace. What do we want to do with the compat/regex build-time switch? IIRC, this was only needed for 1.7 and not 1.5, and I also would expect (without anything to back-up, so this is more a faith than expectation) over time the new

Re: Git Clone Parameter

2013-07-19 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Friday, July 19, 2013 4:02 PM Allan Acheampong allanad...@gmail.com writes: ... I'm new to git, but I found it very confusing to understand the difference between remote , remotes. Is it in the cloned repo, or is it in a remote place? If its local,

Re: [PATCH v2 00/19] Index-v5

2013-07-19 Thread Junio C Hamano
Thomas Gummerer t.gumme...@gmail.com writes: What I currently did is add a environment variable GIT_INDEX_VERSION that is used only if there is no index yet, to make sure existing repositories aren't affected and still have to be converted explicitly by using git update-index. For the tests

Re: Git Clone Parameter

2013-07-19 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: Allan Acheampong allanad...@gmail.com writes: ... I'm new to git, but I found it very confusing to understand the difference between remote , remotes. Is it in the cloned repo, or is it in a remote place? If its local, why doesn't it get shown when

Re: [PATCH] Cygwin has trustable filemode

2013-07-19 Thread Junio C Hamano
Mark Levedahl mleved...@gmail.com writes: Related: Should we have separate settings for 1.5 and 1.7 for several variables? Conflicts I see not reflected in config.mak.uname on pu: trustable filemode (1.7 has, 1.5 does not) MMAP/Pread (1.7 pread is thread safe, 1.5 I dont think was,

Re: [RFC] Delete current branch

2013-07-19 Thread Junio C Hamano
Taylor Hedberg tmhedb...@gmail.com writes: Junio C Hamano, Fri 2013-07-19 @ 09:48:06-0700: But there is a very commonly accepted long tradition for - to mean read from the standard input, so we cannot reuse it to mean the branch I was previously on for every command without first making sure

Re: [PATCH] do_one_ref(): save and restore value of current_ref

2013-07-19 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: I sent the patch shortly before leaving for a trip so I didn't have time to make it as complete as I would have liked. But given that the problem was already in master, and the fix is pretty simple, I wanted to send the fix right away. When I

Re: [PATCH v6 1/4] config: add support for http.url.* settings

2013-07-19 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: +static size_t http_option_max_matched_len[OPT_MAX]; ... +static int new_match_is_shorter(size_t matchlen, enum http_option_type opt) +{ + /* + * Compare matchlen to the last matched length of option opt and + * return true if matchlen

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Eric Sunshine
On Fri, Jul 19, 2013 at 12:22 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: +When `git pull` that does not explicitly specify what branch from +which repository is to be integrated with your history on the +command line, recent Git will refuse to

Re: [PATCH 1/3] treewalk.c: Rename variable ret to cb_bits and remove some dead lines.

2013-07-19 Thread Stefan Beller
On 07/19/2013 08:13 PM, Junio C Hamano wrote: The ret was meant to mean the return value we got from the callback function, not the return value we would give our caller. Thanks for clarifying. I assumed the ret was meant as the return value of that function as it was the case before e6c111b4c.

[PATCH] traverse_trees(): clarify return value of the callback.

2013-07-19 Thread Stefan Beller
The variable name ret sounds like the variable to be returned, but since e6c111b4 we return error. Hence the variable name is miss leading. As this variable is used only to extract the bits from the callback of a tree object, trees_used is a better name. Also the assignment to 0 was removed at

Re: [RFC/PATCH] rev-parse(1): logically group options

2013-07-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: The options section of the git-rev-parse manual page has grown organically so that there now does not seem to be much logic behind the ordering of the options. It also does not make it clear that certain options must appear first on the command line.

Re: [PATCH v6 2/4] config: improve support for http.url.* settings

2013-07-19 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: +#define URL_ALPHA ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +#define URL_DIGIT 0123456789 +#define URL_HEXDIGIT URL_DIGIT ABCDEFabcdef +#define URL_ALPHADIGIT URL_ALPHA URL_DIGIT +#define URL_SCHEME_CHARS URL_ALPHADIGIT +.- +#define

Re: Git tag output order is incorrect (IMHO)

2013-07-19 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: Rahul Bansal rahul.ban...@rtcamp.com writes: IMHO git tag is expected to show tag-list ordered by versions. A git tag can be anything, not related to versions at all. Correct. But that does not prevent somebody to add git tag --sort=X option to

Сумка - легенда из итальянского бутика за I5 955 р!

2013-07-19 Thread frankywong
Теплый шарфик в дар! http://cortalo.com/83526 -- 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

Re: [PATCH 6/6] diff: deprecate -q option to diff-files

2013-07-19 Thread Jonathan Nieder
Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: I don't mind seeing support for -q dropped, but I really don't think it's worth delaying git 2.0 for that. Would s/in Git 2.0/in some future release/ be ok? I do not think keeping the support for -q in is any huge burden. We

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: Dropping the parenthetical comment might improve flow slightly: Without repository or branch on the command line, `git pull` needs to be told how to integrate the changes with your history, via either `--merge` or `--rebase`. With

Re: [PATCH 1/3] treewalk.c: Rename variable ret to cb_bits and remove some dead lines.

2013-07-19 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: So is there any up-to-date task list for beginning contributors? I am fairly bad at keeping track of small things incrementally, as it is often quicker to do them myself if/when I were so inclined, but there are too many of them and a day does

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Eric Sunshine
On Fri, Jul 19, 2013 at 6:20 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: Dropping the parenthetical comment might improve flow slightly: Without repository or branch on the command line, `git pull` needs to be told how to integrate the

[PATCH 3/4] Cygwin 1.7 has thread-safe pread

2013-07-19 Thread Mark Levedahl
Per http://cygwin.com/ml/cygwin/2012-07/msg00331.html , cygwin 1.7 was modified to explicitly support git's use of pread, so make this the default. Do not affect earlier cygwin versions. Signed-off-by: Mark Levedahl mleved...@gmail.com --- config.mak.uname | 2 +- 1 file changed, 1 insertion(+),

Re: One question about git-format-patch

2013-07-19 Thread Junio C Hamano
I’m a git user, and recently I’ve noticed there’re some differences between “$ git format-patch –n” and “$ git format-patch HEAD~n”. According to the documentation: “-n Prepare patches from the topmost n commits.” Correct. However, HEAD~n will prepare patches for commits that are not ancestor

[PATCH 2/4] Cygwin 1.7 needs compat/regex

2013-07-19 Thread Mark Levedahl
Cygwin v1.7 uses the regex library from newlib which does not pass git's tests, so don't use it. This fixes failures in t4018 and t4034. Continue to use the platform supplied regex library for earlier versions. Signed-off-by: Mark Levedahl mleved...@gmail.com --- config.mak.uname | 2 ++ 1 file

Re: [PATCH v2] pull: require choice between rebase/merge on non-fast-forward pull

2013-07-19 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: With no repository or branch on the command line, `git pull` needs to be told how to integrate the changes with your history. This can be done via either `--merge` or `--rebase` option, but most people would want to decide which

Re: [RFC] Delete current branch

2013-07-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: Did you know that the general way to spell the branch previously you were on is @{-1} and checkout - is an ugly special case that is possible only because checkout does not happen

[PATCH 1/4] Cygwin 1.7 has trustable filemode

2013-07-19 Thread Mark Levedahl
The current Cygwin 1.7 distribution on supported Windows versions provides complete support for POSIX filemodes, so enable this by default. git as distributed by the Cygwin project is configured this way. Cygwin 1.5 installations are less likely to have this support, so leave the old default in

[PATCH 4/4] Cygwin 1.7 supports mmap

2013-07-19 Thread Mark Levedahl
git has shipped for years with MMAP enabled in the stock distribution, there are no reports of problems / failures on the list relating to this. Leave the default as-is on v1.5 due to lack of knowlege of this working on earlier Cygwin. Signed-off-by: Mark Levedahl mleved...@gmail.com ---

Re: [PATCH] Cygwin has trustable filemode

2013-07-19 Thread Mark Levedahl
On 07/19/2013 03:16 PM, Junio C Hamano wrote: Mark Levedahl mleved...@gmail.com writes: Related: Should we have separate settings for 1.5 and 1.7 for several variables? Conflicts I see not reflected in config.mak.uname on pu: trustable filemode (1.7 has, 1.5 does not) MMAP/Pread

Re: [PATCH] Cygwin has trustable filemode

2013-07-19 Thread Jonathan Nieder
Mark Levedahl wrote: After merging the following into current pu, all tests that run by default pass on Cygwin 1.7, i.e. prove -j 8 t[0-9]*.sh reports All tests successful. I've *never* had this happen on Cygwin before. Nice. Thanks for your hard work. -- To unsubscribe from this list:

RESPOND URGENTLY!!

2013-07-19 Thread GEORGE DANIELS
Greetings from George Daniels I am George Daniels, a Banker and credit system programmer (HSBC bank). I saw your email address while browsing through the bank D.T.C Screen in my office yesterday so I decided to use this very chance to know you. I believe we should use every opportunity to know

Re: [PATCH v6 2/4] config: improve support for http.url.* settings

2013-07-19 Thread Kyle J. McKay
On Jul 19, 2013, at 12:59, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: +#define URL_ALPHA ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +#define URL_DIGIT 0123456789 +#define URL_HEXDIGIT URL_DIGIT ABCDEFabcdef +#define URL_ALPHADIGIT URL_ALPHA URL_DIGIT +#define

Re: [PATCH v6 1/4] config: add support for http.url.* settings

2013-07-19 Thread Kyle J. McKay
On Jul 19, 2013, at 13:08, Junio C Hamano wrote: Kyle J. McKay mack...@gmail.com writes: @@ -337,7 +472,7 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) http_is_verbose = 0; - git_config(http_options, NULL); + git_config(http_options,

Re: Git tag output order is incorrect (IMHO)

2013-07-19 Thread Jeff King
On Fri, Jul 19, 2013 at 12:40:55PM -0700, Junio C Hamano wrote: Andreas Schwab sch...@linux-m68k.org writes: Rahul Bansal rahul.ban...@rtcamp.com writes: IMHO git tag is expected to show tag-list ordered by versions. A git tag can be anything, not related to versions at all.

Re: One question about git-format-patch

2013-07-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I’m a git user, and recently I’ve noticed there’re some differences between “$ git format-patch –n” and “$ git format-patch HEAD~n”. According to the documentation: “-n Prepare patches from the topmost n commits.” Correct. However, HEAD~n will

Re: [PATCH v6 2/4] config: improve support for http.url.* settings

2013-07-19 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: If you mean for all the strchr etc. calls, multiple tables would be required since URL_SCHEME_CHARS and URL_HOST_CHARS partially overlap, The entries of the table could be at least 8-bit wide, so there shouldn't be any problem, should there? but it

Re: [PATCH 5/7] fetch-pack: support fetching from a shallow repository

2013-07-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Only server graft points that do not have corresponding SHA-1s in local repo are added to the temp shallow file because we don't want to accidentally cut the client history because the server's is shorter. The client cutting can only happen when

Re: [PATCH 3/7] connect.c: teach get_remote_heads to parse shallow lines

2013-07-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: diff --git a/cache.h b/cache.h index dd0fb33..7665e03 100644 --- a/cache.h +++ b/cache.h @@ -1091,6 +1091,7 @@ struct extra_have_objects { }; extern struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,

[PATCH] t2202: make sure git add (no args) stays a no-op

2013-07-19 Thread Junio C Hamano
Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t2202-add-addremove.sh | 10 ++ 1 file changed, 10 insertions(+) diff --git a/t/t2202-add-addremove.sh b/t/t2202-add-addremove.sh index 6a81510..fc8b59e 100755 --- a/t/t2202-add-addremove.sh +++ b/t/t2202-add-addremove.sh @@ -41,4