Re: [PATCH] defer expensive load_ref_decorations until needed

On Wed, Nov 22, 2017 at 1:27 PM, Jeff King <p...@peff.net> wrote: > On Tue, Nov 21, 2017 at 03:43:36PM -0800, Phil Hord wrote: > >> With many thousands of references, a simple `git rev-parse HEAD` may take >> more than a second to return because it first loads all the

[PATCH v2 2/2] stash-store: add failing test for same-ref

stash-store cannot create a new stash with the same ref as stash@{0}. No error is returned even though no new stash log is created. Add a failing test to track. Signed-off-by: Phil Hord <phil.h...@gmail.com> --- t/t3903-stash.sh | 11 +++ 1 file changed, 11 insertions(+) diff --g

[PATCH v2] Teach stash to parse -m/--message like commit does

<gits...@pobox.com> Signed-off-by: Phil Hord <phil.h...@gmail.com> --- Added tests for 'stash push' and 'stash store'. Added a note that create_stash is included but unnecessary. git-stash.sh | 18 +++ t/t3903-stash.sh | 93 +++

Re: [PATCH] defer expensive load_ref_decorations until needed

On Tue, Nov 21, 2017, Junio C Hamano wrote: > Junio C Hamano writes: > > I am not sure if "maybe_" is a good name here, though. If anything, > you are making the semantics of "load_ref_decorations()" to "maybe" > (but I do not suggest renaming that one). >

Re: doc: prefer 'stash push' over 'stash save'

You probably already noticed this was my fault for filtering the patch through Gmail's GUI. I did also push a replacement which hopefully does apply. On Tue, Nov 21, 2017 at 8:39 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jonathan Nieder <jrnie...@gmail.com> writes: >

[PATCH] defer expensive load_ref_decorations until needed

With many thousands of references, a simple `git rev-parse HEAD` may take more than a second to return because it first loads all the refs into memory even though it will never use them. Defer loading any references until we actually need them. Signed-off-by: Phil Hord <phil.h...@gmail.

[PATCH] doc: prefer 'stash push' instead of 'stash save'

Although `git stash save` was deprecated recently, some parts of the documentation still refer to it. Signed-off-by: Phil Hord <phil.h...@gmail.com> --- Documentation/git-stash.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-stash.txt b/Documen

[PATCH] stash: Learn to parse -m/--message like commit does

work for `git commit`, and my fingers have learned this pattern long ago. Teach `git stash` to parse -mFoo and --message=Foo the same as `git commit` would do. Signed-off-by: Phil Hord <phil.h...@gmail.com> --- git-stash.sh | 18 ++ 1 file changed, 18 insertions(+) diff

Re: stash: learn to parse -m/--message like commit does

Hm.. Sorry about the formatting here. It's been a while. I'll try again. On Tue, Nov 21, 2017 at 3:07 PM, Phil Hord <phil.h...@gmail.com> wrote: > `git stash push -m foo` uses "foo" as the message for the stash. But > `git stash push -m"foo"` does not parse

stash: learn to parse -m/--message like commit does

work for `git commit`, and my fingers have learned this pattern long ago. Teach `git stash` to parse -mFoo and --message=Foo the same as `git commit` would do. Signed-off-by: Phil Hord <phil.h...@gmail.com> --- git-stash.sh | 18 ++ 1 file changed, 18 insertions(+) diff

doc: prefer 'stash push' over 'stash save'

Although `git stash save` was deprecated recently, some parts of the documentation still refer to it instead of `push`. Signed-off-by: Phil Hord <phil.h...@gmail.com> --- Documentation/git-stash.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentati

Re: git-push branch confusion caused by user mistake

On Mon, Mar 13, 2017 at 1:55 AM Jacob Keller <jacob.kel...@gmail.com> wrote: > On Fri, Mar 10, 2017 at 2:13 PM, Junio C Hamano <gits...@pobox.com> wrote: > > Phil Hord <phil.h...@gmail.com> writes: > >> I think git should be smarter about deducing t

git-push branch confusion caused by user mistake

