I can't pull/fetch from origin, but can push my story branch

Hi, I forked a repo and then working on features using feature branch. Once done, I am pushing my branch and creating PR. This all was working till night. Suddenly this morning, I am not able to fetch/pull, but can push my feature. The below is what I am getting: [arup@critique (master)]$ git

What's cooking in git.git (Nov 2015, #03; Fri, 20)

What's cooking in git.git (Nov 2015, #03; Fri, 20) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Sorry for the extreme delay in pushing

[PATCH] Documentation/diff: give --word-diff-regex=. example

It's just so useful. Signed-off-by: Michael J Gruber --- Documentation/diff-options.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index d56ca90..306b7e3 100644 ---

Re: [BUG] --bare is ignored before command word

Jeff King writes: > On Wed, Nov 18, 2015 at 10:29:20PM +0100, Matthieu Moy wrote: > >> But as you say, options before the command word apply to "git", not to >> the particular command. The case of --bare is a bit unfortunate: both >> "git" and "git clone" accept a --bare option,

Re: [PATCH] Documentation/diff: give --word-diff-regex=. example

Michael J Gruber writes: > It's just so useful. Confirmed-by: Matthieu Moy Thanks, -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [BUG] gitk --all and git bisect visualize crash in non-english locale

Indeed. I should obviously have started by updating my master branch, sorry for the noise. Thanks, Dennis Kaarsemaker writes: > Hi Matthieu, > > This has been reported quite a few times before. A fix is in master, > see 482456a^2 and children. > > On wo, 2015-11-18 at

Re: [PATCH] configure.ac: try -lpthread in $LIBS instead of $CFLAGS

On Sun, Nov 08, 2015 at 05:00:00PM +0100, Matthieu Moy wrote: > "Rainer M. Canavan" writes: > > > configure.ac | 8 +++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > Looks all right to me. Thanks for you contribution and for your > patience! Thanks, both. I've

[PATCH 1/2] rebase: test broken behavior with --keep-empty

When a commit is already present in the branch that is being rebased upon we get an empty commit. Usually we just drop this commit, but with `--keep-empty` we want to preserve the commit's message. Instead of simply applying the empty commit, though, we erroneously end up in cherry-picking mode

[PATCH 2/2] rebase: fix preserving commits with --keep-empty

When rebasing commits where one or several commits are redundant to commits on the branch that is being rebased upon we error out. This is due to the usage of `--allow-empty` for the invoked cherry-pick command, which will only cause _empty_ commits to be picked instead of also allowing redundant

[PATCH 0/2] rebase: broken behavior with --keep-empty

I've recently run into broken behavior with `git-rebase` and `--keep-empty`. As soon as `--keep-empty` is specified, we fall back on using `git cherry-pick` instead of `git am` for rebasing the commits, which seems to not work correctly. In fact I guess there are two different bugs in here. The

Re: Three dot notion used inconsitent?

Andreas Schwab venit, vidit, dixit 18.11.2015 18:49: > Lars Schneider writes: > >> git diff branchA...branchB >> --> gives me the diff between (the common ancestor of A and B) and B. That >> means I never see changes on branchA. >> >> git log branchA...branchB >> -->

Re: [PATCH] check-ignore: correct documentation about output

On Sun, Nov 08, 2015 at 09:10:39PM +0100, Dennis Kaarsemaker wrote: > By default git check-ignore shows only the filenames that will be > ignored, not the pattern that causes their exclusion. Yeah, I think the described behavior is really about the "-v" output. > ---

Re: [PATCH 2/2] fsck: treat a NUL in a tag header as an error

On Thu, Nov 19, 2015 at 05:25:31PM +0100, René Scharfe wrote: > We check the return value of verify_header() for commits already, so do > the same for tags as well. > > Signed-off-by: Rene Scharfe > --- > fsck.c | 3 ++- > t/t1450-fsck.sh | 2 +- > 2 files changed, 3

