Commit6ef3775

westphahl

authored and

Byron

committed

Ensure only fully matching symrefs are deleted

Deleting a symbolic ref with e.g. the name 'refs/remotes/origin/mas'would also delete 'refs/remotes/origin/master' if the ref had to bedeleted from the pack file.In order to fix this the full ref is now checked for a match.

1 parent30387f1 commit6ef3775Copy full SHA for 6ef3775

File tree

1 file changed

-2

lines changed

git/refs
- symbolic.py

1 file changed

-2

lines changed

`‎git/refs/symbolic.py‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -445,12 +445,14 @@ def delete(cls, repo, path):`
`445`	`445`	`made_change=False`
`446`	`446`	`dropped_last_line=False`
`447`	`447`	`forlineinreader:`
	`448`	`+line=line.decode(defenc)`
	`449`	`+_,_,line_ref=line.partition(' ')`
	`450`	`+line_ref=line_ref.strip()`
`448`	`451`	`# keep line if it is a comment or if the ref to delete is not`
`449`	`452`	`# in the line`
`450`	`453`	`# If we deleted the last line and this one is a tag-reference object,`
`451`	`454`	`# we drop it as well`
`452`		`-line=line.decode(defenc)`
`453`		`-if (line.startswith('#')orfull_ref_pathnotinline)and \`
	`455`	`+if (line.startswith('#')orfull_ref_path!=line_ref)and \`
`454`	`456`	`(notdropped_last_lineordropped_last_lineandnotline.startswith('^')):`
`455`	`457`	`new_lines.append(line)`
`456`	`458`	`dropped_last_line=False`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit6ef3775

File tree

1 file changed

1 file changed

`‎git/refs/symbolic.py‎`

0 commit comments