This week a user accidentally did this: $ git push origin origin/master Total 0 (delta 0), reused 0 (delta 0) To parent.git * [new branch] origin/master -> origin/master He saw his mistake when the "new branch" message appeared, but he was confused about how to fix it and

Re: Request re git status

On Mon, Feb 6, 2017 at 3:36 PM Ron Pero wrote: > I almost got bit by git: I knew there were changes on the remote > server, but git status said I was uptodate with the remote. > Do you mean you almost pushed some changed history with "--force" which would have lost others'

diff --color-words breaks spacing

I noticed some weird spacing when comparing files with git diff --color-words. The space before a colored word disappears sometimes. $ git --version git version 2.11.0.485.g4e59582ff echo "FOO foo; foo = bar" > a echo "FOO foo = baz" > b git diff --color-words --no-index a b FOOfoo; foo =

Re: [RFC 2/2] grep: use '/' delimiter for paths

On Tue, Jan 24, 2017 at 1:54 AM Stefan Hajnoczi wrote: > > The use of "git show" you are demonstrating is still about showing > > the commit object, whose behaviour is defined to show the log > > message and the diff relative to its sole parent, limited to the > > paths that

Re: [PATCH v5 1/4] implement submodule config API for lookup of .gitmodules values

On Mon, Jun 15, 2015 at 5:06 PM, Heiko Voigt hvo...@hvoigt.net wrote: In a superproject some commands need to interact with submodules. They need to query values from the .gitmodules file either from the worktree of from certain revisions. At the moment this is quite hard since a caller would

Re: Submodules as first class citizens (was Re: Moving to subtrees for plugins?)

On Tue, Jun 9, 2015 at 2:40 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 07.06.2015 um 08:26 schrieb Stefan Beller: On 06.06.2015 12:53, Luca Milanesio wrote: On 6 Jun 2015, at 18:49, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 5, 2015, 2:58 AM lucamilanesio luca.milane...@gmail.com

Submodules as first class citizens (was Re: Moving to subtrees for plugins?)

On Fri, Jun 5, 2015, 2:58 AM lucamilanesio luca.milane...@gmail.com wrote: Some devs of my Team complained that with submodules it is difficult to see the “full picture” of the difference between two SHA1 on the root project, as the submodules would just show as different SHA1s. When you

Re: [PATCH] rebase -i: redo tasks that die during cherry-pick

On Wed, Apr 29, 2015 at 1:15 PM, Junio C Hamano gits...@pobox.com wrote: Thanks, will queue. Aside from the much more invasive possibility, the patch makes me wonder if it would have been a better design to have a static todo with a current pointer as two state files. Then reschedule would

Re: Regular Rebase Failure

On Mon, Apr 27, 2015 at 10:07 AM, Adam Steel adamgst...@gmail.com wrote: Stefan, So I switched git versions. $ git --version git version 2.3.1 I'm still getting the same regular rebase failures. --- fatal: Unable to create '/Users/asteel/Repositories/rails-teespring/.git/index.lock':

[PATCH] rebase -i: redo tasks that die during cherry-pick

until they are resolved or the changes are not recorded in the index (return value neither 0 nor 1) and rebase has to try again with the same task. Add a test cases for regression testing to the rebase-interactive test suite. Signed-off-by: Fabian Ruch baf...@gmail.com Signed-off-by: Phil Hord ho

[PATCH] git-push.txt: clean up force-with-lease wording

The help text for the --force-with-lease option to git-push does not parse cleanly. Clean up the wording and syntax to be more sensible. Also remove redundant information in the --force-with-lease alone description. Signed-off-by: Phil Hord ho...@cisco.com --- Documentation/git-push.txt | 14

Checkout --force without complete overwrite?

I have a repo whose workdir tends to get pretty dirty as I jump around from branch to branch tending weeds and whatnot. Sometimes when I try to switch branches git refuses because of local file changes. git checkout otherbranch error: Your local changes to the following files would be

Re: Bug in log for path in case of identical commit

On Fri, Oct 31, 2014 at 4:40 AM, Alexandre Garnier zigarn+...@gmail.com wrote: When merging 2 branches with the same modifications on the both sides, depending the merge side, one branch disappear from the file history. To be more clear, there is a script in attachment to reproduce, but here

