Re: [PATCH v3 4/5] t4202-log: add tests for --merges=

On Mon, Apr 13, 2015 at 11:29 AM, Koosha Khajehmoogahi wrote: > From: Eric Sunshine > Signed-off-by: Koosha Khajehmoogahi Signed-off-by: Eric Sunshine > --- > diff --git a/t/t4202-log.sh b/t/t4202-log.sh > index 1b2e981..3edcd81 100755 > --- a/t/t4202-log.sh > +++ b/t/t4202-log.sh > @@ -270,6

Re: [PATCH v3 3/5] Documentation: add git-log --merges= option and log.merges config. var

On Mon, Apr 13, 2015 at 11:29 AM, Koosha Khajehmoogahi wrote: > From: Junio C Hamano > > [kk: added documentation in git-log.txt] > > Signed-off-by: Koosha Khajehmoogahi > --- > diff --git a/Documentation/rev-list-options.txt > b/Documentation/rev-list-options.txt > index f620ee4..88f152f 10064

Please let me know if you need to print color box, display box and labels

Hi, this is David Wu from Shanghai, China. Please let me know if you need color box, display box, corrugated box, label, hang tag etc. I will send you the website. Best regards, David Wu -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.k

Re: [PATCH v2 1/4] t4059: test 'diff --cc' with a change from only few parents

On Sat, Apr 11, 2015 at 10:51:10PM -0700, Junio C Hamano wrote: > Max Kirillov writes: > >> My exact case was that there was a change in one branch >> which was overwritten during merge conflict resolution by >> fully acepting the other branch - in a 2-parent merge. I >> started looking for a way

Re: [PATCH v2 4/4] t4059: rewrite to be adaptive to hunk filtering

On Sat, Apr 11, 2015 at 10:48:22PM -0700, Junio C Hamano wrote: > Max Kirillov writes: >> Rather, it should verify that file >> selection behaves the same as hunk selection. > > Hrm, really? "git diff --raw" and "git diff -p -w" on two trees > would not show identical set of paths, when the blob

[PATCH/RFC] combine-diff.c: make intersect_paths() behave like hunk filtering

* for `diff --cc` 2 cases: * the path must be changed since at least 2 parents, which should have the path different. In other words, the child and its parents must contain at least 3 different versions of file. Non-existing in the commit path counts as one version. * All parents ar

Feature Request: provide cmdline args to git hooks

Hello, Just a brief note about a feature I would find incredibly useful, were it available. A brief background of my use case: I am wanting to write a pre-push hook to prevent tags being pushed to our production servers. The production servers in our case are --bare endpoints, and when we push a t

Re: Requesting `git stash --cached` or something similar

On Mon, Apr 13, 2015 at 10:05:02PM -0400, Brandon McCaig wrote: > Trevor: > > On Mon, Apr 13, 2015 at 9:44 PM, Trevor Saunders > wrote: > > I would expect the answers to be it sets the working directories state > > to the state in HEAD, and leaves untracked files alone. If that's what > > you w

Re: [PATCH] reduce progress updates in background

On Mon, Apr 13, 2015 at 11:48:50PM +1000, Luke Mewburn wrote: > Hi, > > I've noticed that when a long-running git operation that generates > progress output is suspended and converted to a background process, > the terminal still gets spammed with progress updates (to stderr). > > I've explicitly

Re: Requesting `git stash --cached` or something similar

Trevor: On Mon, Apr 13, 2015 at 9:44 PM, Trevor Saunders wrote: > I would expect the answers to be it sets the working directories state > to the state in HEAD, and leaves untracked files alone. If that's what > you want you can do git commit -m ; git reset --hard; git reset > --soft; git stash

Git add -p “Your edited hunk does not apply. Edit again”

I asked this question in stackoverflow a few days ago, but get no answer. link: http://stackoverflow.com/questions/29518944/git-add-p-your-edited-hunk-does-not-apply- edit-again --- An example, the original file: test: make clean nosetests clean: rm -rf htmlcov rm

Re: Requesting `git stash --cached` or something similar

