Re: confusion with some `git reset` commands

2014-12-18 Thread Kevin
On Tue, Dec 16, 2014 at 7:39 PM, Arup Rakshit arupraks...@rocketmail.com wrote: Hi, .. But I am looking for any differences - a) git reset --soft and git reset --keep git reset --keep is a safer version of git reset --hard. It will reset the working tree. but will abort when it has to

Re: confusion with some `git reset` commands

2014-12-18 Thread Christian Couder
On Tue, Dec 16, 2014 at 7:39 PM, Arup Rakshit arupraks...@rocketmail.com wrote: From the command help I see - [arup@to_do_app]$ git reset -h You can also use git help reset to have the full man page. It has a lot more information. But I am looking for any differences - Do you have some

Re: Improving git branch

2014-12-18 Thread Michael J Gruber
Junio C Hamano schrieb am 17.12.2014 um 21:53: Michael J Gruber g...@drmicha.warpmail.net writes: Rather than extending git branch any further[*], I suggest a bolder strategy: - unify/merge for-each-ref and pretty formats (and code) as far as possible - leverage that for the list modes of

[PATCH 1/1] Documentation: config: typo fixed

2014-12-18 Thread Alexander Kuleshov
From: 0xAX kuleshovm...@gmail.com Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index f615a5c..a995b68 100644 ---

[PATCH 1/1] Documentation: config: typo fixed

2014-12-18 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index f615a5c..a995b68 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt

Re: confusion with some `git reset` commands

2014-12-18 Thread Konstantin Khomoutov
On Wed, 17 Dec 2014 01:09:08 +0630 Arup Rakshit arupraks...@rocketmail.com wrote: [...] But I am looking for any differences - a) git reset --soft and git reset --keep b) git reset --hard and git reset --merge Please consider reading http://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified

Re: [PATCH 1/1] Documentation: config: typo fixed

2014-12-18 Thread Matthieu Moy
Alexander Kuleshov kuleshovm...@gmail.com writes: -core.fileMode:: +core.filemode:: Tells Git if the executable bit of files in the working tree is to be honored. I do not think that this is a good change: config variable names are case insensitive, so filemode and fileMode are

Re: [PATCH 1/1] Documentation: config: typo fixed

2014-12-18 Thread Alexander Kuleshov
Ah, yes, didn't know about: config variable names are case insensitive so, you're right, thank you. -- 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] git-compat-util: suppress unavoidable Apple-specific deprecation warnings

2014-12-18 Thread Eric Sunshine
On Tue, Dec 16, 2014 at 6:19 PM, Eric Sunshine sunsh...@sunshineco.com wrote: With the release of Mac OS X 10.7 in July 2011, Apple deprecated all openssl.h functionality due to OpenSSL ABI (application binary interface) instability, resulting in an explosion of compilation warnings about

[PATCH 1/1] pack-bitmap: comment typo fixed

