git - How can I see what physical hunks are not in one branch from another? -

-

there branch topic1 branched master. let's original owner of topic1 didn't proper merge of branch master, , instead did cherry pick operation missed few commits.

months pass, , realize topic1 still there. @ point, it's been long have no reliable way determine if cumulative patch topic1 represents present on master.

what want able git diff topic1..master hide hunks on master not exist in topic1. want see portion of diff showing changes in topic1 not present in master. possible? , if so, how can it?

i'm using git 2.8+

you can start using --cherry-pick option of git log list of commits topic1 not cherry-picked master.

from documenation of git-log:

--cherry-pick
omit commit introduces same change commit on “other side” when set of commits limited symmetric difference.

what's interesting here --cherry-pick option uses commit's diff – not commit's sha-1 hash – in order determine whether commit introduces same set of changes present in branch.

from documentation of git-cherry, related:

the equivalence test based on diff, after removing whitespace , line numbers. git-cherry therefore detects when commits have been "copied" means of git-cherry-pick, git-am or git-rebase.

such commits said patch equivalent.

so, git log --cherry-pick master...topic1 exclude commits topic1 have been cherry-picked in master, leaving ones not. add --right-only option indicate interested in seeing commits right side of range, i.e. topic1:

git log --cherry-pick --right-only master...topic1

we might want exclude merge commits selection, add --no-merges option:

git log --no-merges --cherry-pick --right-only master...topic1

lastly, add --patch option diff commits. final command becomes:

git log --patch --no-merges --cherry-pick --right-only master...topic1

Comments

Post a Comment

Popular posts from this blog

Spring Boot + JPA + Hibernate: Unable to locate persister -

-
i trying work entity inside request method of spring boot application. entity in project , pom.xml has dependencies it. why error message?: org.hibernate.unknownentitytypeexception: unable locate persister: com.ric.bill.model.bs.par package com.ric.web; import java.util.concurrent.atomic.atomiclong; import javax.persistence.entitymanager; import javax.persistence.persistencecontext; import net.sf.ehcache.cachemanager; import net.sf.ehcache.management.cache; import net.sf.ehcache.management.cachestatistics; import org.hibernate.stat.statistics; import org.springframework.beans.factory.annotation.autowired; import org.springframework.boot.autoconfigure.domain.entityscan; import org.springframework.cache.annotation.enablecaching; import org.springframework.transaction.annotation.enabletransactionmanagement; import org.springframework.transaction.annotation.propagation; import org.springframework.transaction.annotation.transactional; import org.springframework.web.bind.annotati
Read more

go - Golang: panic: runtime error: invalid memory address or nil pointer dereference using bufio.Scanner -

-
i implementing go program uses bufio.scanner , bufio.writer have packaged code follows package main import ( "fmt" "player/command" "strings" ) func main() { //enter code here. read input stdin. print output stdout commands.scanner.scan() { //scan new line , send comand variable check command exist or not input := strings.split(strings.trim(commands.scanner.text(), " "), " ") command := input[0] if command == "" { fmt.printf("$ %s:", commands.pwd) continue } if !commands.commands[command] { commands.throwerror("cannot recognize input.") } else { commands.execute(command, input[1:], nil) } fmt.printf("$ %s:", commands.pwd) } } i using init.go file in main package follows package main import ( "flag" "player/sourc
Read more

c - double free or corruption (fasttop) -

-
this code reads null terminated string file (file containing null terminated strings & should provide index wanted string). error: *** error in `./main': double free or corruption (fasttop): 0x090a4a80 *** aborted code: char *tmp_realloc=null; char *sstring=null; int i=1; /*set file pointer point string*/ fseek(fh,index,seek_set); sstring=(char*)malloc(sizeof(char)); if(sstring == null) return null; tmp_realloc=sstring; while( (*(sstring+i-1)=(char)fgetc((file*)fh)) != 0x0 ) { /*reallocate more memory*/ tmp_realloc=(char*)realloc((char*)sstring,++i); /*if not same address copy old new & set old point new*/ if(tmp_realloc != sstring){ strcpy((char*)tmp_realloc,(char*)sstring); free(sstring); sstring=tmp_realloc; } } could tell me pointer causing issue (& reason) ? remove part /*if not same address copy old new & set old point new*/ if(tmp_realloc != sstring){ strc
Read more