Added git alias to list only conflicted files #1733

tbhaxor · 2020-12-10T03:57:57Z

No description provided.

cornfeedhobo · 2020-12-10T04:43:55Z

@tbhaxor I like to think of these as building off each other, like chords, similar to vi. Is there another alias this could go under? maybe gdc, loosely translating to "git diff conflict"?

@NoahGorny this file is getting a lot of activity. I think we need to clean it up and make a pattern clear - probably alphabetizing would be a good start.

davidpfarrell · 2020-12-10T05:05:52Z

aliases/available/git.aliases.bash

@@ -45,6 +45,7 @@ alias gds='git diff --staged'
 alias gdt='git difftool'
 alias gdv='git diff -w "$@" | vim -R -'
 alias gc='git commit -v'
+alias gcf='git diff --name-only --diff-filter=U' # lists only conflicted files


Greetings - Always great to see new git aliases.

Not thrilled with the gc prefix used here as its rather exclusively used for commit aliases.

This is a version of a 'list files' action.

Although there aren't currently any aliases based on 'git ls-files', I think this action would live among them.

Q: Would 'git ls-files --unmerged' give the same (or similar-enough) results?

Although 'conflicted' is technically correct, it seems 'unmerged' is the official term.

I'm thinking 'glsu' is the most appropriate alias for this action.

@davidpfarrell I totally agree with you. I have new proposal. I would be cool to show the lines / blocks of the files that have conflicts

Basically we can use grep to show files starting with <<<<

Basically we can use grep to show files starting with <<<<

I don't know about that - I think listing the files that are unmerged is a good idea - I will definitely use the alias.

I just think that glsu is the best name for the alias.

Additionally, I think the alias could execute git ls-file --unmerged vs git diff ... (assuming they return similar results)

NoahGorny · 2020-12-13T21:59:32Z

hey @tbhaxor
wanna follow up on this PR?

tbhaxor · 2020-12-14T00:24:31Z

Hey @NoahGorny, yes ofcourse. I got busy with job. Will it be ok if work from this weekend?

NoahGorny · 2020-12-14T00:40:20Z

Hey @NoahGorny, yes ofcourse. I got busy with job. Will it be ok if work from this weekend?

Sure thing! No need to feel rushed, I just wanted to know if you plan on continuing this 😄

tbhaxor · 2020-12-20T10:43:41Z

@davidpfarrell Here is a difference between ls-files and diff

Also it has been taken from stackoverflow, https://stackoverflow.com/questions/3065650/whats-the-simplest-way-to-list-conflicted-files-in-git

My bad, at time I couldn't read the stackoverflow question completely.

Also i don't think ls-files would be needed here, because the purpose of this command is to "list the conflicted files"

davidpfarrell · 2020-12-20T18:31:38Z

@tbhaxor Thank for pointing out the differences.

The relevant portion of the ls-files documentation is:

-u
--unmerged
Show unmerged files in the output (forces --stage)
...
git ls-files just outputs the filenames unless --stage is specified in which case it outputs:

[<tag> ]<mode> <object> <stage> <file>
...
git ls-files --unmerged and git ls-files --stage can be used to examine detailed information on unmerged paths.

For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; ...

So ls-files would just show filenames normally, but the --staged (and by proxy, --unmerged) options enable the extended data.

Soo, for this use case, the git diff ... option is a better choice.

HOWEVER I still stand by my opinion that the name of the alias should be glsu (i.e "List Unmerged Files").

The gc* prefix is almost exclusively used for commit aliases and I think trying to add a non-commit-related alias with that prefix is just confusing.

Additionally, "unmerged" is the official name of the concept within git.

NoahGorny · 2020-12-27T14:57:44Z

hey @tbhaxor, wanna follow up on this? 😄

tbhaxor · 2020-12-27T15:29:31Z

Yes, actually there is nothing to change. @davidpfarrell 's feature is another and mine is different. Please see the comment.

The edit is ready to be merged. Later on we can refactor the code

NoahGorny · 2020-12-27T16:25:09Z

Yes, actually there is nothing to change. @davidpfarrell 's feature is another and mine is different. Please see the comment.

The edit is ready to be merged. Later on we can refactor the code

I agree with what @davidpfarrell said here:

HOWEVER I still stand by my opinion that the name of the alias should be glsu (i.e "List Unmerged Files").
The gc* prefix is almost exclusively used for commit aliases and I think trying to add a non-commit-related alias with that prefix is just confusing.

NoahGorny · 2021-01-07T18:07:36Z

gentle ping @tbhaxor

tbhaxor · 2021-01-08T07:52:50Z

gentle ping @tbhaxor

This is complete on my end. Please ask @davidpfarrell to approve it so that it can be merged 😄

NoahGorny · 2021-01-08T10:14:38Z

gentle ping @tbhaxor

This is complete on my end. Please ask @davidpfarrell to approve it so that it can be merged smile

Please rename the alias to glsu as @davidpfarrell suggested

tbhaxor · 2021-01-08T20:06:31Z

gentle ping @tbhaxor

This is complete on my end. Please ask @davidpfarrell to approve it so that it can be merged smile

Please rename the alias to glsu as @davidpfarrell suggested

Done :)

davidpfarrell

Ok I think this is ready !

NoahGorny · 2021-01-13T17:13:31Z