On Mon, Apr 13, 2015 at 02:24:04PM -0700, Quinn Taylor wrote: > I'm still fairly new to git (coming from svn) and have found `git stash` to > be really useful for storing in-progress work to resume later, as one might > otherwise do with diff/patch files. (With the git tools I use, I find `git >

Re: Requesting `git stash --cached` or something similar

Quinn: On Mon, Apr 13, 2015 at 5:24 PM, Quinn Taylor wrote: > I'm still fairly new to git (coming from svn) and have found `git stash` to > be really useful for storing in-progress work to resume later, as one might > otherwise do with diff/patch files. (With the git tools I use, I find `git >

Re: About the "git merge" tee-shirt

On Mon, Apr 13, 2015 at 10:50:55PM +0200, Matthieu Moy wrote: > For those of you who weren't at the Git Merge conference last week, we > goot a tee-shirt with this drawing: > [...] Oops, you made me realize that I forgot to grab a t-shirt. :) I'm going to see if we had leftovers (which I guess w

Re: [PATCH 1/7] path.c: implement xdg_config_home()

On Mon, Apr 13, 2015 at 2:43 PM, Matthieu Moy wrote: > Paul Tan writes: > >> As such, implement a simpler function xdg_config_home() for constructing >> the XDG base dir spec configuration file path. This function, together >> with expand_user_path(), can replace all uses of home_config_paths().

Re: [PATCH v3] config.c: split some variables to $GIT_DIR/config.worktree

On Tue, Mar 31, 2015 at 07:14:39PM +0700, Nguyễn Thái Ngọc Duy wrote: > core.worktree and core.bare, which are treated specially in 31e26eb [1], > are now moved to info/core.worktree and the special treatment reverted. <...> > - if (get_common_dir(&sb, gitdir)) > - fn = check_repo_f

Requesting `git stash --cached` or something similar

I'm still fairly new to git (coming from svn) and have found `git stash` to be really useful for storing in-progress work to resume later, as one might otherwise do with diff/patch files. (With the git tools I use, I find `git stash pop` to be more convenient and reliable than creating and apply

Re: [PATCH 1/7] path.c: implement xdg_config_home()

Paul Tan writes: > As such, implement a simpler function xdg_config_home() for constructing > the XDG base dir spec configuration file path. This function, together > with expand_user_path(), can replace all uses of home_config_paths(). Indeed. The code looks much better after your patch series

Re: When and how to to contact the Git developers (gist)

Hi, Thomas Ferris Nicolaisen wrote: > Perhaps someone here would prefer to use my gist when > redirecting people with "user questions" away from this list, or > inspire them to write better bug reports. This won't come as a surprise given what I said at Git Merge: I'd rather we don'

About the "git merge" tee-shirt

Hi, For those of you who weren't at the Git Merge conference last week, we goot a tee-shirt with this drawing: https://drive.google.com/file/d/1v9bfY0mI8Hi94m4SgqLccFnZ5L_OUlaJSA/view?usp=sharing I have to say I love that tee-shirt. I already had tee-shirts that only computer scientists could un

Re[2]: Feature request: implement '--follow' option for `git blame`

Здравствуйте, Junio. Вы писали 13 апреля 2015 г., 8:32:33: JCH> Eugen Konkov writes: >> I agree with your complex example. JCH> Note that it is a norm, not anything complex, that we do not rename JCH> a file wholesale. >> But it will be great to guess in simple case, when in version v1.0 >> o

Re: [PATCH v3] CodingGuidelines: update 'rough' rule count

Julian Gindi wrote: > Changed inaccurate count of "rough rules" from three to the more > generic 'a few'. > > Signed-off-by: Julian Gindi Reviewed-by: Jonathan Nieder Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org

Re: assert failed in submodule edge case

Err, ignore the 'segfault' bits. It's an assert() failure. He called it a segfault at first and that got stuck in my head. On ma, 2015-04-13 at 18:55 +0200, Dennis Kaarsemaker wrote: > Reported by djanos_ in #git: git add segfaults when you manage to > confuse it with a submodule in the index that

assert failed in submodule edge case

Reported by djanos_ in #git: git add segfaults when you manage to confuse it with a submodule in the index that is no longer a submodule. Here's his script to reproduce the segfault: mkdir segfault cd segfault mkdir subrepo cd subrepo git init . echo a > a git add a git commit -m "a" cd .. gi

RE: Finding leaf nodes.

> -Original Message- > From: Michael J Gruber > Sent: Monday, April 13, 2015 10:23 > > Jason Pyeron venit, vidit, dixit 12.04.2015 06:04: > > I am trying to find all the unmerged commits [5]. > > "Unmerged" to which branch? All. I was atempting to describe a leaf node. > > It's not cl

Re: [PATCH 1/7] path.c: implement xdg_config_home()

Hi Paul, maybe it would be a good idea to add a `0/7` mail that describes the overall goal of this patch series, much like a Pull Request? I found it very useful -- even for myself -- to set a description via `git branch --edit-description` and to let `git format-patch` use that via the `--cove

git commit --date format

Hi, In git < 2.0, git commit --amend --date="" can amend commit with current time as author time. But since git 2.0, this does not work, dying with "invalid date format". I have to instead type git commit --amend --date="now". Is empty string date format no longer supported? Or will be fixed? -- T

[PATCH v3 2/5] log: honor log.merges= option

From: Junio C Hamano The config. variable is honored only by log. Other log family commands including show, shortlog and rev-list are affected only from the equivalent command line option (i.e. --merges=). Since these commands are somehow different representations of log command, we like to have

[PATCH v3 3/5] Documentation: add git-log --merges= option and log.merges config. var

From: Junio C Hamano [kk: added documentation in git-log.txt] Signed-off-by: Koosha Khajehmoogahi --- Documentation/git-log.txt | 3 +++ Documentation/rev-list-options.txt | 17 + 2 files changed, 20 insertions(+) diff --git a/Documentation/git-log.txt b/Documentatio

[PATCH v3 5/5] bash-completion: add support for git-log --merges= and log.merges

Helped-by: Eric Sunshine Signed-off-by: Koosha Khajehmoogahi --- contrib/completion/git-completion.bash | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fbe5972..a75d7f5 10064

[PATCH v3 1/5] revision: add --merges={show|only|hide} option

From: Junio C Hamano Add a new option 'merges=' with possible values of 'only', 'show' and 'hide'. The option is used when showing the list of commits. The value 'only' lists only merges. The value 'show' is the default behavior which shows the commits as well as merges and the value 'hide' makes

[PATCH v3 4/5] t4202-log: add tests for --merges=

From: Eric Sunshine Signed-off-by: Koosha Khajehmoogahi --- t/t4202-log.sh | 29 + 1 file changed, 29 insertions(+) diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 1b2e981..3edcd81 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -270,6 +270,35 @@ cat > expect

Re: Git + SFC Status Update

Thanks for the report, and thanks to everyone on the committee (and the conservancy). I'm somewhat disappointed to see that violent revolutions are excluded, though ;) Seriously, keeping the scope of "The Git Project" (the SCF member) as limited as it is seems to be the best approach to keeping i

Re: inexact rename detection warning on "git log -p"

Matthew Walster venit, vidit, dixit 13.04.2015 12:47: > Out of idle curiosity, I cloned > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git and chose > to generate some statistics: > > $ find -not -iname '.git' | wc > 52154 52154 1820305 git ls-files | wc -l > That's a few f

Re: [PATCH] reduce progress updates in background

On Tue, 14 Apr 2015, Luke Mewburn wrote: > On Mon, Apr 13, 2015 at 10:11:09AM -0400, Nicolas Pitre wrote: > | What if you suspend the task and push it into the background? Would be > | nice to inhibit progress display in that case, and resume it if the task > | returns to the foreground. >

Re: [PATCH] reduce progress updates in background

On Mon, Apr 13, 2015 at 10:11:09AM -0400, Nicolas Pitre wrote: | What if you suspend the task and push it into the background? Would be | nice to inhibit progress display in that case, and resume it if the task | returns to the foreground. That's what happens; the suppression only occurs i

Re: [PATCH] reduce progress updates in background

On Mon, 13 Apr 2015, Luke Mewburn wrote: > Hi, > > I've noticed that when a long-running git operation that generates > progress output is suspended and converted to a background process, > the terminal still gets spammed with progress updates (to stderr). > > Many years ago I fixed a similar is

Re: Finding leaf nodes.

Jason Pyeron venit, vidit, dixit 12.04.2015 06:04: > I am trying to find all the unmerged commits [5]. "Unmerged" to which branch? It's not clear to me which commits you are looking for. By "leaf node" I would describe a commit without child commits. "unmerged" can only be understood relative to

[PATCH] reduce progress updates in background

Hi, I've noticed that when a long-running git operation that generates progress output is suspended and converted to a background process, the terminal still gets spammed with progress updates (to stderr). Many years ago I fixed a similar issue in the NetBSD ftp progress bar code (which I wrote).

Re: [PATCH v3] CodingGuidelines: update 'rough' rule count

Changed inaccurate count of "rough rules" from three to the more generic 'a few'. Signed-off-by: Julian Gindi --- Documentation/CodingGuidelines | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 0f8cccf..2dd3

Git + SFC Status Update

Here are the slides from my talk at Git Merge, along with the speaker notes and a few tidbits from the discussion that came afterwards. The talk was not recorded, so if you were there, please feel free to fill in details I've missed from the ensuing discussion. I'm sending the source format, since

RE: Installing git binaries on a non-default directory (Ubuntu)

Hello Juno, > Gianpaolo Macario writes: > > > By some googling and after reading the git sources and the commit logs > > I assumed that the `RUNTIME_PREFIX` option (see > > ) was designed for > > that purpose, > > I do not think so. > > The st

inexact rename detection warning on "git log -p"

Out of idle curiosity, I cloned git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git and chose to generate some statistics: $ find -not -iname '.git' | wc 52154 52154 1820305 That's a few files... $ git log | wc 8359290 37279781 334525133 Hmmm, well that's not too useful, let'

Re: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4

Jeff King venit, vidit, dixit 10.04.2015 05:39: > On Fri, Apr 10, 2015 at 05:23:17AM +0200, Jeff King wrote: > >> Curiously, though, the git-svn tests seem to run fine for me on Apache >> 2.4 without your patch. I wonder if the fixes I mentioned above (which I >> definitely needed to get the regul

Re: [PATCH] gitweb: Update logo and favicon

Thomas Schneider wrote: > The new images were downloaded from > https://git-scm.herokuapp.com/downloads/logos > and converted with ImageMagick: > convert -resize 72x30 Git-Logo-2Color.eps git-logo.png > convert -resize 16x16 Git-Icon-1788C.eps git-favicon.png > The old logo was only 27 pixel

Re: When and how to to contact the Git developers (gist)

On Mon, Apr 13, 2015 at 8:01 AM, Junio C Hamano wrote: > > As to "better bug reports", I often find people pointing others to > > http://www.chiark.greenend.org.uk/~sgtatham/bugs.html Thanks, I've added it to the gist. It is already linked on http://git-scm.com/community . -- To unsubscribe f

Re: Draft of Git Rev News edition 2

Hi Thomas, On 2015-04-12 22:51, Thomas Ferris Nicolaisen wrote: > On Sun, Apr 12, 2015 at 9:03 PM, Christian Couder > wrote: >> A draft of Git Rev News edition 2 is available here: >> >> https://github.com/git/git.github.io/blob/master/rev_news/draft/edition-2.md > > There's also a "secret" live

Re: [msysGit] Re: Sneak peek of the upcoming Git for Windows 2.x

Hi Rupert, On Mon, Apr 13, 2015 at 1:51 AM, Johannes Schindelin wrote: > On 2015-04-11 10:37, rupert thurner wrote: > > * the prompt is still as slow as before, calculating the branch name on > > pressing return without option to turn it off > > There is no explicit option in the installer to tur

Re: [msysGit] Re: Sneak peek of the upcoming Git for Windows 2.x

On Sun, 12 Apr 2015 19:51:29 +0200 Johannes Schindelin wrote: [...] > > * it is talking german to me > > > > would it be sufficient to delete > > c:\Apps\gitwin\mingw64\share\locale\de\LC_MESSAGES\ > > resp the whole locale directory to let it speak english? > > Probably. But the canonical solu