Re: git reflog --date

On Tue, Oct 21, 2014 at 1:24 PM, Junio C Hamano gits...@pobox.com wrote: John Tapsell johnf...@gmail.com writes: Hi all, Could we add a default to --date so that: git reflog --date just works? (Currently you need to do: git reflog --date=iso) It should probably obey the default in

Re: squash commits deep down in history

On Thu, Oct 23, 2014 at 8:34 AM, Henning Moll newssc...@gmx.de wrote: Hi, i need to squash several commits into a single one in a automated way. I know that there is interactive rebase, which can also be automated using GIT_SEQUENCE_EDITOR. Unfortunately my history is very large and i need

Re: [PATCH v2 02/23] rebase -i: allow squashing empty commits without complaints

-by: Peter Krefting pe...@softwolves.pp.se Signed-off-by: Fabian Ruch baf...@gmail.com --- Hi, Peter Krefting is cc'd as the author of the bug report Confusing error message in rebase when commit becomes empty discussed on the mailing list in June. Phil Hord and Jeff King both participated

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Fri, Jun 27, 2014 at 6:39 PM, Jason Pyeron jpye...@pdinc.us wrote: On Fri, Jun 27, 2014 at 4:47 PM, Jason Pyeron jpye...@pdinc.us wrote: There are two identical files from the same original parent, but both were renamed in their own branches. One branch moved the file to a new folder,

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote: Sorry for the http://pastebin.com/1R68v6jt (changes the merge to 1ca13ed2271d60ba93d40bcc8db17ced8545f172, and manually reconciles the merge), but it was too long to be readable in the email. git blame HEAD --

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote: Sorry for the http://pastebin.com/1R68v6jt (changes the merge to 1ca13ed2271d60ba93d40bcc8db17ced8545f172, and manually reconciles the merge

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Sun, Jun 29, 2014 at 4:20 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:09 On Sun, Jun 29, 2014 at 11:31 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 27, 2014 at 8:42 PM, Jason Pyeron jpye...@pdinc.us wrote

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Sun, Jun 29, 2014 at 5:13 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29, 2014 16:27 On Sun, Jun 29, 2014 at 4:20 PM, Jason Pyeron jpye...@pdinc.us wrote: -Original Message- From: Phil Hord Sent: Sunday, June 29

Re: Trouble merging renamed but identical files - CONFLICT (rename/rename)

On Fri, Jun 27, 2014 at 4:47 PM, Jason Pyeron jpye...@pdinc.us wrote: There are two identical files from the same original parent, but both were renamed in their own branches. One branch moved the file to a new folder, the other renamed the file in the same folder. You have not stated what you

Re: files deleted with no record?

On Mon, Jun 23, 2014 at 9:15 PM, Jeremy Scott jer...@great-scotts.org wrote: I just encountered a situation where a merge was made, with no apparent changes in files (ie no log), but the result was that some files were deleted. person A adds some files person B adds some files from the same

Re: Confusing error message in rebase when commit becomes empty

On Wed, Jun 11, 2014 at 8:49 AM, Peter Krefting pe...@softwolves.pp.se wrote: I am rebasing a branch to combine a couple of commits. One is a revert of a previous commit. Since there are commits in-between, I do squash to make sure I get everything, and then add the actual change on top of

Re: Confusing error message in rebase when commit becomes empty

On Wed, Jun 11, 2014 at 1:57 PM, Peter Krefting pe...@softwolves.pp.se wrote: Phil Hord: What does it mean when you say it worked as expected? Did it leave the empty commit, omit the empty commit, or leave some un-squashed commit? Actually, it did not work as expected I noted afterward

Re: [RFC 1/3] sequencer: Signal failed ff as an aborted, not a conflicted merge

On 06/10/2014 01:56 PM, Junio C Hamano wrote: Fabian Ruch baf...@gmail.com writes: On 05/27/2014 08:42 PM, Junio C Hamano wrote: Fabian Ruch baf...@gmail.com writes: [..] In order to signal the three possible situations (not only success and failure to complete) after a pick through

Re: [RFC 2/3] rebase -i: Reschedule tasks that failed before the index was touched

