Re: git merge branch --no-commit does commit fast forward merges

Hi Christoph, On Sun, 17 Apr 2016, Christoph Paulik wrote: > git merge branch --no-commit does commit fast forward merges leaving > users no way to change the merge results. No, this is not a bug. Please note that a fast-forward does not perform a commit at all (and therefore "does commit fast f

Re: Where can I find the MD5 or SHA1 of git preview client.

Hi Philip, On Sun, 17 Apr 2016, Philip Oakley wrote: > From: "bin wu" > > There is still a question.Why not just post the the MD5 and SHA1 on > > the download page? > > > I've created a page on the FAQ wiki > https://github.com/git-for-windows/git/wiki/Release-Hashes The only problem with that

Re: Where can I find the MD5 or SHA1 of git preview client.

Hi Wu, On Sun, 17 Apr 2016, bin wu wrote: > There is still a question.Why not just post the the MD5 and SHA1 on > the download page? We do: https://github.com/git-for-windows/git/releases Ciao, Johannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message t

[PATCH 3/6] match-trees: convert shift_tree and shift_tree_by to object_id

Signed-off-by: brian m. carlson --- cache.h| 4 ++-- match-trees.c | 44 ++-- merge-recursive.c | 4 ++-- test-match-trees.c | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cache.h b/cache.h index 22b73646..7009

Re: Default authentication over https?

On Fri, Apr 15, 2016 at 06:43:35PM -0400, Jeff King wrote: > Hmm. Looks like we already pull this out of the curl result for other > reasons, but we never feed it back in to the next request. So if I do > this: > > diff --git a/http.c b/http.c > index 9bedad7..add9bf2 100644 > --- a/http.c > +++ b

[PATCH 1/6] Introduce a get_oid function.

The get_oid function is equivalent to the get_sha1 function, but uses a struct object_id instead. Signed-off-by: brian m. carlson --- cache.h | 2 ++ sha1_name.c | 9 + 2 files changed, 11 insertions(+) diff --git a/cache.h b/cache.h index 2711048c..22b73646 100644 --- a/cache.h +++

Re: Migrating away from SHA-1?

On Tue, Apr 12, 2016 at 06:58:10PM -0700, H. Peter Anvin wrote: > On April 12, 2016 6:51:12 PM PDT, Duy Nguyen wrote: > >On Wed, Apr 13, 2016 at 5:38 AM, H. Peter Anvin wrote: > >> OK, I'm going to open this can of worms... > >> > >> At what point do we migrate from SHA-1? > > > >Brian Carlson ha

[PATCH 2/6] test-match-trees: convert to use struct object_id

Signed-off-by: brian m. carlson --- test-match-trees.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test-match-trees.c b/test-match-trees.c index 4dad7095..41aff841 100644 --- a/test-match-trees.c +++ b/test-match-trees.c @@ -3,24 +3,24 @@ int main(int ac,

[PATCH 0/6] object_id Part 3

This is the third of a series of patches to convert instances of unsigned char[20] to struct object_id. The focus in this series was to convert test-match-trees, related functions, and some dependencies. struct name_entry was converted as part of these dependencies. The riskiest part of this seri

[PATCH 4/6] Convert struct name_entry to use struct object_id.

Signed-off-by: brian m. carlson --- builtin/grep.c | 6 +++--- builtin/merge-tree.c | 18 +- builtin/pack-objects.c | 4 ++-- builtin/reflog.c | 4 ++-- cache-tree.c | 4 ++-- fsck.c | 4 ++-- http-push.c| 4 ++-- list-ob

[PATCH 5/6] tree-walk: convert tree_entry_extract to struct object_id

Signed-off-by: brian m. carlson --- fsck.c| 6 +++--- match-trees.c | 12 ++-- tree-diff.c | 2 +- tree-walk.c | 10 +- tree-walk.h | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fsck.c b/fsck.c index 606eba8c..92b17f5d 100644 --- a/fsc

[PATCH 6/6] match-trees: convert several leaf functions to struct object_id

Signed-off-by: brian m. carlson --- match-trees.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/match-trees.c b/match-trees.c index 8ca7c68f..396b7338 100644 --- a/match-trees.c +++ b/match-trees.c @@ -48,17 +48,17 @@ static int score_matches

Re: git merge branch --no-commit does commit fast forward merges

On Sun, Apr 17, 2016 at 2:10 PM, Christoph Paulik wrote: > > Hi Git Mailinglist, > git merge branch --no-commit does commit fast forward merges leaving users > no way to change the merge results. The command only works as expected when > also adding the --no-ff flag. Looking at the help text of th

Important Message.

Business proposal therefor you are required to send an email to: itsuki_kaito2...@qq.com -- 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

[PATCH v6 2/6] t7030: test verifying multiple tags

From: Santiago Torres The verify-tag command supports multiple tag names to verify, but existing tests only test for invocation with a single tag. Add a test invoking it with multiple tags. Helped-by: Jeff King Signed-off-by: Santiago Torres Reviewed-by: Eric Sunshine Signed-off-by: Junio C

[PATCH v6 4/6] verify-tag: add sha1 argument to verify_tag()

From: Santiago Torres The current interface of verify_tag() resolves reference names to SHA1, which might be redundant as future callers may resolve the refname to SHA1 beforehand. Add a SHA1 parameter to use instead of the name parameter. We also replace the name argument to report_name and use

[PATCH v6 6/6] tag -v: verfy directly rather than exec-ing verify-tag

From: Santiago Torres tag -v forks into verify-tag, which only calls gpg_verify_tag(). Instead of forking to verify-tag, call gpg_verify_tag directly(). Helped-by: Eric Sunshine Signed-off-by: Santiago Torres --- builtin/tag.c | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) dif

[PATCH v6 0/6] Move PGP verification out of verify-tag

From: Santiago Torres This is a follow up of [1], [2], [3], [4], and [5]. patches 1/6, 2/6 and 3/6 are the same as the corresponding commits in pu. v6: * As Junio suggested, updated 4/6, to include the name argument and the ternary operator to provide more descriptive error messages. I prop

[PATCH v6 1/6] builtin/verify-tag.c: ignore SIGPIPE in gpg-interface

From: Santiago Torres The verify_signed_buffer() function may trigger a SIGPIPE when the GPG child process terminates early (due to a bad keyid, for example) and Git tries to write to it afterwards. Previously, ignoring SIGPIPE was done in builtin/verify-tag.c to avoid this issue. However, any

[PATCH v6 3/6] verify-tag: change variable name for readability

From: Santiago Torres The run_gpg_verify() function has two variables, size and len. This may come off as confusing when reading the code. Clarify which one pertains to the length of the tag headers by renaming len to payload_length. Signed-off-by: Santiago Torres Reviewed-by: Eric Sunshine

[PATCH v6 5/6] verify-tag: move verification code to tag.c

From: Santiago Torres The PGP verification routine for tags could be accessed by other modules that require to do so. Publish the verify_tag function in tag.c and rename it to gpg_verify_tag so it does not conflict with builtin/mktag's static function. Helped-by: Junio C Hamano Signed-off-by:

git merge branch --no-commit does commit fast forward merges

Hi Git Mailinglist, git merge branch --no-commit does commit fast forward merges leaving users no way to change the merge results. The command only works as expected when also adding the --no-ff flag. Looking at the help text of the --no-commit flag I think that this might be a unintended.

Re: Where can I find the MD5 or SHA1 of git preview client.

From: "bin wu" Thanks a lot! It's my version! There is still a question.Why not just post the the MD5 and SHA1 on the download page? I've created a page on the FAQ wiki https://github.com/git-for-windows/git/wiki/Release-Hashes @dscho may have a better reference but adding this page is a sta

Re: [PATCH v4 15/16] branch: use ref-filter printing APIs

On Sat, Apr 16, 2016 at 5:41 AM, Stefan Beller wrote: >> static int calc_maxwidth(struct ref_array *refs, int remote_bonus) >> { >> int i, max = 0; >> @@ -432,7 +281,10 @@ static int calc_maxwidth(struct ref_array *refs, int >> remote_bonus) >> >> skip_prefix(it->refname

Important Message.

Business proposal therefor you are required to send an email to: itsuki_kaito2...@qq.com -- 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

[git-gui: Chinese (TW) translation] git-gui: added New Chinese (Taiwan) translation.

This translation is based on some zh_CN strings, in repo and/or three-clause-BSD-licensed on Launchpad. All contributors whose strings got into this submission have their names added to the PO header. For those whose email addresses are not available on LP, the LP user page link is added instead.

Re: [PATCH v5 2/6] t7030-verify-tag: Adds validation for multiple tags

On Sun, Apr 17, 2016 at 2:38 PM, Santiago Torres wrote: > On Sun, Apr 17, 2016 at 02:19:00PM -0400, Eric Sunshine wrote: >> Junio already made this correction and others in the three patches he >> queued on his 'pu' branch. It's possible that he also made other >> tweaks not mentioned in the revie

Re: [PATCH v5 2/6] t7030-verify-tag: Adds validation for multiple tags

On Sun, Apr 17, 2016 at 02:19:00PM -0400, Eric Sunshine wrote: > On Sun, Apr 17, 2016 at 1:31 PM, Santiago Torres wrote: > >> + grep "^.GNUPG" expect.stderr && > >> > >> Hmm, is there a reason you didn't stick with the more strict regex > >> Peff suggested? > >> > >> ^.GNUPG:. > >> > >>

Re: [PATCH v5 2/6] t7030-verify-tag: Adds validation for multiple tags

On Sun, Apr 17, 2016 at 1:31 PM, Santiago Torres wrote: >> + grep "^.GNUPG" expect.stderr && >> >> Hmm, is there a reason you didn't stick with the more strict regex >> Peff suggested? >> >> ^.GNUPG:. >> >> (Genuine question: I'm not saying your choice is wrong, I'm just >> interested in

Re: [PATCH v5 0/6] tag: move PGP verification code to tag.c

On Sun, Apr 17, 2016 at 1:34 PM, Santiago Torres wrote: > On Thu, Apr 07, 2016 at 12:19:37PM -0400, Eric Sunshine wrote: >> If you make any changes beyond the minor ones mentioned in my reviews >> or beyond plagiarizing commit message enhancements offered by my or >> Junio's reviews, then you'd al

Re: [PATCH v5 0/6] tag: move PGP verification code to tag.c

On Thu, Apr 07, 2016 at 12:19:37PM -0400, Eric Sunshine wrote: > On Wed, Apr 6, 2016 at 11:40 PM, Santiago Torres wrote: > >> > v5 (this): > >> > Added helpful feedback by Eric > >> > > >> > * Reordering of the patches, to avoid temporal inclusion of a regression > >> > * Fix typos here and ther

Re: [PATCH v5 2/6] t7030-verify-tag: Adds validation for multiple tags

Sorry for the delay! I just realized I had missed the second comment. > + grep "^.GNUPG" expect.stderr && > > Hmm, is there a reason you didn't stick with the more strict regex > Peff suggested? > > ^.GNUPG:. > > (Genuine question: I'm not saying your choice is wrong, I'm just > inter

Re: [PATCH v2 1/2] test-lib: add a function to compare an expection with stdout from a command

On Sun, Apr 17, 2016 at 11:19 AM, Johannes Sixt wrote: > Am 17.04.2016 um 05:07 schrieb Eric Sunshine: >> Hmm, considering that $(...) collapses each whitespace run (including >> newlines) down to a single space, I don't see how you could get a >> multi-line result. > > No, it doesn't. It only rem

Re: [PATCH v2 2/2] t1500-rev-parse: rewrite each test to run in isolation

On Sun, Apr 17, 2016 at 5:42 AM, SZEDER Gábor wrote: > Quoting Michael Rappazzo : >> +test_expect_success 'GIT_DIR=../.git, core.bare = false: >> is-bare-repository' ' >> + mkdir work && >> + test_when_finished "rm -rf work" && >> + test_config -C "$(pwd)"/.git core.bare false &&

Re: [BUG] git rev-parse :/ "regex" syntax not really regex?

On Sun, Apr 17, 2016 at 04:10:28PM +0200, Andreas Schwab wrote: > Andreas Mohr writes: > > > Unless I happened to misunderstand git's regex flavour, or something else... > > (hmm, perhaps it's a try-match-single-line vs. multi-line content issue, > > which perhaps does not work by specifying the

Re: [PATCH v2 1/2] test-lib: add a function to compare an expection with stdout from a command

Am 17.04.2016 um 05:07 schrieb Eric Sunshine: Hmm, considering that $(...) collapses each whitespace run (including newlines) down to a single space, I don't see how you could get a multi-line result. No, it doesn't. It only removes trailing newlines: ~:1004> frotz=$(echo 1; echo; echo 2; echo

Re: [PATCH v2 2/2] t1500-rev-parse: rewrite each test to run in isolation

Am 17.04.2016 um 07:59 schrieb Eric Sunshine: On Sat, Apr 16, 2016 at 12:13:50PM -0400, Michael Rappazzo wrote: +test_expect_success 'GIT_DIR=../.git, core.bare = false: prefix' ' + mkdir work && + test_when_finished "rm -rf work" && + test_config -C "$(pwd)"/.git core.bare fal

Re: [BUG] git rev-parse :/ "regex" syntax not really regex?

Andreas Mohr writes: > Unless I happened to misunderstand git's regex flavour, or something else... > (hmm, perhaps it's a try-match-single-line vs. multi-line content issue, > which perhaps does not work by specifying the trailing $) This is exactly the difference. git log --grep matches indiv

[BUG] git rev-parse :/ "regex" syntax not really regex?

Hello all, I just wanted to shortly mention that to me it seems that while git help rev-parse says :/, e.g. :/fix nasty bug A colon, followed by a slash, followed by a text, names a commit whose commit message matches the specified regular expression. This name returns the

企业培训师

你的老朋友邀你来Q群:343257759 抢红包 抢秒杀 抢vip 什么都要抢。太刺激了。不靠手气只拼手速

[PATCH 7/7] checkout: prevent checking out a branch being rebased in another worktree

We failed to detect this case because the rebase-in-progress worktree has HEAD in detached state. Some more poking around is needed to determine if a rebase is in progress. Note that even though bisect can also put a worktree in detached state and hide the real branch, we allow to checkout anyway.

[PATCH 6/7] worktree.c: avoid referencing to worktrees[i] multiple times

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/worktree.c b/worktree.c index c5bf583..3b7c6f2 100644 --- a/worktree.c +++ b/worktree.c @@ -200,10 +200,12 @@ char *find_shared_symref(const char *symref, const char *targ

[PATCH 4/7] worktree.c: add worktree_git_path_..._head()

These are a variant of git_path_..._head(), defined with GIT_PATH_FUNC macro but they takes worktree into account. To be used when wt_status_get_state() is converted to be worktree-aware. Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 4 worktree.h | 13 + 2 files changed

[PATCH 5/7] wt-status.c: make wt_status_get_state() support worktree

The function is to be used to detect if a ref is checked out in another worktree. In some cases, parsing "HEAD" alone is not enough because the worktree may be under rebase or bisect. Note that because get_sha1() cannot take a worktree (and of course will not, we need something like worktree_get_s

[PATCH 3/7] path.c: refactor and add worktree_git_path()

do_git_path(), which is the common code for all git_path* functions, is modified to take a worktree struct and can produce paths for any worktree. worktree_git_path() is the first function that makes use of this. It can be used to write code that can examine any worktree. For example, wt_status_ge

[PATCH 2/7] worktree.c: store "id" instead of "git_dir"

We can reconstruct git_dir from id quite easily. It's a bit hackier to do the reverse. Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 31 ++- worktree.h | 8 +++- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/worktree.c b/worktree.c index

[PATCH 1/7] path.c: add git_common_path() and strbuf_git_common_path()

These are mostly convenient functions to reduce code duplication. Most of the time, we should be able to get by with git_path() which handles $GIT_COMMON_DIR internally. However there are a few cases where we need to construct paths manually, for example some paths from a specific worktree. These f

[PATCH 0/7] fix checking out a being-rebased branch

First cut. I need opinions on 05/07, which converts wt_status_get_state() to support selecting any worktree. I'm not super happy with leaving "TODO: not supported yet" comments, even though strictly speaking this series does not need it. The reason it's left unsupported is, in order to add worktre

Re: [PATCH v2 2/2] t1500-rev-parse: rewrite each test to run in isolation

Quoting Michael Rappazzo : +test_expect_success 'GIT_DIR=../.git, core.bare = false: is-bare-repository' ' + mkdir work && + test_when_finished "rm -rf work" && + test_config -C "$(pwd)"/.git core.bare false && + GIT_DIR=../.git test_stdout false git -C work rev-parse --is