Ok I think this is ready !

I rebased to improve the location after #1743 was merged, lemme know what you think @davidpfarrell

davidpfarrell · 2021-01-13T17:38:23Z

Well now that the file is so nicely organized, I was able to discover this existing section:

# ls-files
alias gu='git ls-files . --exclude-standard --others' # Show untracked files

Which leads me to 2 problems:

I kinda like the idea of putting the new glsu alias here - Even though it technically utilizes diff, it is in affect an ls (ie a file listing)
Thanks to my insistence on using u to mean "unmerged", I have now created a conflict with u being used for "untracked"

I believe users will want to see "untracked" files more often than "unmerged" files.

How to clean up this mess I created? Here's what comes to mind:

Leave gu alias to avoid breaking changes
Concede that c has value in the presence of existing u
Exclude the naked glsu alias since its ambiguous
Consider suffix codes ut for "untracked" and um for "unmerged"
Promote ls-files section to include aliases that generate file lists, regardless of which command is used

# ls-files (may utilize other commands that generate file lists)
alias gu='git ls-files . --exclude-standard --others' # Show untracked files
alias glsut='git ls-files . --exclude-standard --others' # Show untracked files
alias glsum='git diff --name-only --diff-filter=U' # Show unmerged (conflicted) files
alias glsc='git diff --name-only --diff-filter=U' # Show unmerged (conflicted) files

I'm happy to spend the time to make whatever change(s) we agree upon since I lead us here ...

NoahGorny · 2021-01-13T19:20:57Z

alias glsut='

Hey @davidpfarrell, I agree that the location is better, and I added glsut alias. Take a look now

NoahGorny

You know @davidpfarrell, you really need maintainer status by now.. @nwinkler do you agree?

NoahGorny · 2021-01-13T19:32:25Z

@tbhaxor thanks for your contribution!

davidpfarrell reviewed Dec 10, 2020

View reviewed changes

tbhaxor mentioned this pull request Dec 20, 2020

Git ls-files completion not loaded completely #1750

Closed

davidpfarrell approved these changes Jan 8, 2021

View reviewed changes

Added git alias to list only conflicted files

957cd57

NoahGorny force-pushed the patch-1 branch from f47d56b to 957cd57 Compare January 13, 2021 17:09

git: aliases: Move glsu to glsum in ls-files and add glsut

610980d

davidpfarrell approved these changes Jan 13, 2021

View reviewed changes

NoahGorny approved these changes Jan 13, 2021

View reviewed changes

NoahGorny merged commit bb35450 into Bash-it:master Jan 13, 2021

tbhaxor deleted the patch-1 branch March 11, 2021 11:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added git alias to list only conflicted files #1733

Added git alias to list only conflicted files #1733

tbhaxor commented Dec 10, 2020

cornfeedhobo commented Dec 10, 2020 •

edited

Loading

davidpfarrell Dec 10, 2020

tbhaxor Dec 10, 2020

davidpfarrell Dec 10, 2020

NoahGorny commented Dec 13, 2020

tbhaxor commented Dec 14, 2020 •

edited

Loading

NoahGorny commented Dec 14, 2020

tbhaxor commented Dec 20, 2020

davidpfarrell commented Dec 20, 2020

NoahGorny commented Dec 27, 2020

tbhaxor commented Dec 27, 2020

NoahGorny commented Dec 27, 2020

NoahGorny commented Jan 7, 2021

tbhaxor commented Jan 8, 2021

NoahGorny commented Jan 8, 2021

tbhaxor commented Jan 8, 2021

davidpfarrell left a comment

NoahGorny commented Jan 13, 2021

davidpfarrell commented Jan 13, 2021 •

edited

Loading

NoahGorny commented Jan 13, 2021

NoahGorny left a comment

NoahGorny commented Jan 13, 2021

Added git alias to list only conflicted files #1733

Added git alias to list only conflicted files #1733

Conversation

tbhaxor commented Dec 10, 2020

cornfeedhobo commented Dec 10, 2020 • edited Loading

davidpfarrell Dec 10, 2020

Choose a reason for hiding this comment

tbhaxor Dec 10, 2020

Choose a reason for hiding this comment

davidpfarrell Dec 10, 2020

Choose a reason for hiding this comment

NoahGorny commented Dec 13, 2020

tbhaxor commented Dec 14, 2020 • edited Loading

NoahGorny commented Dec 14, 2020

tbhaxor commented Dec 20, 2020

davidpfarrell commented Dec 20, 2020

NoahGorny commented Dec 27, 2020

tbhaxor commented Dec 27, 2020

NoahGorny commented Dec 27, 2020

NoahGorny commented Jan 7, 2021

tbhaxor commented Jan 8, 2021

NoahGorny commented Jan 8, 2021

tbhaxor commented Jan 8, 2021

davidpfarrell left a comment

Choose a reason for hiding this comment

NoahGorny commented Jan 13, 2021

davidpfarrell commented Jan 13, 2021 • edited Loading

NoahGorny commented Jan 13, 2021

NoahGorny left a comment

Choose a reason for hiding this comment

NoahGorny commented Jan 13, 2021

cornfeedhobo commented Dec 10, 2020 •

edited

Loading

tbhaxor commented Dec 14, 2020 •

edited

Loading

davidpfarrell commented Jan 13, 2021 •

edited

Loading