2014-12-18 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- pack-bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index 6a81841..3281df3 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -60,7 +60,7 @@ static struct bitmap_index {

Re: [PATCHv3 4/6] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-18 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: This would change the current behavior. In the case of !atomic we want to consider all commands and not stop early. Quite right. So maybe more if (!cmd-error_string) { if (!use_atomic ref_transaction_commit(...)) {

Re: Introducing a test_create_repo_bare (was Re: [PATCHv2 6/6] t5543-atomic-push.sh: add basic tests for atomic pushes)

2014-12-18 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: The issue is if some existing tests will be helped, if we had such a helper. Since both bin-wrappers/git and test-lib.sh set GIT_TEMPLATE_DIR and templates/blt doesn't contain any enabled hooks, I don't see how such a helper

Please Reply Via:(arikinseckin12...@qq.com)

2014-12-18 Thread Giresun
HELLO I will like to discuss an oil deal with you,an exportation of 80,000 barrels of Crude Oil daily from Iran to Turkey at the rate of $ 70.00 dollars per barrel through my client company in Iran, this will make you our international representative. If interested, please reply via my

Re: bug patch: exit codes from internal commands are handled incorrectly

2014-12-18 Thread Torsten Bögershausen
On 18.12.14 03:15, Kenneth Lorber wrote: The situation is actually slightly more complex than I stated previously. From the docs: The exit value of this program is negative on error, But there’s no such thing as a negative error code under Unix, so (at best) that will be exit(255). No

[PATCHv4 4/6] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-18 Thread Stefan Beller
From: Ronnie Sahlberg sahlb...@google.com Update receive-pack to use an atomic transaction iff the client negotiated that it wanted atomic-push. This leaves the default behavior to be the old non-atomic one ref at a time update. This is to cause as little disruption as possible to existing

Re: bug patch: exit codes from internal commands are handled incorrectly

2014-12-18 Thread Junio C Hamano
Kenneth Lorber k...@his.com writes: Bug: exit codes from (at least) internal commands are handled incorrectly. E.g. git-merge-file, docs say: The exit value of this program is negative on error, and the number of conflicts otherwise. If the merge was clean, the exit value is 0.

[ANNOUNCE] Git v2.2.1 (and updates to older maintenance tracks)

2014-12-18 Thread Junio C Hamano
The latest maintenance release Git v2.2.1 is now available at the usual places. This is a security-fix for CVE-2014-9390, which affects users on Windows and Mac OS X but not typical UNIX users. A set of new releases for older maintenance tracks (v1.8.5.6, v1.9.5, v2.0.5, and v2.1.4) are

Re: remote helper example with push/fetch capabilities

2014-12-18 Thread Klein W
Would someone be willing to extend the git-remote-testgit.sh example [1] with push and fetch capabilities? I am not familiar enough to do it myself. Thanks [1] https://github.com/git/git/blob/master/git-remote-testgit.sh -- To unsubscribe from this list: send the line unsubscribe git in the

Announcing Git for Windows 1.9.5

2014-12-18 Thread Johannes Schindelin
Dear users of Git for Windows, a new Git for Windows version has been released, and we urge everybody to update because it fixes some critical bugs. Please download the new version from: https://github.com/msysgit/msysgit/releases/Git-1.9.5-preview20141217 The installer is called

Re: [msysGit] Re: Announcing Git for Windows 1.9.5

2014-12-18 Thread Johannes Schindelin
Hi Stanzilla, On Thu, 18 Dec 2014, Stanzilla wrote: Release notes at https://github.com/msysgit/msysgit/raw/master/share/WinGit/ReleaseNotes.rtf are *not* up to date. Yep, the 'master' branch is intentionally behind. It will be updated tomorrow, as well as the msysgit/git.git repository. The

Re: [PATCHv4 4/6] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-18 Thread Eric Sunshine
On Thu, Dec 18, 2014 at 12:45 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com Update receive-pack to use an atomic transaction iff the client negotiated that it wanted atomic-push. This leaves the default behavior to be the old non-atomic one ref at a

git-http-backend auth via Kerberos

2014-12-18 Thread Dan Langille (dalangil)
I am trying to get http://git-scm.com/docs/git-http-backend to auth via Kerberos. I have success when a Kerberos ticket is present. I am trying to get git to authenticate with Kerberos when a ticket is not present. Here is what succeeds with a ticket: Location /git SSLOptions +StdenvVars

Re: git-http-backend auth via Kerberos

2014-12-18 Thread brian m. carlson
On Thu, Dec 18, 2014 at 10:19:19PM +, Dan Langille (dalangil) wrote: This is what happens without a valid ticket: $ git clone https://us.example.com/git/clamav-bytecode-compiler Cloning into 'clamav-bytecode-compiler'... Username for 'https://us.example.com': dan Password for

[PATCHv5 4/6] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-18 Thread Stefan Beller
From: Ronnie Sahlberg sahlb...@google.com Update receive-pack to use an atomic transaction iff the client negotiated that it wanted atomic-push. This leaves the default behavior to be the old non-atomic one ref at a time update. This is to cause as little disruption as possible to existing

Re: [PATCHv3 3/6] send-pack.c: add --atomic command line argument

2014-12-18 Thread Eric Sunshine
On Wed, Dec 17, 2014 at 1:32 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com This adds support to send-pack to negotiate and use atomic pushes iff the server supports it. Atomic pushes are activated by a new command line flag --atomic. Signed-off-by:

Re: [PATCHv3 5/6] push.c: add an --atomic argument

2014-12-18 Thread Eric Sunshine
On Wed, Dec 17, 2014 at 1:32 PM, Stefan Beller sbel...@google.com wrote: From: Ronnie Sahlberg sahlb...@google.com Add a command line argument to the git push command to request atomic pushes. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Stefan Beller sbel...@google.com

[PATCH] git-log: added --invert-grep option

2014-12-18 Thread Christoph Junghans
Implements a inverted match for git log, like in the case of git grep -v, which is useful from time to time to e.g. filter FIXUP message out of git log. Internally, a new bol 'global_invert' has been introduces as revs-grep_filter.invert inverts the match line-wise, which cannot work as i.e.

Re: [ANNOUNCE] Git v2.2.1 (and updates to older maintenance tracks)

2014-12-18 Thread Max Kirillov
Hello. Thank you for the fix. Would it be more reliable to compare inode of directory in question and .git? (there is [*] for windows). So that any unspotted name equivalence is prevented to cause any harm. *) http://stackoverflow.com/questions/7162164/does-windows-have-inode-numbers-like-linux

Re: [PATCH] git-log: added --invert-grep option

2014-12-18 Thread Junio C Hamano
Christoph Junghans ott...@gentoo.org writes: Implements a inverted match for git log, like in the case of git grep -v, which is useful from time to time to e.g. filter FIXUP message out of git log. Internally, a new bol 'global_invert' has been introduces as revs-grep_filter.invert inverts