mirror of
git://git.9front.org/plan9front/plan9front
synced 2025-01-12 11:10:06 +00:00
git/diff: make '-u' flag imply '-s'
Without '-s', '-u' makes no sense: it acts like a weird version of cat that prepends each line with '+'.
This commit is contained in:
parent
5d68e51152
commit
7bc6d45519
2 changed files with 3 additions and 1 deletions
|
@ -20,7 +20,7 @@ if(! ~ $#* 0)
|
|||
files=`{cleanname -d $gitrel $*}
|
||||
|
||||
branch=`{git/query -p $commit}
|
||||
if(~ $summarize 1){
|
||||
if(~ $summarize 1 || ~ $uncommitted 1){
|
||||
git/walk -f$filt $cparam $files
|
||||
exit
|
||||
}
|
||||
|
|
|
@ -299,6 +299,8 @@ pfxmatch(char *p, char **pfx, int *pfxlen, int npfx)
|
|||
{
|
||||
int i;
|
||||
|
||||
if(p == nil)
|
||||
return 0;
|
||||
if(npfx == 0)
|
||||
return 1;
|
||||
for(i = 0; i < npfx; i++){
|
||||
|
|
Loading…
Reference in a new issue