Re: [PATCH 1/2] t1450: add tests for NUL in headers of commits and tags

On Thu, Nov 19, 2015 at 09:54:54PM +0100, René Scharfe wrote: > >>diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh > >>@@ -176,6 +176,18 @@ test_expect_success 'integer overflow in timestamps is > >>reported' ' > >>+test_expect_success 'commit with NUL in header' ' > >>+ git cat-file commit

Re: [PATCH v4 09/12] Add several uses of get_object_hash.

On Tue, Nov 10, 2015 at 02:22:27AM +, brian m. carlson wrote: > diff --git a/patch-ids.c b/patch-ids.c > index bf81b923..83229a0d 100644 > --- a/patch-ids.c > +++ b/patch-ids.c > @@ -8,10 +8,10 @@ static int commit_patch_id(struct commit *commit, struct > diff_options *options, >

Re: [RFC/PATCH] send-email: die if CA path doesn't exist

On Tue, Nov 17, 2015 at 10:12:07PM +, John Keeping wrote: > If the CA path isn't found it's most likely to indicate a > misconfiguration, in which case accepting any certificate is unlikely to > be the correct thing to do. Yeah, this seems like a crazy default for security-sensitive code. I

Re: [PULL] git-svn: improve rebase/mkdirs performance

On Wed, Nov 11, 2015 at 08:57:41PM +, Eric Wong wrote: > Hi Jeff/Junio, nothing urgent, please pull at your convenience. > Thanks. Thanks, pulled. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo

[Gitweb] - Hide Spurious entries

Hi, Is there any better way to exclude gitweb from traversing into ".repo" directory of my repository apart from the solution stated in https://groups.google.com/forum/#!topic/repo-discuss/Q9WaMzzf5hs ? Thanks & Regards, Jhoola -- To unsubscribe from this list: send the line "unsubscribe git" in

Re: [PATCH] Escape Git's exec path in contrib/rerere-train.sh script

On Sun, Nov 08, 2015 at 12:27:55PM +0100, Daniel Knittl-Frank wrote: > Whitespace can cause the source command to fail. This is usually not a > problem on Unix systems, but on Windows Git is likely to be installed > under "C:/Program Files/", thus rendering the script broken. > > Signed-off-by:

Re: [PATCH v6 0/6] Add Travis CI support

On 20 November 2015 at 08:46, Lars Schneider wrote: > > On 19 Nov 2015, at 15:14, Jeff King wrote: > > >> >>> git-p4: retry kill/cleanup operations in tests with timeout >>> git-p4: add p4d timeout in tests >>> git-p4: add trap to kill p4d on test exit

Re: [PATCH 0/7] Modernize t9300-fast-import

On Thu, Nov 19, 2015 at 10:54:11PM -0500, Eric Sunshine wrote: > On Thu, Nov 19, 2015 at 2:09 PM, Johannes Sixt wrote: > > Some time ago, I had to dig into t9300-fast-import and found it quite > > unhelpful that it does not follow our modern best-practices. This series > > brings

Re: [PATCH v4 09/12] Add several uses of get_object_hash.

On Fri, Nov 20, 2015 at 06:38:30AM -0500, Jeff King wrote: > On Tue, Nov 10, 2015 at 02:22:27AM +, brian m. carlson wrote: > > > diff --git a/patch-ids.c b/patch-ids.c > > index bf81b923..83229a0d 100644 > > --- a/patch-ids.c > > +++ b/patch-ids.c > > @@ -8,10 +8,10 @@ static int

Re: [PATCH v6 6/6] Add Travis CI support

On 19 Nov 2015, at 15:35, Jeff King wrote: > On Thu, Nov 19, 2015 at 09:58:11AM +0100, larsxschnei...@gmail.com wrote: > >> From: Lars Schneider >> >> The tests are currently executed on "Ubuntu 12.04 LTS Server Edition >> 64 bit" and on "OS X

Re: [PATCH 0/5] Use watchman to reduce index refresh time

On Tue, Nov 10, 2015 at 10:04 PM, David Turner wrote: > On Mon, 2015-11-09 at 21:06 +0100, Christian Couder wrote: >> Using David's series I get worse results than all of the above but I >> guess it's because his series is based on an ancient git version >> (v2.0.0-rc0).

Re: [PATCHv4 0/9] Expose submodule parallelism to the user

On Fri, Nov 13, 2015 at 05:06:53PM -0800, Stefan Beller wrote: > This replaces sb/submodule-parallel-update. > It applies on top of d075d2604c0 (Merge branch > 'rs/daemon-plug-child-leak' into sb/submodule-parallel-update, > with additionally having merged submodule-parallel-fetch, > which has

git fetch with fetch.prune set bug?

Hi, Doing the following commands: $ git config fetch.prune true $ git co -b bug/bug-1 Switched to a new branch 'bug/bug-1' $ touch bugfix $ git add . $ git commit -a $ git push --set-upstream origin bug/bug-1 Counting objects: 2, done. Delta compression using up to 8 threads. Compressing objects:

[PATCH v2] notes: allow merging from arbitrary references

From: Jacob Keller Create a new expansion function, expand_loose_notes_ref which will first check whether the ref can be found using get_sha1. If it can't be found then it will fallback to using expand_notes_ref. The content of the strbuf will not be changed if the notes

Re: [RFC/PATCH] send-email: die if CA path doesn't exist

On Fri, Nov 20, 2015 at 06:18:48AM -0500, Jeff King wrote: > On Tue, Nov 17, 2015 at 10:12:07PM +, John Keeping wrote: > > > If the CA path isn't found it's most likely to indicate a > > misconfiguration, in which case accepting any certificate is unlikely to > > be the correct thing to do. >

[PATCH v2] check-ignore: correct documentation about output

By default git check-ignore shows only the filenames that will be ignored, not the pattern that causes their exclusion. Instead of moving the partial exclude pattern precendence information to the -v option where it belongs, link to gitignore(5) which describes this more thoroughly.

Re: [PATCH 2/2] fsck: treat a NUL in a tag header as an error

Hi René, On Thu, 19 Nov 2015, René Scharfe wrote: > We check the return value of verify_header() for commits already, so do > the same for tags as well. Thanks for catching and fixing my bug! Ciao, Dscho

Re: [PATCH] check-ignore: correct documentation about output

[Peff, sorry for the duplicate mail. It seems I can't brain today...] On vr, 2015-11-20 at 06:31 -0500, Jeff King wrote: > On Sun, Nov 08, 2015 at 09:10:39PM +0100, Dennis Kaarsemaker wrote: > > > By default git check-ignore shows only the filenames that will be > > ignored, not the pattern

[PATCH 4/2] test: use test_must_contain

Some tests print a file using cat and then grep it for some pattern. This is done to aid debugging in case the pattern is unexpectedly not found; the file contents can easily inspected by running the test with the option --verbose. Replace these combinations by calls of test_must_contain. It

Re: [PATCH 1/2] t1450: add tests for NUL in headers of commits and tags

Am 20.11.2015 um 12:14 schrieb Jeff King: On Thu, Nov 19, 2015 at 09:54:54PM +0100, René Scharfe wrote: diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh @@ -176,6 +176,18 @@ test_expect_success 'integer overflow in timestamps is reported' ' +test_expect_success 'commit with NUL in header' ' +

[PATCH 3/2] test: factor out helper function test_must_contain

Extract a helper function for searching for a pattern in a file and printing the whole file if the pattern is not found. It is useful when starting tests with --verbose for debugging purposes. Signed-off-by: Rene Scharfe --- t/t0008-ignores.sh | 10 +-

Odd issue with Git-am

The following describes bad behavior, but it is bad behavior that git-am does not flag as bad. It just drops data silently. I have a developer who has a patch that I am importing into git with git-am. (Currently they have a quilt-like setup that is full of bad and incomplete patches.) At some

[PATCHv2] run-command: detect finished children by closed pipe rather than waitpid

Detect if a child stopped working by checking if their stderr pipe was closed instead of checking their state with waitpid. As waitpid is not fully working in Windows, this is an approach which allows for better cross platform operation. (It's less code, too) Previously we did not close the read

Re: Odd issue with Git-am

On Fri, Nov 20, 2015 at 1:02 PM, wrote: > The following describes bad behavior, but it is bad behavior that git-am > does not flag as bad. It just drops data silently. > > I have a developer who has a patch that I am importing into git with > git-am. (Currently they have a

Re: [PATCHv2] run-command: detect finished children by closed pipe rather than waitpid

Stefan Beller wrote: > Detect if a child stopped working by checking if their stderr pipe > was closed instead of checking their state with waitpid. > As waitpid is not fully working in Windows, this is an approach which > allows for better cross platform operation. (It's less code, too) Can you

Re: [PATCH v6 0/6] Add Travis CI support

On 19 Nov 2015, at 15:14, Jeff King wrote: > On Thu, Nov 19, 2015 at 09:58:05AM +0100, larsxschnei...@gmail.com wrote: > >> From: Lars Schneider >> >> diff to v5: >> * check if PID file still exists on P4D cleanup (thanks Luke) >> * fix space/tab

Re: [PATCHv2] run-command: detect finished children by closed pipe rather than waitpid

Am 20.11.2015 um 23:05 schrieb Jonathan Nieder: Stefan Beller wrote: Detect if a child stopped working by checking if their stderr pipe was closed instead of checking their state with waitpid. As waitpid is not fully working in Windows, this is an approach which allows for better cross

Re: [PATCH 4/2] test: use test_must_contain

Hi, > diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh > index 8134ab4..e02b490 100755 > --- a/t/t9810-git-p4-rcs.sh > +++ b/t/t9810-git-p4-rcs.sh > @@ -294,8 +294,7 @@ test_expect_success 'cope with rcs keyword file deletion' > ' > echo "\$Revision\$" >kwdelfile.c && >

Re: [PATCH v1] annotate: skip checking working tree if a revision is provided

On Tue, Nov 17, 2015 at 7:20 PM, Edmundo Carmona Antoranz wrote: > + if (!revs.pending.nr && !file_exists(path)) > + die_errno("cannot stat path '%s'", path); > + I was wondering if I should only check the path that is coming from "blame" (which is where

Re: [PATCH v1] annotate: skip checking working tree if a revision is provided

And I did't say it right. The execution path where dashdash_pos is 0 is coming from "annotate". Sorry for my confusion on the previous mail. On Fri, Nov 20, 2015 at 7:25 PM, Edmundo Carmona Antoranz wrote: > On Tue, Nov 17, 2015 at 7:20 PM, Edmundo Carmona Antoranz >

Re: [PATCH 4/2] test: use test_must_contain

Am 21.11.2015 um 02:16 schrieb SZEDER Gábor: Hi, diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh index 8134ab4..e02b490 100755 --- a/t/t9810-git-p4-rcs.sh +++ b/t/t9810-git-p4-rcs.sh @@ -294,8 +294,7 @@ test_expect_success 'cope with rcs keyword file deletion' ' echo

[PATCH v3] ls-files: Add eol diagnostics

When working in a cross-platform environment, a user wants to check if text files are stored normalized in the repository and if .gitattributes are set appropriately. Make it possible to let Git show the line endings in the index and in the working tree and the effective text/eol attributes The

Re: [PATCHv2] run-command: detect finished children by closed pipe rather than waitpid

On 2015-11-20 22.08, Stefan Beller wrote: The patch looks good at first glance, one minor remark below: > > diff --git a/run-command.c b/run-command.c > @@ -1071,70 +1089,31 @@ static void pp_output(struct parallel_processes *pp) > > static int pp_collect_finished(struct parallel_processes