Hi Fabian, Thanks for looking into this. On 05/27/2014 07:56 AM, Michael Haggerty wrote: +reschedule_last_action () { +tail -n 1 $done | cat - $todo $todo.new +sed -e \$d $done $done.new +mv -f $todo.new $todo +mv -f $done.new $done +} + append_todo_help () { git

Re: Zsh submodule name completion borked

On Thu, May 1, 2014 at 6:35 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Phil Hord wrote: When I use zsh tab-completion to complete the submodule name in 'git submodule init', I get more than I expected. From the gerrit repository (which has plugins): $ git submodule init plugins

Zsh submodule name completion borked

When I use zsh tab-completion to complete the submodule name in 'git submodule init', I get more than I expected. From the gerrit repository (which has plugins): $ git submodule init plugins/TAB plugins/commit-message-length-validator\ \(v1.0-rc1-9-g545000b\) plugins/reviewnotes\

git-rebase-todo gets popped prematurely

During a 'git rebase --continue', I got an error about having left a file in place which the next commit intended to add as new. Stupid me. So I rm'ed the file and tried again. This time, git rebase --continue succeeded. But it accidentally left out the next commit in my rebase-todo. I looked

Re: Borrowing objects from nearby repositories

On Tue, Mar 11, 2014 at 11:37 PM, Andrew Keller and...@kellerfarm.com wrote: I am considering developing a new feature, and I'd like to poll the group for opinions. Background: A couple years ago, I wrote a set of scripts that speed up cloning of frequently used repositories. The scripts

Re: Git Config pushInsteadOf is not working

I thought you had the URLs backwards, but that doesn't seem to be the problem, assuming I am reading your transcription correctly. Maybe the 'insteadOf' is being applied in addition to (and cancelling out) the pushInsteadOf. Does it work as expected if you remove one or the other? In any case,

Re: [PATCH/RFC] Introduce git submodule add|update --attach

On Sun, Dec 29, 2013 at 8:49 PM, Francesco Pretto cez...@gmail.com wrote: by default git submodule performs its add or update operations on a detached HEAD. This works well when using an existing full-fledged/indipendent project as the submodule, as there's less frequent need to update it or

Re: Finding the repository

On Thu, Oct 24, 2013 at 9:46 AM, Duy Nguyen pclo...@gmail.com wrote: On Thu, Oct 24, 2013 at 2:49 PM, Perry Hutchison per...@pluto.rain.com wrote: Duy Nguyen pclo...@gmail.com wrote: ... it's not easy to determine ambiguity here, especially when the repo finding code does not know anything

Re: [PATCH 1/3] for-each-ref: introduce %C(...) for color

On Fri, Sep 27, 2013 at 8:10 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Enhance 'git for-each-ref' with color formatting options. You can now use the following format in for-each-ref: %C(green)%(refname:short)%C(reset) Signed-off-by: Ramkumar Ramachandra artag...@gmail.com ---

Re: [PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

On Fri, Sep 27, 2013 at 8:10 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Introduce %(upstream:track) to display [ahead M, behind N] and %(upstream:trackshort) to display =, , , or appropriately (inspired by contrib/completion/git-prompt.sh). Now you can use the following format in

Re: Bug: [hostname:port]:repo.git notation no longer works (for ssh)

On Fri, Sep 27, 2013 at 4:07 AM, Morten Stenshorne msten...@opera.com wrote: If I don't go via the ssh tunnel (I finally have some VPN stuff these days, so I don't really need the tunnel thing anymore, but that's going to be a lot of remotes to update, so I'd prefer it just worked like it used

Re: Git tag output order is incorrect (IMHO)

Someone at $work asked me this week how to find the current and previous tags on his branch so he could generate release notes. I just need last two tags on head in topo-order. I was surprised by how complicated this turned out to be. I ended up with this: git log --decorate=full

Re: [PATCH] git-gui: Modify push dialog to support Gerrit review

On Fri, Sep 6, 2013 at 6:30 AM, Joergen Edelbo j...@napatech.com wrote: Problem: It is not possible to push for Gerrit review as you will always try to push to refs/heads/... on the remote. Changes done: Add an option to select Gerrit review and a corresponding entry for a branch name. If

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Tue, Aug 27, 2013 at 12:07 AM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: Not necessarily. If the user is asking the question in a more natural way (I want to see where in 'next' branch's tip commit hits appear, by the way, I know I am only interested

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Mon, Aug 26, 2013 at 3:14 AM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: I think Phil meant that when git grep is asked to search within HEAD:some/path, filenames tacked on at the end should be appended with

[PATCHv2] grep: use slash for path delimiter, not colon

When a commit is grepped and matching filenames are printed, grep-objects creates the filename by prefixing the original cmdline argument to the matched path separated by a colon. Normally this forms a valid blob reference to the filename, like this: git grep -l foo HEAD

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Mon, Aug 26, 2013 at 12:23 PM, Junio C Hamano gits...@pobox.com wrote: Phil Hord phil.h...@gmail.com writes: On Mon, Aug 26, 2013 at 3:14 AM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: I think Phil meant

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Mon, Aug 26, 2013 at 12:49 PM, Phil Hord phil.h...@gmail.com wrote: If so, then I would like to point out to you the convenience I accidentally encountered using this tool. Perhaps you didn't realize how helpful it was when you chose to use a colon there. My itch comes from a case where I

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Mon, Aug 26, 2013 at 1:03 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: If your justification were above says 'there may be a readon why the user wanted to ask it in that way', i.e. 'find in this tree object HEAD:some/path and report where hits

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Mon, Aug 26, 2013 at 1:26 PM, Junio C Hamano gits...@pobox.com wrote: Phil Hord phil.h...@gmail.com writes: If your justification were above says 'there may be a readon why the user wanted to ask it in that way', i.e. 'find in this tree object HEAD:some/path and report where hits appear

Re: [PATCH 2/2] grep: use slash for path delimiter, not colon

On Mon, Aug 26, 2013 at 4:13 PM, Johannes Sixt j...@kdbg.org wrote: Am 26.08.2013 21:56, schrieb Jeff King: Also, prevent the delimiter being added twice, as happens now in these examples: git grep -l foo HEAD: HEAD::some/path/to/foo.txt ^ Which one of these two does it print

Re: [PATCH 2/2] grep: use slash for path delimiter, not colon

On Mon, Aug 26, 2013 at 4:52 PM, Jeff King p...@peff.net wrote: On Mon, Aug 26, 2013 at 10:13:14PM +0200, Johannes Sixt wrote: Am 26.08.2013 21:56, schrieb Jeff King: Also, prevent the delimiter being added twice, as happens now in these examples: git grep -l foo HEAD:

[RFC/PATCH] Fix path prefixing in grep_object

When the pathspec given to grep includes a tree name, the full name of matched files is assembled using colon as a separator. If the pathspec includes a tree name, it should use a slash instead. Check if the pathspec already names a tree and ref (including a colon) and use a slash if so. --- I'm

Re: [RFC/PATCH] Fix path prefixing in grep_object

On Sat, Aug 24, 2013 at 9:35 PM, Phil Hord ho...@cisco.com wrote: When the pathspec given to grep includes a tree name, the full name of matched files is assembled using colon as a separator. If the pathspec includes a tree name, it should use a slash instead. Check if the pathspec already

Re: [Bug] git stash generates a different diff then other commands (diff, add, etc) resulting in merge conflicts!

On Tue, Aug 13, 2013 at 1:31 AM, Luke San Antonio lukesananto...@gmail.com wrote: So I found an isolated case, it's very strange... Here's a script! deleted Thanks for that. It was hard to read, but it demonstrates the problem well. ... Copy and paste that into a terminal and you should

Re: Repo with only one file

On Fri, Aug 9, 2013 at 6:03 AM, shawn wilson ag4ve...@gmail.com wrote: On Fri, Aug 9, 2013 at 2:50 AM, Johannes Sixt j.s...@viscovery.net wrote: Let's check: After running your command above to remove other files, does the command git filter-branch -f HEAD webban.pl Ahha, no but: git

[PATCH] t/t7407: fix two typos in submodule tests

means the return values of all the previous commands in this test are also being ignored. Fix the path and add the chain operator so the entire test sequence can be properly validated. Signed-off-by: Phil Hord ho...@cisco.com --- t/t7407-submodule-foreach.sh | 2 +- 1 file changed, 1 insertion

Re: [Bug] git stash generates a different diff then other commands (diff, add, etc) resulting in merge conflicts!

On Thu, Aug 8, 2013 at 3:07 AM, Luke San Antonio lukesananto...@gmail.com wrote: Hi, my name's Luke! Today, I had a problem merging a stash after immediately creating it. This is exactly what I did! git stash save --keep-index git stash pop And BAM! Merge conflict! This was especially

Re: Repo with only one file

On Wed, Aug 7, 2013 at 5:07 PM, shawn wilson ag4ve...@gmail.com wrote: On Wed, Aug 7, 2013 at 6:43 AM, Johannes Sixt j.s...@viscovery.net wrote: Am 8/7/2013 8:24, schrieb shawn wilson: ... create a repo for one of these scripts and I'd like to keep the commit history. Ok, so: % find -type f

Re: git clone -b

It would be nice to support more generic specs for the --branch switch. But it is complicated because the refs have not been fetched yet during the clone, and so normal refs operations -- which expect to work on a local repository -- do not work. So, the ref is looked up locally from a list in

Re: Splitting a rev list into 2 sets

On Thu, Jun 20, 2013 at 6:14 AM, Francis Moreau francis.m...@gmail.com wrote: I'd like to write a script that would parse commits in one of my repo. Ideally this script should accept any revision ranges that git-rev-list would accept. This script should consider commits in master differently

[PATCH] fix builtin-* references to be builtin/*

Documentation and some comments still refer to files in builtin/ as 'builtin-*.[cho]'. Update these to show the correct location. Signed-off-by: Phil Hord ho...@cisco.com --- Documentation/git-log.txt | 4 ++-- Documentation/technical/api-builtin.txt | 2

[PATCHv2] fix builtin-* references to be builtin/*

Documentation and some comments still refer to files in builtin/ as 'builtin-*.[cho]'. Update these to show the correct location. Signed-off-by: Phil Hord ho...@cisco.com Reviewed-by: Jonathan Nieder jrnie...@gmail.com Assisted-by: Junio C Hamano gits...@pobox.com --- Documentation/git-log.txt

Re: [PATCH 1/2] sha1_name: stop hard-coding 40-character hex checks

On Sat, Jun 15, 2013 at 1:38 PM, Ramkumar Ramachandra artag...@gmail.com wrote: In two places, get_sha1_basic() assumes that strings are possibly sha1 hexes if they are 40 characters long, and calls get_sha1_hex() in these two cases. This 40-character check is ugly and wrong: there is nothing

Re: [PATCH 1/2] pull: respect rebase.autostash

On Fri, Jun 14, 2013 at 6:41 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Matthieu Moy wrote: It would be nice to have an --autostash command-line option too, I thought it would be a bit ugly, since it's already overloaded with options to pass to merge. Eventually I think a switch will

Re: [PATCH 1/2] pull: respect rebase.autostash

On Fri, Jun 14, 2013 at 4:56 AM, Ramkumar Ramachandra artag...@gmail.com wrote: If a rebasing pull is requested, pull unconditionally runs require_clean_worktree() resulting in: # dirty worktree or index $ git pull Cannot pull with rebase: Your index contains uncommitted changes.

Re: [PATCH 1/2] pull: respect rebase.autostash

On Fri, Jun 14, 2013 at 8:12 AM, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 14, 2013 at 4:56 AM, Ramkumar Ramachandra artag...@gmail.com wrote: If a rebasing pull is requested, pull unconditionally runs require_clean_worktree() resulting in: # dirty worktree or index $ git pull

Re: [PATCH 1/5] stash doc: add a warning about using create

On Fri, Jun 14, 2013 at 6:32 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Add a note saying that the user probably wants save in the create description. While at it, document that it can optionally take a message in the synopsis. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com

Re: [PATCH 1/2] [submodule] handle multibyte characters in name

On Tue, Jun 11, 2013 at 7:04 PM, Fredrik Gustafsson iv...@iveqy.com wrote: Bugg reported here: http://thread.gmane.org/gmane.comp.version-control.git/218922/focus=226791 Note that newline (\n) is still not supported and will not be until the sh-script is replaced by something in an other

Re: [PATCH v5 00/36] Massive improvents to rebase and cherry-pick

On Sun, Jun 9, 2013 at 3:37 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Sun, Jun 9, 2013 at 2:24 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Same as before, but: Also, remove the patches from Martin von Zweigbergk, because apparently some people have trouble

Re: [PATCH v5 00/36] Massive improvents to rebase and cherry-pick

On Mon, Jun 10, 2013 at 7:43 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jun 10, 2013 at 5:55 PM, Phil Hord phil.h...@gmail.com wrote: On Sun, Jun 9, 2013 at 3:37 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Sun, Jun 9, 2013 at 2:24 PM, Felipe Contreras

Re: Re: Re: What's cooking in git.git (May 2013, #09; Wed, 29)

On Tue, Jun 4, 2013 at 8:48 AM, John Keeping j...@keeping.me.uk wrote: On Tue, Jun 04, 2013 at 09:17:17PM +1000, Heiko Voigt wrote: On Tue, Jun 04, 2013 at 09:10:45AM +0100, John Keeping wrote: On Tue, Jun 04, 2013 at 03:29:51PM +1000, Heiko Voigt wrote: On Mon, Jun 03, 2013 at 11:23:41PM

[PATCH] trivial: Add missing period in documentation

--- Documentation/diff-options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 104579d..b8a9b86 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -480,7 +480,7 @@

Re: [PATCH 2/2] diffcore-pickaxe doc: document -S and -G properly

On Fri, May 24, 2013 at 5:37 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Junio C Hamano wrote: [...] I agree with the other comments, and have made suitable changes. Let's review your block now. This transformation is used to find filepairs that represent two kinds

Re: git stash deletes/drops changes of

On Thu, May 23, 2013 at 7:20 PM, Junio C Hamano gits...@pobox.com wrote: Thomas Rast tr...@inf.ethz.ch writes: What are the workflows that are helped if we had such a bit? If we need to support them, I think you need a real --ignore-changes bit, not an abuse of --assume-unchanged. I gather

Re: [PATCH 5/6] test-lib: allow prefixing a custom string before ok N etc.

On Fri, May 17, 2013 at 4:00 AM, Thomas Rast tr...@inf.ethz.ch wrote: Phil Hord phil.h...@gmail.com writes: On Thu, May 16, 2013 at 4:50 PM, Thomas Rast tr...@inf.ethz.ch wrote: This is not really meant for external use, but allows the next commit to neatly distinguish between sub-tests

Re: [RFC/PATCH] branch: show me the hot branches

On Tue, May 14, 2013 at 7:34 PM, Junio C Hamano gits...@pobox.com wrote: Phil Hord phil.h...@gmail.com writes: I imagine it with --date-order and whatnot. Perhaps modeled after this one. git for-each-ref \ --format='%(refname:short) %(subject)' --sort='-committerdate

Re: [PATCH] diffcore-pickaxe doc: document -S and -G properly

On Tue, May 14, 2013 at 10:12 AM, Ramkumar Ramachandra artag...@gmail.com wrote: The documentation of -S and -G is very sketchy. Completely rewrite the sections in Documentation/diff-options.txt and Documentation/gitdiffcore.txt. References: 52e9578 ([PATCH] Introducing software

Re: [PATCH] diffcore-pickaxe doc: document -S and -G properly

On Tue, May 14, 2013 at 1:44 PM, Phil Hord phil.h...@gmail.com wrote: On Tue, May 14, 2013 at 10:12 AM, Ramkumar Ramachandra artag...@gmail.com wrote: -Sstring:: - Look for differences that introduce or remove an instance of - string. Note that this is different than the string

Re: [PATCH] diffcore-pickaxe doc: document -S and -G properly

On Tue, May 14, 2013 at 2:44 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Phil Hord wrote: References to git-log seem out of place to me here in git-diffcore. I know it's only an example, but it seems that Git normally describes these 'reference selectors' more generically. The generic

Re: [PATCH] diffcore-pickaxe doc: document -S and -G properly

On Tue, May 14, 2013 at 2:57 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Junio C Hamano wrote: I do not use zsh but with bash+readline the old tradition lnext can be used (see stty -a output and it typically is set to ^V), i.e. \C-v followed by \C-i should give you a literal HT. Just

Re: [RFC/PATCH] branch: show me the hot branches

On Mon, May 13, 2013 at 4:02 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Uses commit-date to sort displayed refs. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- I dig it. I imagine it with --date-order and whatnot. But I might like it even better if it were

Re: Itches with the current rev spec

On Thu, Apr 25, 2013 at 1:07 AM, Ramkumar Ramachandra artag...@gmail.com wrote: 2. git rebase -i master fails unless I've rebased my branch on top of master. I always wished I could do the equivalent of 'git rebase -i master..', but I can't. In what way does it fail? It seems to work ok for

Re: [BUG] Highly inconsistent diff UI

On Wed, Apr 24, 2013 at 3:00 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Ramkumar Ramachandra wrote: I'm also considering making the first argument optional (just git log ~rebase.autostash), and defaulting to mean [nearest fork point]. Actually both can be optional. In A~B, A

Re: [PATCH 7/7] rebase: implement --[no-]autostash and rebase.autostash

On Tue, Apr 23, 2013 at 10:02 AM, Ramkumar Ramachandra artag...@gmail.com wrote: This new feature allows a rebase to be executed on a dirty worktree. It works by creating a temporary stash and storing it in $state_dir/autostash before the operation, and applying it after a successful

[PATCH] rebase: find orig_head unambiguously

$orig_head unambiguously. Add a test in t3400-rebase.sh which creates an ambiguous branch name and rebases it implicitly with 'git rebase $other'. Signed-off-by: Phil Hord ho...@cisco.com --- git-rebase.sh | 2 +- t/t3400-rebase.sh | 7 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff

Re: What's cooking in git.git (Apr 2013, #05; Mon, 15)

On Thu, Apr 18, 2013 at 7:48 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Thu, Apr 18, 2013 at 3:06 PM, Phil Hord phil.h...@gmail.com wrote: On Wed, Apr 17, 2013 at 2:50 PM, Felipe Contreras Yes please. Show me one of the instances where you hit a bisect with any of the remote-hg

Re: What's cooking in git.git (Apr 2013, #05; Mon, 15)

On Wed, Apr 17, 2013 at 2:50 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Tue, Apr 16, 2013 at 5:45 PM, Phil Hord phil.h...@gmail.com wrote: On Tue, Apr 16, 2013 at 3:04 PM, Felipe Contreras If you want to waste your time, by all means, rewrite all my commit messages with essays

Re: [PATCH] submodule deinit: clarify work tree removal message

On Mon, Apr 1, 2013 at 3:02 PM, Jens Lehmann jens.lehm...@web.de wrote: Okay, so here is the patch for that. If someone could point out a portable and efficient way to check if a directory is already empty I would be happy to use that to silence the Cleaned directory message currently printed

Re: [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash

On Tue, Apr 16, 2013 at 5:20 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Matthieu Moy wrote: No. Ultimately, the entry point of all these invocations is git-rebase.sh. The plan is to refactor calls from git-rebase.sh to git-rebase--*.sh scripts so that those scripts return control to

Re: What's cooking in git.git (Apr 2013, #05; Mon, 15)

On Tue, Apr 16, 2013 at 3:48 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Here it goes. The remote helper ref is going to be used to tell fast-export which refs to negate (e.g. ^refs/testgit/origin/master), so that extra commits are not generated, which the remote helper should

Re: What's cooking in git.git (Apr 2013, #05; Mon, 15)

On Tue, Apr 16, 2013 at 3:04 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Tue, Apr 16, 2013 at 4:59 AM, Thomas Rast tr...@inf.ethz.ch wrote: A cursory look^W^Wreview of the messages in fc/remote-hg: [skipping irrelevant comments] I'm sorry, did you actually hit an issue that

  1   2   >