git log restricted to path doesn't show expected commit -


i noticed behavior of git don't understand in this repository. can cloned via:

git clone "git@github.com:skript-sicherheit/skript.git"

if navigate folder images in terminal , execute git log ., prints this:

commit b1703a7542ee226535a34bd3de9aed48a7f76a8d author: lukas beeck <meisterasrael@googelmail.com> date:   wed sep 7 10:37:39 2016 +0200      bild von mona lisa war verschwunden, ist wieder drin  commit 0e3ede155080a3005e6454d855e18dc0083ea01a author: lukas beeck <meisterasrael@googelmail.com> date:   fri sep 2 10:20:25 2016 +0200      erläuterung in grafik eingefügt  [...]

git show b1703a7542ee226535a34bd3de9aed48a7f76a8d prints:

commit b1703a7542ee226535a34bd3de9aed48a7f76a8d author: lukas beeck <meisterasrael@googelmail.com> date:   wed sep 7 10:37:39 2016 +0200      bild von mona lisa war verschwunden, ist wieder drin  diff --git a/images/mona-lisa.jpg b/images/mona-lisa.jpg new file mode 100644 index 0000000..f4f5583 binary files /dev/null , b/images/mona-lisa.jpg differ

the commit message german for: "image of mona lisa had vanished. in again."

so clearly, file mona-lisa.jpg changed b1703a7542ee226535a34bd3de9aed48a7f76a8d. file changed it.

but if execute git log mona-lisa.jpg, (entire) output:

commit 669b00871f3dba5c43ac7d53e44f317a61b177d0 merge: 921a31c 519cdae author: lukas beeck <meisterasrael@googelmail.com> date:   fri sep 2 15:39:00 2016 +0200      merge branch 'index'

why doesn't b1703a7542ee226535a34bd3de9aed48a7f76a8d appear in output of command?

more of comment satisfactory answer, looks strange sequence of events in repository. can, situation:

master             | .. -> -> b -> [e] (mona lisa) -> .. -> [h]                    |                 /                        / index              |     .. -> c -> d                        /                      |                                        / seitenkanalgriffe  |                .. -> f (mona lisa) -> g

it seems reason, mona lisa image added in merge commit e; guess maybe untracked image accidentally in directory @ time , added error.

the actual branch seems have been intentionally committed in, seitenkanalgriffe branch, not merged until h.

the git log documentation when specifying path states:

[--] <path>…​

show commits enough explain how files match specified paths came be. see history simplification below details , other simplification modes.

paths may need prefixed ‘`-- '’ separate them options or revision range, when confusion arises.

since important commit in terms of file history e, commit introduced image, , h made no changes file, see e when running git log mona-lisa.jpg. e commit "merge branch 'index'" comment mention in question.

to further confuse things, if use git log --follow images/mona-lisa.jpg, see commit h, because won't follow file in merges default. you'll have run git log --follow -m images/mona-lisa.jpg see commits e , h listed.

that @ least, understanding of going on here, there may else blame.


Comments

Post a Comment

Popular posts from this blog

python Tkinter Capturing keyboard events save as one single string -

is possible store keyboard events 1 string? code below stores 1 char , prints it. card reader or bar code reader, contains collection of character/ string not 1 character @ time. goal save char pressed text variable. from tkinter import * root = tk() def key(event): text= event.char text+= event.char print ("pressed", text) def callback(event): frame.focus_set() print ("clicked at", event.x, event.y) frame = frame(root, width=100, height=100) frame.bind("<key>", key) frame.bind("<button-1>", callback) frame.pack() root.mainloop() currently, creating text variable , everytime key() function gets called, , text stores last character typed. you can define text module level variable , , use module level text inside key function - text = '' def key(event): global text text+= event.char print("pressed", text)
Read more

android - InAppBilling registering BroadcastReceiver in AndroidManifest -

i'm implementing inapp billing in android app. works well, however, i'm trying decouple broadcast receiver activity manifest. suggestion in android's trivialdrive sample: // important: dynamically register broadcast messages updated purchases. // register receiver here instead of <receiver> in manifest // because call getpurchases() @ startup, therefore can ignore // broadcasts sent while app isn't running. // note: registering listener in activity bad idea, done here // because sample. regardless, receiver must registered after // iabhelper setup, before first call getpurchases(). currently there's class extends broadcastreceiver : public class iabbroadcastreceiver extends broadcastreceiver { /** * intent action receiver should filter for. */ public static final string action = "com.android.vending.billing.purchases_updated"; private final iabbroadcastlistener mlistener; public iabbroadcastreceiver(iabbroadcastlistener listener) { m
Read more

javascript - Z-index in d3.js -

i have map , when hover effect on region of map below yellow line , circle, last ones disappear. how can solve problem? http://jsfiddle.net/ot21n9qx/ var arc = g.append("path") .style("fill", "none") .style("stroke", "yellow") .style("stroke-width", 2) .attr("d", "m" + pathorigin[0] + "," + pathorigin[1] + " q" + svgpoint[0] + "," + pathorigin[1] + " " + svgpoint[0] + "," + svgpoint[1]); var circlesize = d3.scale.linear() .domain([0, 0.5, 1]) .range([4, 10, 4]); svg not have z order draws objects in order created. need create path , circle after create highlight regions. here forked fiddle: http://jsfiddle.net/o00fzgaf/1/
Read more